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
+16 -16
View File
@@ -1,24 +1,24 @@
#include "sgp.h"
#include "meanwhile.h"
#include "Meanwhile.h"
#include "PreBattle Interface.h"
#include "messageboxscreen.h"
#include "MessageBoxScreen.h"
#include "strategicmap.h"
#include "fade screen.h"
#include "Fade Screen.h"
#include "screenids.h"
#include "jascreens.h"
#include "npc.h"
#include "game event hook.h"
#include "game clock.h"
#include "tactical save.h"
#include "soldier profile.h"
#include "overhead.h"
#include "dialogue control.h"
#include "NPC.h"
#include "Game Event Hook.h"
#include "Game Clock.h"
#include "Tactical Save.h"
#include "Soldier Profile.h"
#include "Overhead.h"
#include "Dialogue Control.h"
#include "gameloop.h"
#include "npc.h"
#include "assignments.h"
#include "NPC.h"
#include "Assignments.h"
#include "strategic.h"
#include "text.h"
#include "interface control.h"
#include "Text.h"
#include "Interface Control.h"
#include "Interface Items.h"
#include "Map Information.h"
#include "Map Screen Interface Map.h"
@@ -28,11 +28,11 @@
#include "Game Events.h"
#include "GameSettings.h"
#include "Strategic AI.h"
#include "interface dialogue.h"
#include "interface Dialogue.h"
#include "Quests.h"
#include "Campaign Types.h"
#include "Squads.h"
#include "Random.h"
#include "random.h"
#include "GameInitOptionsScreen.h"