Merged branch master into combat-mission

2016-10-01 20:10:38 -03:00
parent bdcd894b83 fe6ef93941
commit 75e7b3a94e
21 changed files with 318 additions and 232 deletions
--- a/Subsurface/Source/Characters/AI/EnemyAIController.cs
+++ b/Subsurface/Source/Characters/AI/EnemyAIController.cs
@@ -341,7 +341,7 @@ namespace Barotrauma
            {
                wallAttackPos = Vector2.Zero;
                limb.AttackTimer = 0.0f;
-                if (Vector2.Distance(limb.SimPosition, attackPosition)<5.0) coolDownTimer = attackCoolDown;                
+                coolDownTimer = attackCoolDown;                
            }
        }