Merge remote-tracking branch 'barotrauma/master' into new-netcode

# Conflicts: # Subsurface/Properties/AssemblyInfo.cs # Subsurface/Source/Characters/AI/EnemyAIController.cs # Subsurface/Source/Characters/AICharacter.cs # Subsurface/Source/Characters/Character.cs # Subsurface/Source/Items/Components/Signal/Connection.cs # Subsurface/Source/Items/Item.cs # Subsurface/Source/Map/Structure.cs # Subsurface/Source/Networking/GameClient.cs # Subsurface/Source/Networking/GameServer.cs # Subsurface/Source/Screens/NetLobbyScreen.cs
2016-11-05 18:18:20 -03:00
parent 35dafc4792 a32198ff80
commit f0acf69065
57 changed files with 454 additions and 362 deletions
@@ -118,10 +118,7 @@ namespace Barotrauma
            }

            if (canOpenDoors && !character.LockHands) CheckDoorsInPath();
-
-            float allowedDistance = character.AnimController.InWater ? 1.0f : 0.6f;
-            //if (currentPath.CurrentNode!=null && currentPath.CurrentNode.SimPosition.Y > character.SimPosition.Y+1.0f) allowedDistance*=0.5f;
-
+            
            Vector2 pos = host.SimPosition;

            if (character != null && currentPath.CurrentNode != null)
@@ -159,9 +156,7 @@ namespace Barotrauma
            }

            if (currentPath.CurrentNode == null) return Vector2.Zero;
-
-            var hull = character.AnimController.CurrentHull;
-
+            
            if (character.AnimController.Anim == AnimController.Animation.Climbing)
            {
                Vector2 diff = currentPath.CurrentNode.SimPosition - pos;