1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-06-18 12:03:12 +00:00
re3/src/extras
Sergeanur e38467ef3a Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	.github/workflows/reLCS_msvc_amd64.yml
#	.github/workflows/reLCS_msvc_x86.yml
#	README.md
#	gamefiles/TEXT/american.gxt
#	gamefiles/TEXT/french.gxt
#	gamefiles/TEXT/german.gxt
#	gamefiles/TEXT/italian.gxt
#	gamefiles/TEXT/spanish.gxt
#	premake5.lua
#	src/animation/AnimManager.cpp
#	src/animation/AnimationId.h
#	src/audio/MusicManager.cpp
#	src/audio/audio_enums.h
#	src/control/Script7.cpp
#	src/core/FileLoader.cpp
#	src/core/re3.cpp
#	src/extras/custompipes_d3d9.cpp
#	src/extras/custompipes_gl.cpp
#	src/extras/postfx.cpp
#	src/extras/shaders/colourfilterVC.frag
#	src/extras/shaders/colourfilterVC_PS.hlsl
#	src/extras/shaders/make_hlsl.cmd
#	src/extras/shaders/obj/colourfilterVC_PS.cso
#	src/extras/shaders/obj/colourfilterVC_PS.inc
#	src/extras/shaders/obj/colourfilterVC_frag.inc
#	src/peds/PedFight.cpp
#	src/render/Font.cpp
#	src/render/Hud.cpp
#	src/render/Particle.cpp
#	src/render/WaterCannon.cpp
#	src/skel/win/gtavc.ico
#	src/vehicles/Automobile.cpp
#	utils/gxt/american.txt
#	utils/gxt/french.txt
#	utils/gxt/german.txt
#	utils/gxt/italian.txt
#	utils/gxt/spanish.txt
2021-02-16 18:08:19 +02:00
..
shaders Merge remote-tracking branch 'origin/miami' into lcs 2021-02-16 18:08:19 +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 ini fixes 2021-01-25 10:30:57 +01:00
custompipes.h Merge branch 'miami' into lcs 2021-01-20 19:32:03 +02:00
custompipes_d3d9.cpp reorganize shaders; use modulate flag; update librw 2021-02-06 16:49:52 +01:00
custompipes_gl.cpp reorganize shaders; use modulate flag; update librw 2021-02-06 16:49:52 +01:00
debugmenu.cpp inttypes.h is part of the C++ standard, so prefix it 2020-12-06 20:46:11 +01:00
debugmenu.h Fix debug menu memory leak 2020-12-25 10:57:39 +02:00
frontendoption.cpp Store all settings in .INI 2021-01-23 15:59:38 +03:00
frontendoption.h Store all settings in .INI 2021-01-23 15:59:38 +03:00
GitSHA1.cpp.in Cmake version for hash 2021-02-12 21:09:46 +03:00
GitSHA1.h Remove version text, add toggleable debug info(with commit hash!) 2021-02-12 21:09:23 +03:00
ini_parser.hpp Migrate from old .ini to new .ini 2021-01-23 16:04:19 +03:00
postfx.cpp reorganize shaders; use modulate flag; update librw 2021-02-06 16:49:52 +01:00
postfx.h work on colourfilters 2021-01-19 20:42:16 +01:00
re3_inttypes.h inttypes.h is part of the C++ standard, so prefix it 2020-12-06 20:46:11 +01:00
screendroplets.cpp reorganize shaders; use modulate flag; update librw 2021-02-06 16:49:52 +01:00
screendroplets.h neo screen droplets 2020-11-19 19:07:32 +01:00