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/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -9,8 +9,8 @@
 #include "Physical.h"
 #include "Weapon.h"
 #include "WeaponInfo.h"
-#include "AnimationId.h"
 #include "PathFind.h"
+#include "Collision.h"

 #define FEET_OFFSET	1.04f
 #define CHECK_NEARBY_THINGS_MAX_DIST	15.0f