1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-01-03 19:35:27 +00:00
re3/src/peds
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
..
CivilianPed.cpp cleaned up MIAMI ifdefs 2020-05-05 18:06:38 +02:00
CivilianPed.h Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
CopPed.cpp more car control 2020-05-10 12:25:30 +03:00
CopPed.h Merge branch 'master' into miami 2020-05-11 21:07:12 +03:00
DummyPed.h Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
EmergencyPed.cpp cleaned up MIAMI ifdefs 2020-05-05 18:06:38 +02:00
EmergencyPed.h Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
Gangs.cpp VC vehicles just barely working now 2020-05-07 11:33:20 +02:00
Gangs.h Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
Ped.cpp CPedModelInfo 2020-05-10 13:08:02 +02:00
Ped.h Merge branch 'master' into miami 2020-05-11 21:07:12 +03:00
PedIK.cpp some fixes and cosmetic changes 2020-05-10 17:09:57 +02:00
PedIK.h Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
PedPlacement.cpp CCarCtrl::GenerateOneRandomCar 2020-05-08 23:29:43 +03:00
PedPlacement.h CCarCtrl::GenerateOneRandomCar 2020-05-08 23:29:43 +03:00
PedRoutes.cpp Remove patches 2020-04-17 16:31:11 +03:00
PedRoutes.h missing endlines 2020-03-22 19:19:07 +03:00
PedStats.cpp Remove patches 2020-04-17 16:31:11 +03:00
PedStats.h Merge branch 'master' into miami 2020-05-11 21:07:12 +03:00
PedType.cpp Remove patches 2020-04-17 16:31:11 +03:00
PedType.h Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
PlayerPed.cpp named anim assoc flags 2020-05-09 09:51:31 +02:00
PlayerPed.h Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
Population.cpp more car control 2020-05-10 12:25:30 +03:00
Population.h more car control 2020-05-10 12:25:30 +03:00