Merge branch 'master' into new-netcode

Conflicts: Subsurface/Properties/AssemblyInfo.cs
2017-02-22 23:33:14 +02:00
parent 75d047b57e 5006a9af6c
commit 3fcaff0288
23 changed files with 82 additions and 46 deletions
@@ -272,11 +272,7 @@ namespace Barotrauma.Items.Components
                dir = dir == Direction.Left ? Direction.Right : Direction.Left;
            }

-            if (userPos.X != 0.0f)
-            {
-                float diff = (item.Rect.X + UserPos.X) - item.Rect.Center.X;
-                userPos.X = item.Rect.Center.X - diff - item.Rect.X;
-            }
+            userPos.X = -UserPos.X;            

            for (int i = 0; i < limbPositions.Count; i++)
            {