re3/src/control
Sergeanur c53b23cff0 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/core/Radar.h
#	src/core/World.cpp
#	src/core/config.h
#	src/entities/Entity.cpp
#	src/modelinfo/ModelIndices.h
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Population.cpp
#	src/render/Clouds.cpp
#	src/render/Hud.cpp
#	src/vehicles/HandlingMgr.h
2020-05-20 14:39:36 +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 GTA_BRIDGE and GTA_TRAIN defines 2020-05-03 17:28:54 +02:00
Bridge.h Some refs removed, little fixes and teleport 2020-04-16 22:19:56 +03:00
CarAI.cpp full script basic support 2020-05-17 21:43:11 +03:00
CarAI.h remove ifdefs 2020-05-05 18:20:10 +03:00
CarCtrl.cpp full script basic support 2020-05-17 21:43:11 +03:00
CarCtrl.h Merge pull request #555 from erorcun/miami 2020-05-17 20:20:14 +02:00
Curves.cpp Small unification 2020-05-10 01:14:00 +03:00
Curves.h CCarCtrl::GenerateOneRandomVehicle! 2019-08-07 00:32:19 +03:00
Darkel.cpp Try to build with mingw 2020-04-20 18:18:46 +02:00
Darkel.h Try to build with mingw 2020-04-20 18:18:46 +02:00
GameLogic.cpp Adding getters and setters for type and status 2020-04-30 16:45:45 +03:00
GameLogic.h normalized line endings to LF 2020-04-09 20:50:24 +02:00
Garages.cpp full script basic support 2020-05-17 21:43:11 +03:00
Garages.h sync with upstream 2020-05-11 21:21:09 +03:00
OnscreenTimer.cpp Remove patches 2020-04-17 16:31:11 +03:00
OnscreenTimer.h Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
PathFind.cpp CCarCtrl::GenerateOneRandomCar 2020-05-08 23:29:43 +03:00
PathFind.h Merge branch 'master' into miami 2020-05-11 21:07:12 +03:00
Phones.cpp Remove unused audio enum 2020-05-16 05:06:51 +03:00
Phones.h Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
Pickups.cpp Merge pull request #569 from aap/miami 2020-05-20 12:41:12 +02:00
Pickups.h sync with upstream 2020-05-17 21:48:21 +03: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 getting the vice city map to work 2020-05-05 23:27:43 +02: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 gangs, script and replay fixes 2020-05-16 17:00:40 +03:00
Replay.h gangs, script and replay fixes 2020-05-16 17:00:40 +03:00
Restart.cpp new zone stuff 2020-05-06 12:23:57 +02:00
Restart.h rem refs 2020-04-17 08:54:14 +03:00
RoadBlocks.cpp Merge remote-tracking branch 'origin/master' into miami 2020-05-07 13:42:50 +03:00
RoadBlocks.h Revert "Remove Miami stuff" 2020-05-05 18:04:43 +03:00
SceneEdit.cpp Merge branch 'master' into miami 2020-05-13 00:55:52 +03:00
SceneEdit.h scene edit 2020-04-13 21:50:56 +03:00
Script.cpp Merge remote-tracking branch 'origin/master' into miami 2020-05-20 14:39:36 +03:00
Script.h script revision 2020-05-19 20:54:05 +03:00
ScriptCommands.h script stubs + REQUEST_COLLISION 2020-05-06 21:15:58 +03:00
TrafficLights.cpp CEntity and friends 2020-05-19 20:56:42 +02:00
TrafficLights.h implemented CTrafficLights 2020-04-10 18:36:39 +02:00