Merge remote-tracking branch 'origin/miami' into lcs

# Conflicts: # src/modelinfo/BaseModelInfo.cpp
2021-01-23 15:14:15 +02:00
parent cfac29b0ef b5c4866964
commit 904090cbb6
46 changed files with 155 additions and 144 deletions
--- a/src/vehicles/Boat.cpp
+++ b/src/vehicles/Boat.cpp
@@ -27,6 +27,7 @@
 #include "RpAnimBlend.h"
 #include "Record.h"
 #include "Shadows.h"
+#include "Wanted.h"

 #define INVALID_ORIENTATION (-9999.99f)