Merge branch 'master' into miami

# Conflicts: # src/animation/AnimManager.cpp # src/control/CarCtrl.cpp # src/control/Curves.cpp # src/core/templates.h
2020-05-10 01:26:12 +03:00
parent e4683a3074 d9a3533438
commit 35c41208f5
15 changed files with 31 additions and 11 deletions
--- a/src/core/Cam.cpp
+++ b/src/core/Cam.cpp
@ -29,7 +29,7 @@ bool PrintDebugCode = false;
 int16 DebugCamMode;

 #ifdef FREE_CAM
-bool CCamera::bFreeCam = false;
+bool CCamera::bFreeCam = true;
 int nPreviousMode = -1;
 #endif