1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 19:40:00 +00:00
re3/src/control
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
..
AutoPilot.cpp Revert "Remove Miami stuff" 2020-05-05 18:04:43 +03:00
AutoPilot.h Merge branch 'master' into miami 2020-05-11 21:07:12 +03:00
Bridge.cpp Revert "Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL" 2020-05-05 18:34:46 +03:00
Bridge.h Some refs removed, little fixes and teleport 2020-04-16 22:19:56 +03:00
CarAI.cpp VC fighting, Peds, many fixes including ghost bikes 2020-07-09 17:01:07 +03:00
CarAI.h remove ifdefs 2020-05-05 18:20:10 +03:00
CarCtrl.cpp VC fighting, Peds, many fixes including ghost bikes 2020-07-09 17:01:07 +03:00
CarCtrl.h roadblocks 2020-05-30 20:08:31 +03:00
Curves.cpp comments 2020-05-24 13:48:17 +03:00
Curves.h CCarCtrl::GenerateOneRandomVehicle! 2019-08-07 00:32:19 +03:00
Darkel.cpp CDarkel miami hud colors. 2020-07-07 01:02:39 +02:00
Darkel.h Try to build with mingw 2020-04-20 18:18:46 +02:00
GameLogic.cpp Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
GameLogic.h game logic 2020-05-31 20:59:01 +03:00
Garages.cpp Noskillx's PR + fix .set loading 2020-07-06 19:26:41 +03:00
Garages.h some fixes 2020-05-23 01:43:12 +03:00
OnscreenTimer.cpp script revision 2020-05-20 20:40:04 +03:00
OnscreenTimer.h script revision 2020-05-20 20:40:04 +03:00
PathFind.cpp Peds, eSound and PedState enum, fixes 2020-06-03 17:01:11 +03:00
PathFind.h Peds, eSound and PedState enum, fixes 2020-06-03 17:01:11 +03:00
Phones.cpp Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
Phones.h Restored beta police system(disabled), fixes from miami, debug info for CFO crash (#639) 2020-07-01 15:28:43 +03:00
Pickups.cpp Noskillx's PR + fix .set loading 2020-07-06 19:26:41 +03:00
Pickups.h some camera code 2020-06-14 09:36:30 +02:00
PowerPoints.cpp normalized line endings to LF 2020-04-09 20:50:24 +02:00
PowerPoints.h normalized line endings to LF 2020-04-09 20:50:24 +02:00
Record.cpp Rename LEVEL_NONE to LEVEL_GENERIC 2020-07-13 17:43:09 +03:00
Record.h rem refs 2020-04-17 08:54:14 +03:00
Remote.cpp SetPosition, part 1 2020-05-02 15:13:09 +03:00
Remote.h fixed remote 2019-07-26 10:44:56 +03:00
Replay.cpp Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
Replay.h fix linux build 2020-05-27 03:18:02 +03:00
Restart.cpp Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
Restart.h rem refs 2020-04-17 08:54:14 +03:00
RoadBlocks.cpp VC fighting, Peds, many fixes including ghost bikes 2020-07-09 17:01:07 +03:00
RoadBlocks.h roadblocks 2020-05-30 20:08:31 +03:00
SceneEdit.cpp Bettah car enter canceling, fix CFO crash, ped objs. renaming 2020-07-03 16:51:33 +03:00
SceneEdit.h scene edit 2020-04-13 21:50:56 +03:00
Script.cpp Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
Script.h Merge remote-tracking branch 'origin/master' into miami 2020-06-29 12:56:50 +03:00
ScriptCommands.h script logging for miami 2020-07-01 15:43:19 +03:00
SetPieces.cpp comments 2020-05-24 13:48:17 +03:00
SetPieces.h set pieces 2020-05-23 20:06:52 +03:00
TrafficLights.cpp CVehicle 2020-05-25 18:33:34 +02:00
TrafficLights.h implemented CTrafficLights 2020-04-10 18:36:39 +02:00