mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'seductive_poses' into 'master'

Browse Source 
Don't mark idle animations as bad when blocking them

Closes #6730

See merge request OpenMW/openmw!1826
This commit is contained in:
Alexei Kotov 2022-05-04 20:20:04 +00:00
commit 06dee79cc3
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -117,6 +117,7 @@
Bug #6711: Log time differs from real time
Bug #6717: Broken script causes interpreter stack corruption
Bug #6718: Throwable weapons cause arrow enchantment effect to be applied to the whole body
Bug #6730: LoopGroup stalls animation after playing :Stop frame until another animation is played
Feature #890: OpenMW-CS: Column filtering
Feature #1465: "Reset" argument for AI functions
Feature #2491: Ability to make OpenMW "portable"

2
apps/openmw/mwmechanics/character.cpp
View File

@ -2457,7 +2457,7 @@ bool CharacterController::playGroup(const std::string &groupname, int mode, int
// We should not interrupt persistent animations by non-persistent ones
if (isPersistentAnimPlaying() && !persist)
return false;
return true;
// If this animation is a looped animation (has a "loop start" key) that is already playing
// and has not yet reached the end of the loop, allow it to continue animating with its existing loop count