diff --git a/Subsurface/Barotrauma.csproj b/Subsurface/Barotrauma.csproj index 221dfe0c6..6395be753 100644 --- a/Subsurface/Barotrauma.csproj +++ b/Subsurface/Barotrauma.csproj @@ -742,9 +742,6 @@ PreserveNewest Designer - - PreserveNewest - PreserveNewest Designer diff --git a/Subsurface/Content/Items/Electricity/signalcomp.png b/Subsurface/Content/Items/Electricity/signalcomp.png index 9c82d1c9b..3bcb19786 100644 Binary files a/Subsurface/Content/Items/Electricity/signalcomp.png and b/Subsurface/Content/Items/Electricity/signalcomp.png differ diff --git a/Subsurface/Content/Items/Electricity/signalitems.xml b/Subsurface/Content/Items/Electricity/signalitems.xml index 99f827c3f..09f7c6bc2 100644 --- a/Subsurface/Content/Items/Electricity/signalitems.xml +++ b/Subsurface/Content/Items/Electricity/signalitems.xml @@ -15,9 +15,9 @@ - + - + @@ -38,8 +38,9 @@ - - + + + @@ -59,8 +60,9 @@ - - + + + @@ -80,8 +82,9 @@ - - + + + diff --git a/Subsurface/Content/Items/Electricity/wire.png b/Subsurface/Content/Items/Electricity/wire.png deleted file mode 100644 index b7e47f301..000000000 Binary files a/Subsurface/Content/Items/Electricity/wire.png and /dev/null differ diff --git a/Subsurface/Content/Items/Jobgear/captaingear.xml b/Subsurface/Content/Items/Jobgear/captaingear.xml index b9303bf9c..86f6c402b 100644 --- a/Subsurface/Content/Items/Jobgear/captaingear.xml +++ b/Subsurface/Content/Items/Jobgear/captaingear.xml @@ -8,7 +8,7 @@ - + diff --git a/Subsurface/Source/Physics/PhysicsBody.cs b/Subsurface/Source/Physics/PhysicsBody.cs index 4e6f9a296..ad1e881d9 100644 --- a/Subsurface/Source/Physics/PhysicsBody.cs +++ b/Subsurface/Source/Physics/PhysicsBody.cs @@ -500,7 +500,7 @@ namespace Barotrauma { //if there are more than 2 positions in the buffer, //increase the interpolation speed to catch up with the server - float speedMultiplier = 0.9f + (float)Math.Pow((positionBuffer.Count - 2) / 5.0f, 2.0f); + float speedMultiplier = (float)Math.Pow(1.0f + (positionBuffer.Count - 2) / 10.0f, 2.0f); netInterpolationState += (deltaTime * speedMultiplier) / (next.Timestamp - prev.Timestamp); newPosition = Vector2.Lerp(prev.Position, next.Position, netInterpolationState);