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
..
BaseModelInfo.cpp	CBaseModelInfo done	2020-05-07 21:55:54 +02:00
BaseModelInfo.h	Merge branch 'master' into miami	2020-05-11 21:07:12 +03:00
ClumpModelInfo.cpp	some fixes and cosmetic changes	2020-05-10 17:09:57 +02:00
ClumpModelInfo.h	CClumpModelInfo; little fixes	2020-05-10 11:20:27 +02:00
ModelIndices.cpp	Remove patches	2020-04-17 16:31:11 +03:00
ModelIndices.h	some updates for script	2020-05-10 17:54:13 +03:00
ModelInfo.cpp	CWeaponModelInfo	2020-05-10 10:04:20 +02:00
ModelInfo.h	CWeaponModelInfo	2020-05-10 10:04:20 +02:00
PedModelInfo.cpp	CPedModelInfo	2020-05-10 13:08:02 +02:00
PedModelInfo.h	Merge remote-tracking branch 'upstream/master'	2020-05-10 22:05:45 +06:00
SimpleModelInfo.cpp	some fixes and cosmetic changes	2020-05-10 17:09:57 +02:00
SimpleModelInfo.h	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
TimeModelInfo.cpp	Make CBaseModelInfo fields protected	2020-05-05 15:06:55 +03:00
TimeModelInfo.h	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
VehicleModelInfo.cpp	vehicle model descriptions; a bit of heli code	2020-05-10 20:51:29 +02:00
VehicleModelInfo.h	update file loader for new VC fields	2020-05-10 18:14:14 +02:00
WeaponModelInfo.cpp	CClumpModelInfo; little fixes	2020-05-10 11:20:27 +02:00
WeaponModelInfo.h	CWeaponModelInfo	2020-05-10 10:04:20 +02:00