Se.Cherkasov/re3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
9fd91e6250d2b52b92923bd801a826ce3f9ec45e
re3/src/control
History
Sergeanur 9fd91e6250 Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	src/core/Collision.cpp
#	src/core/Streaming.cpp
#	src/core/config.h
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/extras/custompipes.cpp
#	src/extras/custompipes_d3d9.cpp
#	src/extras/custompipes_gl.cpp
#	src/extras/shaders/Makefile
#	src/extras/shaders/colourfilterVC.frag
#	src/extras/shaders/colourfilterVC_fs_gl3.inc
#	src/modelinfo/ModelInfo.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/render/Renderer.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/save/GenericGameStorage.cpp
2020-08-19 23:44:08 +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
Merge remote-tracking branch 'origin/miami' into miami
2020-08-19 23:35:10 +03:00
CarCtrl.h
CarCtrl finished, minor Script things
2020-08-16 18:39:11 +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
Merge branch 'master' into miami
2020-08-15 15:13:46 +03:00
Darkel.h
Darkel fixes
2020-08-14 17:34:04 +03:00
GameLogic.cpp
Stats(except displaying), PlayerInfo, marker fix
2020-08-14 01:14:04 +03:00
GameLogic.h
game logic
2020-05-31 20:59:01 +03:00
Garages.cpp
Merge branch 'master' into miami
2020-08-19 23:34:33 +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
Peds, Hud, CFO 1/2, fixes - including zone names
2020-07-22 15:19:22 +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
new opcodes, buyable properties, minor fixes
2020-07-30 15:32:34 +03:00
Pickups.h
new opcodes, buyable properties, minor fixes
2020-07-30 15:32:34 +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
Island loading and PS2 alpha test added to options
2020-08-16 17:26:44 +03:00
Record.h
Fix CCarStateEachFrame
2020-07-16 22:21:09 +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
64-bit on Windows
2020-07-24 20:26:33 +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
Merge remote-tracking branch 'origin/master' into miami
2020-08-07 12:34:41 +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 remote-tracking branch 'origin/master' into miami
2020-08-19 23:44:08 +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