(1762f02b3) Merge branch 'dev' into human-ai

2019-05-16 05:08:22 +03:00
parent 4797f6b0d3
commit 454dda56c7
91 changed files with 1138 additions and 744 deletions
@@ -42,10 +42,17 @@ namespace Barotrauma
            bool displace = moveAmount.LengthSquared() > 100.0f * 100.0f;
            foreach (Submarine sub in subsToMove)
            {
-                sub.PhysicsBody.SetTransform(sub.PhysicsBody.SimPosition + ConvertUnits.ToSimUnits(moveAmount), 0.0f);
                sub.PhysicsBody.LinearVelocity = newVelocity;

-                if (displace) sub.SubBody.DisplaceCharacters(moveAmount);
+                if (displace)
+                {
+                    sub.PhysicsBody.SetTransform(sub.PhysicsBody.SimPosition + ConvertUnits.ToSimUnits(moveAmount), 0.0f);
+                    sub.SubBody.DisplaceCharacters(moveAmount);
+                }
+                else
+                {
+                    sub.PhysicsBody.SetTransformIgnoreContacts(sub.PhysicsBody.SimPosition + ConvertUnits.ToSimUnits(moveAmount), 0.0f);
+                }
            }

            if (closestSub != null && subsToMove.Contains(closestSub))
@@ -55,7 +62,6 @@ namespace Barotrauma

                if (Character.Controlled != null) Character.Controlled.CursorPosition += moveAmount;
            }
-
        }
    }
 }