1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 15:40:00 +00:00
re3/src/extras
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
..
shaders neo pipelines; postfx fix 2020-08-19 16:10:22 +02:00
arrow.inc implemented debugmenu 2020-04-24 14:08:06 +02:00
cursor.inc implemented debugmenu 2020-04-24 14:08:06 +02:00
custompipes.cpp txd.img bug 2020-08-19 16:54:09 +02:00
custompipes.h neo pipelines; postfx fix 2020-08-19 16:10:22 +02:00
custompipes_d3d9.cpp neo pipelines; postfx fix 2020-08-19 16:10:22 +02:00
custompipes_gl.cpp neo pipelines; postfx fix 2020-08-19 16:10:22 +02:00
debugmenu.cpp RwCameraGetCurrentCamera 2020-05-27 09:47:57 +02:00
debugmenu.h Place debug menu under ifdef 2020-05-09 16:06:13 +03:00
ini_parser.hpp Fixes, mouse AUX buttons, joystick detect menu 2020-09-30 20:03:01 +03:00
inttypes.h implemented debugmenu 2020-04-24 14:08:06 +02:00
postfx.cpp extended postfx and sniper hud fix 2020-08-13 18:14:24 +02:00
postfx.h extended postfx and sniper hud fix 2020-08-13 18:14:24 +02:00