1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-06-10 14:24:26 +00:00
re3/src/control
Sergeanur 55d30a11ec Merge branch 'miami' into lcs
# Conflicts:
#	README.md
#	gamefiles/TEXT/american.gxt
#	gamefiles/TEXT/french.gxt
#	gamefiles/TEXT/german.gxt
#	gamefiles/TEXT/italian.gxt
#	gamefiles/TEXT/spanish.gxt
#	src/audio/AudioManager.h
#	src/control/Garages.cpp
#	src/control/Garages.h
#	src/control/Script5.cpp
#	src/core/config.h
#	utils/gxt/american.txt
#	utils/gxt/spanish.txt
2021-07-12 04:13:22 +03:00
..
AutoPilot.cpp finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES 2021-07-10 02:06:43 +02:00
AutoPilot.h fix 2021-02-03 22:47:25 +03:00
Bridge.cpp Enable GTA_BRIDGE 2021-01-23 03:09:15 +02:00
Bridge.h Enable GTA_BRIDGE 2021-01-23 03:09:15 +02:00
CarAI.cpp Merge remote-tracking branch 'origin/miami' into lcs 2021-01-22 15:04:09 +02:00
CarAI.h uint8 enums fixed 2020-12-07 01:59:17 +01:00
CarCtrl.cpp Merge branch 'miami' into lcs 2021-06-30 21:26:36 +03:00
CarCtrl.h script full 2021-01-18 22:19:30 +03:00
Curves.cpp get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
Curves.h CCarCtrl::GenerateOneRandomVehicle! 2019-08-07 00:32:19 +03:00
Darkel.cpp get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
Darkel.h Control updates 2020-10-11 12:56:33 +03:00
GameLogic.cpp Merge branch 'miami' into lcs 2021-07-03 16:39:22 +03:00
GameLogic.h script full 2021-01-18 22:19:30 +03:00
Garages.cpp Merge branch 'miami' into lcs 2021-07-12 04:13:22 +03:00
Garages.h Merge branch 'miami' into lcs 2021-07-12 04:13:22 +03:00
NameGrid.cpp Add some TODO stubs for unused code to be reversed 2020-11-23 18:59:50 +02:00
NameGrid.h Add some TODO stubs for unused code to be reversed 2020-11-23 18:59:50 +02:00
OnscreenTimer.cpp Refactor OnscreenTimer 2021-07-02 10:22:34 +03:00
OnscreenTimer.h Hud, Fire, OnscreenBlaBla 2020-10-12 06:42:54 +03:00
PathFind.cpp Merge branch 'miami' into lcs 2021-05-10 02:48:56 +03:00
PathFind.h Fix some UBs 2021-01-29 01:44:33 +03:00
Phones.cpp finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES 2021-07-10 02:06:43 +02: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 Merge branch 'miami' into lcs 2021-07-12 04:13:22 +03:00
Pickups.h Merge branch 'miami' into lcs 2021-01-25 19:35:03 +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 get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
Record.h Fixes 2020-12-08 03:29:08 +02:00
Remote.cpp script fixes 2021-01-23 23:04:24 +03:00
Remote.h script fixes 2021-01-23 23:04:24 +03:00
Replay.cpp Merge branch 'miami' into lcs 2021-06-30 21:26:36 +03:00
Replay.h fix 2021-01-13 20:55:54 +03:00
Restart.cpp Redo ReadSaveBuf + common.h cleanup 2021-06-28 05:12:54 +03:00
Restart.h rem refs 2020-04-17 08:54:14 +03:00
RoadBlocks.cpp Use some GetMatrix/SetMatrix logic based on SA 2021-05-10 02:45:04 +03:00
RoadBlocks.h roadblocks 2020-05-30 20:08:31 +03:00
SceneEdit.cpp get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
SceneEdit.h added GTA_SCENE_EDIT 2020-12-02 02:34:51 +03:00
Script.cpp Merge branch 'miami' into lcs 2021-07-09 00:05:26 +03:00
Script.h Move CRunningScript 2021-01-25 19:33:02 +02:00
Script2.cpp Fix sin & cos calls 2021-06-24 21:45:48 +03:00
Script3.cpp Fixes 2021-06-26 14:25:40 +03:00
Script4.cpp Merge branch 'miami' into lcs 2021-06-30 21:26:36 +03:00
Script5.cpp Merge branch 'miami' into lcs 2021-07-12 04:13:22 +03:00
Script6.cpp fix 2021-01-28 01:50:10 +03:00
Script7.cpp Merge remote-tracking branch 'origin/miami' into lcs 2021-02-16 18:08:19 +02:00
Script8.cpp Merge branch 'miami' into lcs 2021-02-26 11:07:32 +02:00
Script9.cpp Wait states ported (scripted animations) 2021-06-24 21:42:10 +03:00
Script10.cpp Fixes 2021-06-26 14:25:40 +03:00
ScriptCommands.h garages 2021-01-31 01:38:00 +03:00
SetPieces.cpp Redo ReadSaveBuf + common.h cleanup 2021-06-28 05:12:54 +03:00
SetPieces.h uint8 enums fixed 2020-12-07 01:59:17 +01:00
TrafficLights.cpp Add (Don't) walk lights 2021-01-23 04:07:50 +02:00
TrafficLights.h Control updates 2020-10-11 12:56:33 +03:00