re3-wiiu/src/control
Sergeanur 0ce2af7a0d Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/Garages.cpp
#	src/core/SurfaceTable.cpp
#	src/core/SurfaceTable.h
#	src/core/World.cpp
#	src/core/main.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Ped.cpp
#	src/render/Timecycle.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/Heli.cpp
#	src/vehicles/Vehicle.cpp
#	src/weapons/Weapon.cpp
#	src/weapons/WeaponInfo.h
2020-05-26 17:24:47 +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 comments 2020-05-24 13:48:17 +03:00
CarAI.h remove ifdefs 2020-05-05 18:20:10 +03:00
CarCtrl.cpp Merge remote-tracking branch 'origin/master' into miami 2020-05-26 17:24:47 +03:00
CarCtrl.h Merge pull request #555 from erorcun/miami 2020-05-17 20:20:14 +02: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 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 Merge remote-tracking branch 'origin/master' into miami 2020-05-26 17:24:47 +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 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 Compatibility with VC weapon.dat + new shotguns 2020-05-23 16:53:20 +03:00
Pickups.h Fixes for melees and various things 2020-05-20 20:21:27 +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 CVehicle 2020-05-25 18:33:34 +02:00
RoadBlocks.h CVehicle 2020-05-25 18:33:34 +02: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-26 17:24:47 +03:00
Script.h Compatibility with VC weapon.dat + new shotguns 2020-05-23 16:53:20 +03:00
ScriptCommands.h script stubs + REQUEST_COLLISION 2020-05-06 21:15:58 +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