mirror of
https://github.com/OpenMW/openmw.git
synced 2025-07-01 20:41:34 +00:00
Merge remote-tracking branch 'origin/master' into fix-infinite-fall-into-void
# Conflicts: # CHANGELOG.md
This commit is contained in:
commit
64142dbd51
2 changed files with 4 additions and 0 deletions
|
@ -172,6 +172,7 @@
|
|||
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 #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 #2566: Handle NAM9 records for manual cell references
|
||||
Feature #3537: Shader-based water ripples
|
||||
|
|
|
@ -155,6 +155,9 @@ namespace MWRender
|
|||
if (!mEnabled)
|
||||
return;
|
||||
|
||||
if (dt == 0.f)
|
||||
return;
|
||||
|
||||
if (!MWBase::Environment::get().getSoundManager()->sayActive(mReference))
|
||||
{
|
||||
mBlinkTimer += dt;
|
||||
|
|
Loading…
Reference in a new issue