Merge branch 'stagger' into 'master'

Cancel stagger after weapon release animations (bug #6869)

Closes #6869

See merge request OpenMW/openmw!2192

CHANGELOG.md

@@ -133,6 +133,7 @@
     Bug #6794: Light sources are attached to mesh bounds centers instead of mesh origins when AttachLight NiNode is missing
     Bug #6799: Game crashes if an NPC has no Class attached
     Bug #6849: ImageButton texture is not scaled properly
+    Bug #6869: Hits queue stagger during swing animation
     Bug #6895: Removing a negative number of items from a script, makes the script terminate with an error
     Bug #6898: Accessing the Quick Inventory menu does not work while in menu mode
     Bug #6901: Morrowind.exe soul gem usage discrepancy

apps/openmw/mwmechanics/character.cpp

@@ -1663,6 +1663,11 @@ bool CharacterController::updateState(CharacterState idle)
             if (ammunition && mWeaponType == ESM::Weapon::MarksmanCrossbow)
                 mAnimation->attachArrow();
 
+            // Cancel stagger animation at the end of an attack to avoid abrupt transitions
+            // in favor of a different abrupt transition, like Morrowind
+            if (mUpperBodyState != UpperCharState_EquipingWeap && isRecovery())
+                mAnimation->disable(mCurrentHit);
+
             mUpperBodyState = UpperCharState_WeapEquiped;
         }
         else if(mUpperBodyState == UpperCharState_UnEquipingWeap)