mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-12 17:43:05 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into fix-infinite-fall-into-void

Browse source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Sam Hellawell 2024-05-16 04:48:27 +01:00
commit 64142dbd51
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -172,6 +172,7 @@
Bug #7901: Editor: Teleport-related fields shouldn't be editable if a ref does not teleport Bug #7901: Editor: Teleport-related fields shouldn't be editable if a ref does not teleport
Bug #7908: Key bindings names in the settings menu are layout-specific Bug #7908: Key bindings names in the settings menu are layout-specific
Bug #7943: Using "addSoulGem" and "dropSoulGem" commands to creatures works only with "Weapon & Shield" flagged ones Bug #7943: Using "addSoulGem" and "dropSoulGem" commands to creatures works only with "Weapon & Shield" flagged ones
Bug #7980: Paralyzed NPCs' lips move
Feature #1415: Infinite fall failsafe Feature #1415: Infinite fall failsafe
Feature #2566: Handle NAM9 records for manual cell references Feature #2566: Handle NAM9 records for manual cell references
Feature #3537: Shader-based water ripples Feature #3537: Shader-based water ripples

3
apps/openmw/mwrender/npcanimation.cpp
View file

@ -155,6 +155,9 @@ namespace MWRender
if (!mEnabled) if (!mEnabled)
return; return;
if (dt == 0.f)
return;
if (!MWBase::Environment::get().getSoundManager()->sayActive(mReference)) if (!MWBase::Environment::get().getSoundManager()->sayActive(mReference))
{ {
mBlinkTimer += dt; mBlinkTimer += dt;