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
+20 -20
View File
@@ -1,43 +1,43 @@
#include "builddefines.h"
#include "debug.h"
#include "weapons.h"
#include "DEBUG.H"
#include "Weapons.h"
#include "worldman.h"
#include "game clock.h"
#include "Game Clock.h"
#include "renderworld.h"
#include "explosion control.h"
#include "sound control.h"
#include "structure wrap.h"
#include "interactive tiles.h"
#include "Explosion Control.h"
#include "Sound Control.h"
#include "Structure Wrap.h"
#include "Interactive Tiles.h"
#include "SaveLoadMap.h"
#include "Message.h"
#include "Random.h"
#include "smokeeffects.h"
#include "pathai.h"
#include "message.h"
#include "random.h"
#include "SmokeEffects.h"
#include "PATHAI.H"
#include "strategic.h"
#include "Action Items.h"
#include "Interface Dialogue.h"
#include "interface Dialogue.h"
#include "LightEffects.h"
#include "AI.h"
#include "Soldier tile.h"
#include "ai.h"
#include "soldier tile.h"
#include "Render Fun.h"
#include "Opplist.h"
#include "smell.h"
#include "end game.h"
#include "opplist.h"
#include "Smell.h"
#include "End Game.h"
#include "Buildings.h"
#include "fov.h"
#include "Map Information.h"
#include "Soldier Functions.h"//dnl ch40 200909
#include "Text.h" // added by SANDRO
#include "campaign.h" // yet another one added
#include "Campaign.h" // yet another one added
#include "CampaignStats.h" // added by Flugente
#include "Points.h" // added by Flugente
#include "Interface Control.h" // added by Flugente for DrawExplosionWarning(...)
#include "SkillMenu.h"
#include "Soldier Macros.h"
#include "Soldier macros.h"
#include "connect.h"
#include "debug control.h"
#include "Debug Control.h"
#include "LuaInitNPCs.h"
#include "Luaglobal.h"