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
..
CutsceneObject.cpp	Merge branch 'miami' into lcs	2021-01-13 14:56:25 +02:00
CutsceneObject.h	miami shadows	2020-07-29 12:17:53 +03:00
DummyObject.cpp	get rid of most --MIAMI comments	2021-01-22 11:43:29 +01:00
DummyObject.h	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
Object.cpp	Merge pull request #869 from Nick007J/miami	2020-12-09 09:55:50 +01:00
Object.h	sync	2021-01-18 22:20:44 +03:00
ObjectData.cpp	get rid of most --MIAMI comments	2021-01-22 11:43:29 +01:00
ObjectData.h	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
ParticleObject.cpp	lcs pobj	2021-01-22 02:59:08 +03:00
ParticleObject.h	Update ParticleObject.h	2021-01-22 03:10:19 +03:00
Projectile.cpp	get rid of most --MIAMI comments	2021-01-22 11:43:29 +01:00
Projectile.h	pragma twice	2020-11-16 15:05:29 +02:00
Stinger.cpp	Use original animation names from VCS	2021-01-27 18:50:24 +02:00
Stinger.h	Enable Stinger	2020-09-01 21:10:35 +03:00