re3/animation at 0682cdedbd9f18643c16e64b091e4983c545ab23 - re3 - SAR

mirror of https://github.com/halpz/re3.git synced 2025-02-25 02:32:11 +00:00

History

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

AnimationId.h

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

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

AnimBlendAssocGroup.cpp

Merge branch 'miami' into lcs

2021-01-25 19:35:03 +02:00

AnimBlendAssocGroup.h

CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit

2021-01-11 19:53:15 +02:00

AnimBlendAssociation.cpp

get rid of most --MIAMI comments