Merge branch 'master' of https://gitlab.com/poe.regalis/barotrauma

2016-11-18 18:48:10 +02:00
parent 8c90fd1774 a4ebb116c0
commit 6ca605aa57
2 changed files with 2 additions and 1 deletions
--- a/Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
+++ b/Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
@@ -61,6 +61,7 @@ namespace Barotrauma

            if (character.IsDead || character.IsUnconscious || stunTimer > 0.0f)
            {
+                levitatingCollider = false;
                Collider.FarseerBody.FixedRotation = false;

                /*if (character.IsRemotePlayer)