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
+2 -2
View File
@@ -1,13 +1,13 @@
#include "SkillCheck.h"
#include "Soldier Profile.h"
#include "Random.h"
#include "random.h"
#include "Items.h"
#include "Dialogue Control.h"
#include "Overhead.h"
#include "Soldier macros.h"
#include "Isometric Utils.h"
#include "Morale.h"
#include "drugs and alcohol.h"
#include "Drugs And Alcohol.h"
#include "strategicmap.h"
// added by SANDRO
#include "GameSettings.h"