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
@@ -564,7 +564,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);