Merge branch 'master' into mathmerge

2020-08-20 20:33:43 +02:00
parent 0b448b500d 7575e143f6
commit bf60a4e9fc
808 changed files with 18173 additions and 5666 deletions
--- a/Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs
+++ b/Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs
@@ -23,7 +23,7 @@ namespace Content.Client.GameObjects.Components.Mobs
        private const float RestoreRateRamp = 0.1f;

        // The maximum magnitude of the kick applied to the camera at any point.
-        private const float KickMagnitudeMax = 5f;
+        private const float KickMagnitudeMax = 2f;

        private Vector2 _currentKick;
        private float _lastKickTime;