re3/src/modelinfo
Sergeanur d0f5464200 Merge branch 'master' into miami
# Conflicts:
#	src/control/CarAI.cpp
#	src/control/Phones.cpp
#	src/control/Phones.h
#	src/control/Record.cpp
#	src/control/Restart.cpp
#	src/control/Script.cpp
#	src/core/Collision.cpp
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.h
#	src/core/Streaming.cpp
#	src/core/TempColModels.cpp
#	src/core/Wanted.cpp
#	src/core/Zones.cpp
#	src/core/config.h
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/entities/Entity.cpp
#	src/entities/Physical.cpp
#	src/extras/frontendoption.cpp
#	src/modelinfo/ModelInfo.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/CivilianPed.cpp
#	src/peds/CopPed.cpp
#	src/peds/EmergencyPed.cpp
#	src/peds/Ped.cpp
#	src/peds/Ped.h
#	src/peds/Population.cpp
#	src/render/Renderer.cpp
#	src/save/GenericGameStorage.cpp
#	src/skel/win/win.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Boat.cpp
#	src/vehicles/Boat.h
#	src/vehicles/Vehicle.cpp
2020-07-13 18:10:17 +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 Merge branch 'master' into miami 2020-05-14 17:05:42 +03:00
ClumpModelInfo.h Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
ModelIndices.cpp small fixes 2020-05-19 21:42:55 +02:00
ModelIndices.h Merge branch 'miami' into miami 2020-06-16 23:02:21 +03:00
ModelInfo.cpp Rename LEVEL_NONE to LEVEL_GENERIC 2020-07-13 17:43:09 +03:00
ModelInfo.h CWeaponModelInfo 2020-05-10 10:04:20 +02:00
PedModelInfo.cpp Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
PedModelInfo.h fix head/hand atomics 2020-05-17 15:16:12 +02:00
SimpleModelInfo.cpp getting rid of strnicmp 2020-05-31 22:35:29 +02:00
SimpleModelInfo.h Weapon layer in Peds 2020-05-15 21:21:25 +03: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 CBoat and friends 2020-07-01 18:04:02 +02:00
VehicleModelInfo.h some CBike code; vehicle cleanup 2020-06-02 23:35:20 +02:00
WeaponModelInfo.cpp CClumpModelInfo; little fixes 2020-05-10 11:20:27 +02:00
WeaponModelInfo.h Weapon layer in Peds 2020-05-15 21:21:25 +03:00