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/UserInterface/CooldownGraphic.cs
+++ b/Content.Client/UserInterface/CooldownGraphic.cs
@@ -30,6 +30,7 @@ namespace Content.Client.UserInterface

        protected override void Draw(DrawingHandleScreen handle)
        {
+            Span<float> x = stackalloc float[10];
            Color color;

            var lerp = 1f - MathF.Abs(Progress); // for future bikeshedding purposes