1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-07-03 08:37:07 +00:00
re3/src/skel
Sergeanur fae4c73ad3 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	premake5.lua
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.h
#	src/audio/MusicManager.cpp
#	src/audio/sampman.h
#	src/audio/sampman_oal.cpp
#	src/control/CarCtrl.cpp
#	src/control/Replay.cpp
#	src/control/Script.cpp
#	src/core/Camera.cpp
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.cpp
#	src/core/MenuScreens.cpp
#	src/core/config.h
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/math/Matrix.cpp
#	src/math/Matrix.h
#	src/math/Vector2D.h
#	src/peds/Ped.cpp
#	src/render/Credits.cpp
#	src/render/Hud.cpp
#	src/render/Skidmarks.cpp
#	src/weapons/Weapon.cpp
2020-09-30 02:25:30 +03:00
..
glfw Fixes: PS2/PS2-like menu, Hud, new sliding text found 2020-09-27 19:22:21 +03:00
win Merge remote-tracking branch 'origin/master' into miami 2020-09-30 02:25:30 +03:00
crossplatform.cpp Fix casepath chaos 2020-07-28 17:56:47 +03:00
crossplatform.h Fix casepath chaos 2020-07-28 17:56:47 +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 Merge branch 'master' into miami 2020-08-15 15:13:46 +03:00
skeleton.cpp Merge branch 'master' into miami 2020-08-15 15:13:46 +03:00
skeleton.h Original screen grabber 2020-08-14 18:57:23 +03:00