Sergeanur 0aa7f13c32 Merge branch 'master' into miami ... # Conflicts: # src/animation/AnimBlendAssociation.h # src/animation/AnimBlendClumpData.h # src/animation/AnimManager.h # src/animation/FrameUpdate.cpp # src/control/AutoPilot.h # src/control/PathFind.h # src/core/PlayerInfo.h # src/entities/Building.h # src/entities/Dummy.h # src/entities/Entity.h # src/entities/Physical.h # src/entities/Treadable.h # src/modelinfo/BaseModelInfo.h # src/modelinfo/ClumpModelInfo.cpp # src/modelinfo/ClumpModelInfo.h # src/modelinfo/PedModelInfo.h # src/modelinfo/SimpleModelInfo.h # src/modelinfo/TimeModelInfo.h # src/modelinfo/VehicleModelInfo.h # src/objects/CutsceneHead.h # src/objects/CutsceneObject.h # src/objects/DummyObject.h # src/objects/Object.h # src/peds/DummyPed.h # src/peds/PedIK.cpp # src/rw/VisibilityPlugins.cpp # src/vehicles/Automobile.h # src/vehicles/Boat.h # src/vehicles/Heli.h # src/vehicles/Plane.h # src/vehicles/Train.h # src/vehicles/Vehicle.h		2020-05-11 21:07:12 +03:00
..
CutsceneObject.cpp	peds starting to work	2020-05-09 17:05:26 +02:00
CutsceneObject.h	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
DummyObject.cpp	setting some areas so objects dont disappear	2020-05-06 14:43:23 +02:00
DummyObject.h	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
Object.cpp	sorted out object collision enums	2020-05-06 17:14:34 +02:00
Object.h	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
ObjectData.cpp	Remove patches	2020-04-17 16:31:11 +03:00
ObjectData.h	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
ParticleObject.cpp	SetPosition, part 2	2020-05-02 15:28:19 +03:00
ParticleObject.h	Try to build with mingw	2020-04-20 18:18:46 +02:00
Projectile.cpp	Remove patches	2020-04-17 16:31:11 +03:00
Projectile.h	Fixing Projectile code	2020-01-07 17:26:40 +02:00