18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-22 05:34:58 +01:00

Merge remote-tracking branch 'origin/master' into fix/freight-brake-setting-cw1

# Conflicts:
#	CMakeLists.txt
#	utilities/Globals.cpp
This commit is contained in:
jerrrrycho
2026-11-09 15:32:03 +01:00
74 changed files with 3963 additions and 490 deletions

View File

@@ -276,6 +276,7 @@ struct global_settings {
bool captureonstart = true;
bool render_cab = true;
bool crash_damage = true;
bool control_coupling_engine_check = true; // no multiple-unit control between electric and diesel traction vehicles (eu07/maszyna#520)
bool gui_defaultwindows = true;
bool gui_showtranscripts = true;
bool gui_trainingdefault = false;