Merge branch 'master' into miami

# Conflicts:
#	src/control/Record.cpp
#	src/vehicles/Automobile.cpp
This commit is contained in:
Sergeanur
2020-07-17 13:53:11 +03:00
4 changed files with 33 additions and 2 deletions

View File

@@ -289,3 +289,6 @@ enum Config {
// Camera
#define IMPROVED_CAMERA // Better Debug cam, and maybe more in the future
#define FREE_CAM // Rotating cam
// Audio
#define AUDIO_CACHE // cache sound lengths to speed up the cold boot