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
..
glfw	Merge remote-tracking branch 'origin/miami' into lcs	2021-02-16 18:08:19 +02:00
win	Merge remote-tracking branch 'origin/miami' into lcs	2021-02-16 18:08:19 +02:00
crossplatform.cpp	Fix some UBs	2021-01-29 01:44:33 +03:00
crossplatform.h	Detect joystick menu for XInput	2021-02-07 19:50:17 +03:00
events.cpp	get rid of most --MIAMI comments	2021-01-22 11:43:29 +01: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 remote-tracking branch 'origin/miami' into lcs	2021-01-22 15:04:09 +02:00
skeleton.h	AnimViewer fixes, commentary from miami	2020-12-09 05:10:57 +03:00