re3/src
Sergeanur f1bb09826d Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	gamefiles/TEXT/american.gxt
#	premake5.lua
#	src/audio/MusicManager.cpp
#	src/control/Darkel.cpp
#	src/control/Script.cpp
#	src/core/FileLoader.cpp
#	src/core/Frontend.cpp
#	src/core/Game.cpp
#	src/core/Streaming.cpp
#	src/core/config.h
#	src/core/re3.cpp
#	src/extras/frontendoption.cpp
#	src/extras/frontendoption.h
#	src/render/Hud.cpp
#	src/skel/glfw/glfw.cpp
#	src/vehicles/CarGen.cpp
#	src/vehicles/Vehicle.cpp
#	src/weapons/WeaponInfo.cpp
#	utils/gxt/american.txt
2020-10-11 01:18:08 +03:00
..
animation VC replays 2020-09-26 21:10:23 +03:00
audio Merge pull request #748 from theR4K/miamiUpstream 2020-10-08 16:15:18 +03:00
control Merge remote-tracking branch 'origin/master' into miami 2020-10-11 01:18:08 +03:00
core Merge remote-tracking branch 'origin/master' into miami 2020-10-11 01:18:08 +03:00
entities Fix sniper and water creatures bug, mark some files 2020-10-09 12:24:21 +03:00
extras Merge remote-tracking branch 'origin/master' into miami 2020-10-11 01:18:08 +03:00
fakerw synch fakerw with reVC; update librw 2020-07-29 09:50:06 +02:00
math Fix RotateY 2020-09-15 00:31:32 +03:00
modelinfo Pad, BulletInfo, ProjectileInfo, fixes 2020-10-08 00:26:24 +03:00
objects Fix sniper and water creatures bug, mark some files 2020-10-09 12:24:21 +03:00
peds Fix sniper and water creatures bug, mark some files 2020-10-09 12:24:21 +03:00
render Fix sniper and water creatures bug, mark some files 2020-10-09 12:24:21 +03:00
rw Fix sniper and water creatures bug, mark some files 2020-10-09 12:24:21 +03:00
save Pad, BulletInfo, ProjectileInfo, fixes 2020-10-08 00:26:24 +03:00
skel Merge remote-tracking branch 'origin/master' into miami 2020-10-11 01:18:08 +03:00
text bug fix 2020-10-10 18:19:49 +03:00
vehicles Merge remote-tracking branch 'origin/master' into miami 2020-10-11 01:18:08 +03:00
weapons Merge branch 'miami' of https://github.com/GTAmodding/re3 into new 2020-10-08 22:45:37 +03:00