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
+6 -6
View File
@@ -14,7 +14,7 @@
#include "Queen Command.h"
#include "Strategic Movement.h"
#include "Strategic Pathing.h"
#include "text.h"
#include "Text.h"
#include "PopUpBox.h"
#include "Player Command.h"
#include "Cursors.h"
@@ -22,19 +22,19 @@
#include "Sound Control.h"
#include "english.h"
#include "Map Screen Interface Bottom.h"
#include "overhead.h"
#include "Overhead.h"
#include "Tactical Placement GUI.h"
#include "Town Militia.h"
#include "campaign.h"
#include "Campaign.h"
#include "GameSettings.h"
#include "Random.h"
#include "random.h"
#include "Creature Spreading.h"
#include "Multi Language Graphic Utils.h"
#include "Map Screen Helicopter.h"
#include "Quests.h"
#include "Map Screen Interface Border.h"
#include "Strategic Status.h"
#include "interface control.h"
#include "Interface Control.h"
#include "Strategic Town Loyalty.h"
#include "Squads.h"
#include "Assignments.h"
@@ -45,7 +45,7 @@
#include "Tactical Save.h"
#include "message.h"
#include "CampaignStats.h" // added by Flugente
#include "militiasquads.h" // added by Flugente
#include "MilitiaSquads.h" // added by Flugente
#include "SkillCheck.h" // added by Flugente
#include "Strategic Transport Groups.h"
#include "Utilities.h"