(6c0663ce1) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-16 06:55:26 +03:00
parent 106c61ca9a
commit 5435adc9b4
16 changed files with 218 additions and 112 deletions
@@ -1154,6 +1154,15 @@ namespace Barotrauma
                SmoothedCursorPosition = cursorPosition - smoothedCursorDiff;
            }
            
+            if (!(this is AICharacter) || Controlled == this || IsRemotePlayer)
+            {
+                //apply some smoothing to the cursor positions of remote players when playing as a client
+                //to make aiming look a little less choppy
+                Vector2 smoothedCursorDiff = cursorPosition - SmoothedCursorPosition;
+                smoothedCursorDiff = NetConfig.InterpolateCursorPositionError(smoothedCursorDiff);
+                SmoothedCursorPosition = cursorPosition - smoothedCursorDiff;
+            }
+            
            if (!(this is AICharacter) || Controlled == this || IsRemotePlayer)
            {
                if (speedMultipliers.Count == 0) return 1f;