Merge remote-tracking branch 'origin/miami' into lcs

Browse source

# 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

...

This commit is contained in:

Sergeanur 2021-02-16 18:08:19 +02:00

parent 78f4e8fdca b451be6c7f

commit e38467ef3a

114 changed files with 5143 additions and 2112 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1122

gamefiles/gamecontrollerdb.txt

View file

File diff suppressed because it is too large Load diff

BIN

gamefiles/models/frontend_ds2.txd Normal file

View file

Binary file not shown.

BIN

gamefiles/models/frontend_ds3.txd Normal file

View file

Binary file not shown.

BIN

gamefiles/models/frontend_ds4.txd Normal file

View file

Binary file not shown.

BIN

gamefiles/models/frontend_x360.txd Normal file

View file

Binary file not shown.

BIN

gamefiles/models/frontend_xone.txd Normal file

View file

Binary file not shown.

BIN

gamefiles/models/generic.txd Normal file

View file

Binary file not shown.

BIN

gamefiles/models/ps3btns.txd Normal file

View file

Binary file not shown.

BIN

gamefiles/models/x360btns.txd

View file

Binary file not shown.