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
..
Messages.cpp	Merge remote-tracking branch 'origin/miami' into lcs	2021-01-22 15:04:09 +02:00
Messages.h	CMessages::GetTokenPadKeyString	2021-01-22 05:49:17 +02:00
Pager.cpp	Struct cleanup, various fixes, enable PS2 rand	2020-04-19 16:44:35 +03:00
Pager.h	Struct cleanup, various fixes, enable PS2 rand	2020-04-19 16:44:35 +03:00
Text.cpp	Merge remote-tracking branch 'origin/miami' into lcs	2021-02-16 18:08:19 +02:00
Text.h	Merge branch 'miami' into lcs	2021-01-13 14:56:25 +02:00