1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-06-26 03:37:37 +00:00
re3/src/entities
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
..
Building.cpp Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
Building.h script revision 2020-05-19 01:49:09 +03:00
Dummy.cpp script revision 2020-05-19 01:49:09 +03:00
Dummy.h script revision 2020-05-19 01:49:09 +03:00
Entity.cpp Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
Entity.h more CBike and fixes 2020-06-04 17:38:41 +02:00
Physical.cpp Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
Physical.h fixes for CPhysical and friends 2020-05-22 14:34:44 +02:00
Solid.h normalized line endings to LF 2020-04-09 20:50:24 +02:00
Treadable.cpp Remove patches 2020-04-17 16:31:11 +03:00
Treadable.h Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00