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
..
AnimationId.h	peds starting to work	2020-05-09 17:05:26 +02:00
AnimBlendAssocGroup.cpp	more small fixes	2020-05-08 20:58:40 +02:00
AnimBlendAssocGroup.h	most of animation system done; little stuff here and there	2020-05-08 15:59:57 +02:00
AnimBlendAssociation.cpp	RpAnimBlend and frame updates	2020-05-10 23:47:53 +02:00
AnimBlendAssociation.h	RpAnimBlend and frame updates	2020-05-10 23:47:53 +02:00
AnimBlendClumpData.cpp	most of animation system done; little stuff here and there	2020-05-08 15:59:57 +02:00
AnimBlendClumpData.h	Merge branch 'master' into miami	2020-05-11 21:07:12 +03:00
AnimBlendHierarchy.cpp	most of animation system done; little stuff here and there	2020-05-08 15:59:57 +02:00
AnimBlendHierarchy.h	Merge branch 'master' into miami	2020-05-11 21:07:12 +03:00
AnimBlendList.h	more small fixes	2020-05-08 20:58:40 +02:00
AnimBlendNode.cpp	more small fixes	2020-05-08 20:58:40 +02:00
AnimBlendNode.h	Merge branch 'master' into miami	2020-05-11 21:07:12 +03:00
AnimBlendSequence.cpp	most of animation system done; little stuff here and there	2020-05-08 15:59:57 +02:00
AnimBlendSequence.h	Merge branch 'master' into miami	2020-05-11 21:07:12 +03:00
AnimManager.cpp	some updates for script	2020-05-10 17:54:13 +03:00
AnimManager.h	some fixes and cosmetic changes	2020-05-10 17:09:57 +02:00
Bones.cpp	accidentally swapped reft and light	2020-05-09 17:29:13 +02:00
Bones.h	peds starting to work	2020-05-09 17:05:26 +02:00
CutsceneMgr.cpp	removed cutscene heads	2020-05-09 13:00:39 +02:00
CutsceneMgr.h	removed cutscene heads	2020-05-09 13:00:39 +02:00
FrameUpdate.cpp	few fixes	2020-05-11 09:18:41 +02:00
RpAnimBlend.cpp	few fixes	2020-05-11 09:18:41 +02:00
RpAnimBlend.h	RpAnimBlend and frame updates	2020-05-10 23:47:53 +02:00