Merge branch 'new-netcode' of https://gitlab.com/poe.regalis/barotrauma into new-netcode

# Conflicts: # Subsurface/Source/Characters/Character.cs
2017-01-08 12:30:56 -03:00
parent 4b868fc09d 05cb5989dc
commit 073def094f
10 changed files with 284 additions and 135 deletions
@@ -155,8 +155,8 @@ namespace Barotrauma
            if (!flip) return;

            flipTimer += deltaTime;
-            
-            if (TargetDir != dir) 
+
+            if (TargetDir != Direction.None && TargetDir != dir) 
            {   
                if (flipTimer>1.0f || character.IsRemotePlayer)
                {