1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-09-27 22:26:20 +00:00
re3/src
Sergeanur b26eec5daf Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/soundlist.h
#	src/control/Script.cpp
#	src/control/ScriptCommands.h
#	src/core/Cam.cpp
#	src/core/Camera.cpp
#	src/core/Camera.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.cpp
#	src/core/MenuScreens.cpp
#	src/core/Pad.cpp
#	src/core/Pad.h
#	src/core/config.h
#	src/entities/Entity.cpp
#	src/render/Credits.cpp
#	src/render/Fluff.cpp
#	src/render/Hud.cpp
#	src/render/MBlur.cpp
#	src/render/Timecycle.cpp
#	src/skel/glfw/glfw.cpp
#	src/skel/win/win.cpp
#	src/text/Text.cpp
2020-06-29 12:56:50 +03:00
..
animation Merge remote-tracking branch 'origin/master' into miami 2020-06-29 12:56:50 +03:00
audio Merge remote-tracking branch 'origin/master' into miami 2020-06-29 12:56:50 +03:00
control Merge remote-tracking branch 'origin/master' into miami 2020-06-29 12:56:50 +03:00
core Merge remote-tracking branch 'origin/master' into miami 2020-06-29 12:56:50 +03:00
entities renamed 2dfx shadowRange to Size 2020-06-28 12:08:46 +02:00
extras frontend options fix 2020-05-29 20:29:18 +03:00
fakerw CCamera done 2020-06-20 14:54:11 +02:00
math Merge branch 'master' into miami 2020-06-07 04:15:10 +03:00
modelinfo Merge branch 'miami' into miami 2020-06-16 23:02:21 +03:00
objects fixes for CPhysical and friends 2020-05-22 14:34:44 +02:00
peds Merge pull request #638 from erorcun/miami 2020-06-25 15:15:01 +02:00
render Merge remote-tracking branch 'origin/master' into miami 2020-06-29 12:56:50 +03:00
rw Merge branch 'master' into miami 2020-06-07 04:15:10 +03:00
save Merge remote-tracking branch 'origin/master' into miami 2020-06-29 12:56:50 +03:00
skel Merge remote-tracking branch 'origin/master' into miami 2020-06-29 12:56:50 +03:00
text Merge remote-tracking branch 'origin/master' into miami 2020-06-29 12:56:50 +03:00
vehicles CWanted, anim fix, ped objs renaming, remove III beta features 2020-06-22 04:20:56 +03:00
weapons CWanted, anim fix, ped objs renaming, remove III beta features 2020-06-22 04:20:56 +03:00