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
+9 -9
View File
@@ -5,20 +5,20 @@
#include "types.h"
#include "strategicmap.h"
#include "overhead.h"
#include "isometric utils.h"
#include "Overhead.h"
#include "Isometric Utils.h"
#include "soldier add.h"
#include "soldier create.h"
#include "Soldier Add.h"
#include "Soldier Create.h"
#include "Soldier Init List.h"
#include "debug.h"
#include "Random.h"
#include "items.h"
#include "DEBUG.H"
#include "random.h"
#include "Items.h"
#include "GameSettings.h"
#include "Map Information.h"
#include "soldier profile.h"
#include "Soldier Profile.h"
#include "Sys Globals.h"
#include "EditorMercs.h"
#include "Animation Data.h"
@@ -27,7 +27,7 @@
#include "Sound Control.h"
#include "Quests.h"
#include "Render Fun.h"
#include "meanwhile.h"
#include "Meanwhile.h"
#include "Map Screen Interface Map.h"
#include "mapscreen.h"
#include "Debug Control.h"