1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-06-15 04:03:12 +00:00
re3/src
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
..
animation Merge remote-tracking branch 'origin/miami' into lcs 2021-02-16 18:08:19 +02:00
audio Merge remote-tracking branch 'origin/miami' into lcs 2021-02-16 18:08:19 +02:00
buildings buildings directory 2020-12-20 12:40:59 +02:00
collision Merge remote-tracking branch 'origin/miami' into lcs 2021-02-16 18:08:19 +02:00
control Merge remote-tracking branch 'origin/miami' into lcs 2021-02-16 18:08:19 +02:00
core Merge remote-tracking branch 'origin/miami' into lcs 2021-02-16 18:08:19 +02:00
entities Merge branch 'miami' into lcs 2021-01-25 19:35:03 +02:00
extras Merge remote-tracking branch 'origin/miami' into lcs 2021-02-16 18:08:19 +02:00
fakerw Merge remote-tracking branch 'origin/miami' into lcs 2021-02-16 18:08:19 +02:00
leeds CSimpleModelInfo 2021-01-24 13:47:33 +01:00
math add w to CVector; adjust col structs a bit 2021-02-01 10:57:55 +01:00
modelinfo garages 2021-01-31 01:38:00 +03:00
objects Merge remote-tracking branch 'origin/miami' into lcs 2021-02-16 18:08:19 +02:00
peds Merge remote-tracking branch 'origin/miami' into lcs 2021-02-16 18:08:19 +02:00
render Merge remote-tracking branch 'origin/miami' into lcs 2021-02-16 18:08:19 +02:00
rw Merge remote-tracking branch 'origin/miami' into lcs 2021-02-16 18:08:19 +02:00
save Merge remote-tracking branch 'origin/miami' into lcs 2021-02-16 18:08:19 +02:00
skel Merge remote-tracking branch 'origin/miami' into lcs 2021-02-16 18:08:19 +02:00
text Merge remote-tracking branch 'origin/miami' into lcs 2021-02-16 18:08:19 +02:00
vehicles Merge remote-tracking branch 'origin/miami' into lcs 2021-02-16 18:08:19 +02:00
weapons Merge remote-tracking branch 'origin/miami' into lcs 2021-02-16 18:08:19 +02:00
CMakeLists.txt Merge remote-tracking branch 'origin/miami' into lcs 2021-02-16 18:08:19 +02:00