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
+19 -19
View File
@@ -1,47 +1,47 @@
#include "types.h"
#include "overhead.h"
#include "animation control.h"
#include "points.h"
#include "Overhead.h"
#include "Animation Control.h"
#include "Points.h"
#include "opplist.h"
#include "timer.h"
#include "event pump.h"
#include "Event Pump.h"
#include "Sound Control.h"
#include "interface.h"
#include "Interface.h"
#include "Isometric Utils.h"
#include "Font Control.H"
#include "Font Control.h"
#include "ai.h"
#include "interface.h"
#include "Interface.h"
#include "message.h"
#include "text.h"
#include "Text.h"
#include "TeamTurns.h"
#include "Smell.h"
#include "game clock.h"
#include "Game Clock.h"
#include "Soldier Functions.h"
#include "cursors.h"
#include "Cursors.h"
#include "Queen Command.h"
#include "Pathai.h"
#include "PATHAI.H"
#include "lighting.h"
#include "environment.h"
#include "Explosion Control.h"
#include "dialogue control.h"
#include "Soldier Profile Type.h"
#include "Dialogue Control.h"
#include "soldier profile type.h"
#include "SmokeEffects.h"
#include "lighteffects.h"
#include "air raid.h"
#include "meanwhile.h"
#include "LightEffects.h"
#include "Air Raid.h"
#include "Meanwhile.h"
#include "SkillCheck.h"
#include "AIInternals.h"
#include "AIList.h"
#ifdef DEBUG_INTERRUPTS
#include "debug.h"
#include "DEBUG.H"
#endif
#include "renderworld.h"
#include "rotting corpses.h"
#include "Rotting Corpses.h"
#include "Squads.h"
#include "Soldier macros.h"
#include "Soldier Profile.h"
#include "NPC.h"
#include "drugs and alcohol.h" // added by Flugente
#include "Drugs And Alcohol.h" // added by Flugente
#ifdef JA2UB
#include "Ja25_Tactical.h"