mirror of
https://github.com/halpz/re3.git
synced 2025-05-01 23:55:47 +00:00
fae4c73ad3
# 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