Merge branch 'imblockingyou' into 'master'

Allow movement during blocking (bug #6327)

Closes #6327

See merge request OpenMW/openmw!1377

CHANGELOG.md

@@ -67,6 +67,7 @@
     Bug #6322: Total sold/cost should reset to 0 when there are no items offered
     Bug #6323: Wyrmhaven: Alboin doesn't follower the player character out of his house
     Bug #6326: Detect Enchantment/Key should detect items in unresolved containers
+    Bug #6327: Blocking roots the character in place
     Bug #6347: PlaceItem/PlaceItemCell/PlaceAt should work with levelled creatures
     Bug #6354: SFX abruptly cut off after crossing max distance; implement soft fading of sound effects
     Bug #6363: Some scripts in Morrowland fail to work

apps/openmw/mwmechanics/character.cpp

@@ -2061,7 +2061,7 @@ void CharacterController::update(float duration)
         vec.x() *= speed;
         vec.y() *= speed;
 
-        if(mHitState != CharState_None && mJumpState == JumpState_None)
+        if(mHitState != CharState_None && mHitState != CharState_Block && mJumpState == JumpState_None)
             vec = osg::Vec3f();
 
         CharacterState movestate = CharState_None;