1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-05 15:25:55 +00:00
re3/src/vehicles
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
..
Automobile.cpp Rename LEVEL_NONE to LEVEL_GENERIC 2020-07-13 17:43:09 +03:00
Automobile.h some cutscene opcodes and heli guns 2020-06-16 20:35:09 +03:00
Bike.cpp CBoat and friends 2020-07-01 18:04:02 +02:00
Bike.h some camera code 2020-06-14 09:36:30 +02:00
Boat.cpp Rename LEVEL_NONE to LEVEL_GENERIC 2020-07-13 17:43:09 +03:00
Boat.h CBoat and friends 2020-07-01 18:04:02 +02:00
CarGen.cpp more accurate code 2020-06-08 00:53:25 +03:00
CarGen.h more script 2020-05-12 01:59:35 +03:00
Cranes.cpp VC fighting, Peds, many fixes including ghost bikes 2020-07-09 17:01:07 +03:00
Cranes.h Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
DamageManager.cpp some CAutomobile 2020-05-31 17:05:59 +02:00
DamageManager.h some CAutomobile 2020-05-31 17:05:59 +02:00
Door.cpp Remove patches 2020-04-17 16:31:11 +03:00
Door.h implemented CTrain 2019-07-31 14:33:27 +02:00
Floater.cpp CBoat and friends 2020-07-01 18:04:02 +02:00
Floater.h CBoat and friends 2020-07-01 18:04:02 +02:00
HandlingMgr.cpp CEntity and friends 2020-05-19 20:56:42 +02:00
HandlingMgr.h Merge remote-tracking branch 'origin/master' into miami 2020-05-20 14:39:36 +03:00
Heli.cpp eSurfaceType 2020-05-26 11:37:46 +02:00
Heli.h Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
Plane.cpp Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
Plane.h some CBike code; vehicle cleanup 2020-06-02 23:35:20 +02:00
Train.cpp Merge remote-tracking branch 'origin/master' into miami 2020-06-15 17:44:47 +03:00
Train.h some CBike code; vehicle cleanup 2020-06-02 23:35:20 +02:00
Transmission.cpp Remove patches 2020-04-17 16:31:11 +03:00
Transmission.h more CAutomobile::ProcessControl 2019-07-17 23:58:06 +02:00
Vehicle.cpp VC fighting, Peds, many fixes including ghost bikes 2020-07-09 17:01:07 +03:00
Vehicle.h VC fighting, Peds, many fixes including ghost bikes 2020-07-09 17:01:07 +03:00