1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-06-29 11:07:06 +00:00
re3/src
Sergeanur 509ca11d76 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/control/GameLogic.cpp
#	src/control/PathFind.cpp
#	src/control/RoadBlocks.cpp
#	src/control/Script.cpp
#	src/control/Script.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/MenuScreens.cpp
#	src/core/TempColModels.cpp
#	src/core/config.h
#	src/core/re3.cpp
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.h
#	src/render/Skidmarks.h
#	src/render/WaterLevel.cpp
#	src/save/GenericGameStorage.h
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/DamageManager.cpp
#	src/vehicles/Vehicle.cpp
#	src/vehicles/Vehicle.h
2020-06-03 01:24:08 +03:00
..
animation some CBike code; vehicle cleanup 2020-06-02 23:35:20 +02:00
audio fix 2020-05-31 23:16:24 +03:00
control Merge remote-tracking branch 'origin/master' into miami 2020-06-03 01:24:08 +03:00
core Merge remote-tracking branch 'origin/master' into miami 2020-06-03 01:24:08 +03:00
entities few bike things 2020-06-02 15:26:11 +02:00
extras frontend options fix 2020-05-29 20:29:18 +03:00
fakerw librw update 2020-05-27 20:42:15 +02:00
math Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-06-01 18:05:24 +02:00
modelinfo some CBike code; vehicle cleanup 2020-06-02 23:35:20 +02:00
objects fixes for CPhysical and friends 2020-05-22 14:34:44 +02:00
peds some CBike code; vehicle cleanup 2020-06-02 23:35:20 +02:00
render Merge remote-tracking branch 'origin/master' into miami 2020-06-03 01:24:08 +03:00
rw hanim fix 2020-06-01 20:32:43 +02:00
save Merge remote-tracking branch 'origin/master' into miami 2020-06-03 01:24:08 +03:00
skel Merge remote-tracking branch 'origin/master' into miami 2020-06-03 01:24:08 +03:00
text VC CMenuManager struct, ctor etc. 2020-05-22 03:48:12 +03:00
vehicles Merge remote-tracking branch 'origin/master' into miami 2020-06-03 01:24:08 +03:00
weapons some CBike code; vehicle cleanup 2020-06-02 23:35:20 +02:00