mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-10-08 19:30:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into miami

Browse source 
# Conflicts:
#	src/animation/AnimBlendAssocGroup.cpp
#	src/animation/AnimBlendAssociation.cpp
#	src/animation/AnimManager.cpp
#	src/core/Streaming.cpp
This commit is contained in:
Sergeanur 2020-05-09 02:55:32 +03:00
commit 4b8d6a3223
4 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/animation/AnimBlendAssociation.cpp
View file

@ -159,6 +159,7 @@ CAnimBlendAssociation::Start(float time)
flags |= ASSOC_RUNNING;
SetCurrentTime(time);
}
bool
CAnimBlendAssociation::UpdateTime(float timeDelta, float relSpeed)
{