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
@@ -3,33 +3,33 @@
#include <memory.h>
#include "Strategic Movement.h"
#include "MemMan.h"
#include "debug.h"
#include "DEBUG.H"
#include "Campaign Types.h"
#include "Game Event Hook.h"
#include "Game Clock.h"
#include "Queen Command.h"
#include "overhead.h"
#include "Overhead.h"
#include "strategicmap.h"
#include "jascreens.h"
#include "Strategic Pathing.h"
#include "Map Screen Interface Map.h"
#include "PreBattle Interface.h"
#include "Strategic.h"
#include "strategic.h"
#include "Assignments.h"
#include "Text.h"
#include "Font Control.h"
#include "message.h"
#include "mapscreen.h"
#include "dialogue control.h"
#include "Dialogue Control.h"
#include "Soldier Add.h"
#include "Game Events.h"
#include "Vehicles.h"
#include "Map Screen Helicopter.h"
#include "Map Screen Interface.h"
#include "Squads.h"
#include "Random.h"
#include "soldier macros.h"
#include "random.h"
#include "Soldier macros.h"
#include "Map Information.h"
#include "Tactical Save.h"
#include "Player Command.h"
@@ -38,7 +38,7 @@
#include "Music Control.h"
#include "Campaign.h"
#include "Isometric Utils.h"
#include "meanwhile.h"
#include "Meanwhile.h"
#include "Inventory Choosing.h"
#include "Map Screen Interface Border.h"
#include "Auto Resolve.h"