1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2024-12-26 18:15:27 +00:00
re3/src
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
..
animation VC fighting, Peds, many fixes including ghost bikes 2020-07-09 17:01:07 +03:00
audio VC fighting, Peds, many fixes including ghost bikes 2020-07-09 17:01:07 +03:00
control Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
core Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
entities Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
extras Bettah car enter canceling, fix CFO crash, ped objs. renaming 2020-07-03 16:51:33 +03:00
fakerw CCamera done 2020-06-20 14:54:11 +02:00
math fixes to CBoat 2020-07-01 18:03:59 +02:00
modelinfo Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
objects Merge pull request #647 from Fire-Head/miami 2020-07-04 21:24:17 +02:00
peds Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
render Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
rw CBoat and friends 2020-07-01 18:04:02 +02:00
save Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
skel Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
text Merge remote-tracking branch 'origin/master' into miami 2020-06-29 12:56:50 +03:00
vehicles Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
weapons Restored beta police system(disabled), fixes from miami, debug info for CFO crash (#639) 2020-07-01 15:28:43 +03:00