Merge branch 'master' into ExtraMercs

This commit is contained in:
Asdow
2025-09-24 16:14:10 +03:00
601 changed files with 4005 additions and 10278 deletions
+10 -10
View File
@@ -1,28 +1,28 @@
#include "types.h"
#include "wcheck.h"
#include "overhead.h"
#include "WCheck.h"
#include "Overhead.h"
#include "ai.h"
#include "Soldier Profile.h"
#include "NPC.h"
#include "Isometric Utils.h"
#include "Quests.h"
#include "interface dialogue.h"
#include "interface Dialogue.h"
#include "Game Clock.h"
#include "FileMan.h"
#include "Random.h"
#include "items.h"
#include "interface.h"
#include "random.h"
#include "Items.h"
#include "Interface.h"
#include "Assignments.h"
#include "soldier macros.h"
#include "dialogue control.h"
#include "Soldier macros.h"
#include "Dialogue Control.h"
#include "Strategic Town Loyalty.h"
#include "message.h"
#include "Timer Control.h"
#include "Soldier Add.h"
#include "Soldier Tile.h"
#include "soldier tile.h"
#include "Weapons.h"
#include "meanwhile.h"
#include "Meanwhile.h"
#ifdef JA2TESTVERSION
#include "Quest Debug System.h"