a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-09-30 09:37:02 +00:00
Code Issues Projects Releases Wiki Activity
re3/src/skel
History
Sergeanur d0f5464200 Merge branch 'master' into miami 
# Conflicts:
#	src/control/CarAI.cpp
#	src/control/Phones.cpp
#	src/control/Phones.h
#	src/control/Record.cpp
#	src/control/Restart.cpp
#	src/control/Script.cpp
#	src/core/Collision.cpp
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.h
#	src/core/Streaming.cpp
#	src/core/TempColModels.cpp
#	src/core/Wanted.cpp
#	src/core/Zones.cpp
#	src/core/config.h
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/entities/Entity.cpp
#	src/entities/Physical.cpp
#	src/extras/frontendoption.cpp
#	src/modelinfo/ModelInfo.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/CivilianPed.cpp
#	src/peds/CopPed.cpp
#	src/peds/EmergencyPed.cpp
#	src/peds/Ped.cpp
#	src/peds/Ped.h
#	src/peds/Population.cpp
#	src/render/Renderer.cpp
#	src/save/GenericGameStorage.cpp
#	src/skel/win/win.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Boat.cpp
#	src/vehicles/Boat.h
#	src/vehicles/Vehicle.cpp
2020-07-13 18:10:17 +03:00
..
glfw Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
win Frontend: Stats, Briefs, gta_vc.set, slider ranges, fixes 2020-07-06 16:38:00 +03:00
crossplatform.cpp Linux build support 2020-05-11 21:00:55 +03:00
crossplatform.h Linux build support 2020-05-11 21:00:55 +03:00
events.cpp Initial GLFW support 2020-04-26 13:29:50 +03:00
events.h rw skeleton 2019-05-31 20:02:26 +03:00
platform.h skeleton typos 2020-05-23 11:34:48 +02:00
skeleton.cpp skeleton typos 2020-05-23 11:34:48 +02:00
skeleton.h skeleton typos 2020-05-23 11:34:48 +02:00