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/config.h
+++ b/src/core/config.h
@@ -186,6 +186,7 @@ enum Config {
 #	define NO_MOVIES	// disable intro videos
 #	define NO_CDCHECK
 #	define CHATTYSPLASH	// print what the game is loading
+#	define DEBUGMENU
 //#	define TIMEBARS		// print debug timers
 #endif