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 'imblockingyou' into 'master'

Browse Source 
Allow movement during blocking (bug #6327)

Closes #6327

See merge request OpenMW/openmw!1377
This commit is contained in:
Evil Eye 2021-11-10 21:20:10 +00:00
commit aaf586a928
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

@ -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

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

@ -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;