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
+7 -7
View File
@@ -5,8 +5,8 @@
#include "Overhead Types.h"
#include "strategicmap.h"
#include "Soldier Init List.h"
#include "debug.h"
#include "Random.h"
#include "DEBUG.H"
#include "random.h"
#include "Strategic Movement.h"
#include "Overhead.h"
#include "Strategic Pathing.h"
@@ -15,10 +15,10 @@
#include "Map Edgepoints.h"
#include "PreBattle Interface.h"
#include "strategic status.h"
#include "squads.h"
#include "assignments.h"
#include "items.h"
#include "tactical save.h"
#include "Squads.h"
#include "Assignments.h"
#include "Items.h"
#include "Tactical Save.h"
#include "Soldier Ani.h"
#include "Strategic AI.h"
#include "GameSettings.h"
@@ -36,7 +36,7 @@
#include "Town Militia.h"
#include "Dialogue Control.h"
#include "Campaign Init.h"
#include "meanwhile.h"
#include "Meanwhile.h"
#include "Soldier macros.h"
#include "Morale.h"
#include "CampaignStats.h" // added by Flugente