Merge branch 'master' into triangles

osu.Android.props

@@ -63,6 +63,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.809.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2019.807.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2019.809.0" />
   </ItemGroup>
 </Project>

osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/BodyPiece.cs

@@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
             }
         }
 
-        private Cached subtractionCache = new Cached();
+        private readonly Cached subtractionCache = new Cached();
 
         public override bool Invalidate(Invalidation invalidation = Invalidation.All, Drawable source = null, bool shallPropagate = true)
         {

osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SnakingSliderBody.cs

@@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             var spanProgress = slider.ProgressAt(completionProgress);
 
             double start = 0;
-            double end = SnakingIn.Value ? MathHelper.Clamp((Time.Current - (slider.StartTime - slider.TimePreempt)) / slider.TimeFadeIn, 0, 1) : 1;
+            double end = SnakingIn.Value ? MathHelper.Clamp((Time.Current - (slider.StartTime - slider.TimePreempt)) / (slider.TimePreempt / 3), 0, 1) : 1;
 
             if (span >= slider.SpanCount() - 1)
             {

osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs

@@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Osu.Objects
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
             TimePreempt = (float)BeatmapDifficulty.DifficultyRange(difficulty.ApproachRate, 1800, 1200, 450);
-            TimeFadeIn = (float)BeatmapDifficulty.DifficultyRange(difficulty.ApproachRate, 1200, 800, 300);
+            TimeFadeIn = 400; // as per osu-stable
 
             Scale = (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5) / 2;
         }

osu.Game.Rulesets.Osu/Objects/Slider.cs

@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         public double EndTime => StartTime + this.SpanCount() * Path.Distance / Velocity;
         public double Duration => EndTime - StartTime;
 
-        private Cached<Vector2> endPositionCache;
+        private readonly Cached<Vector2> endPositionCache = new Cached<Vector2>();
 
         public override Vector2 EndPosition => endPositionCache.IsValid ? endPositionCache.Value : endPositionCache.Value = Position + this.CurvePositionAt(1);
 

osu.Game.Tournament/Screens/Ladder/LadderScreen.cs

@@ -88,7 +88,7 @@ namespace osu.Game.Tournament.Screens.Ladder
             };
         }
 
-        private Cached layout = new Cached();
+        private readonly Cached layout = new Cached();
 
         protected override void Update()
         {

osu.Game/Beatmaps/Beatmap.cs

@@ -60,5 +60,7 @@ namespace osu.Game.Beatmaps
     public class Beatmap : Beatmap<HitObject>
     {
         public new Beatmap Clone() => (Beatmap)base.Clone();
+
+        public override string ToString() => BeatmapInfo?.ToString() ?? base.ToString();
     }
 }

osu.Game/Beatmaps/Formats/LegacyDecoder.cs

@@ -36,7 +36,7 @@ namespace osu.Game.Beatmaps.Formats
                 {
                     if (!Enum.TryParse(line.Substring(1, line.Length - 2), out section))
                     {
-                        Logger.Log($"Unknown section \"{line}\" in {output}");
+                        Logger.Log($"Unknown section \"{line}\" in \"{output}\"");
                         section = Section.None;
                     }
 
@@ -49,7 +49,7 @@ namespace osu.Game.Beatmaps.Formats
                 }
                 catch (Exception e)
                 {
-                    Logger.Log($"Failed to process line \"{line}\" into {output}: {e.Message}", LoggingTarget.Runtime, LogLevel.Important);
+                    Logger.Log($"Failed to process line \"{line}\" into \"{output}\": {e.Message}", LoggingTarget.Runtime, LogLevel.Important);
                 }
             }
         }

osu.Game/Graphics/Backgrounds/Triangles.cs

@@ -191,7 +191,7 @@ namespace osu.Game.Graphics.Backgrounds
             private readonly List<TriangleParticle> parts = new List<TriangleParticle>();
             private Vector2 size;
 
-            private TriangleBatch<TexturedVertex2D> vertexBatch;
+            private QuadBatch<TexturedVertex2D> vertexBatch;
 
             public TrianglesDrawNode(Triangles source)
                 : base(source)
@@ -217,7 +217,7 @@ namespace osu.Game.Graphics.Backgrounds
                 if (Source.AimCount > 0 && (vertexBatch == null || vertexBatch.Size != Source.AimCount))
                 {
                     vertexBatch?.Dispose();
-                    vertexBatch = new TriangleBatch<TexturedVertex2D>(Source.AimCount, 1);
+                    vertexBatch = new QuadBatch<TexturedVertex2D>(Source.AimCount, 1);
                 }
 
                 shader.Bind();

osu.Game/Graphics/UserInterface/LineGraph.cs

@@ -93,7 +93,7 @@ namespace osu.Game.Graphics.UserInterface
             return base.Invalidate(invalidation, source, shallPropagate);
         }
 
-        private Cached pathCached = new Cached();
+        private readonly Cached pathCached = new Cached();
 
         protected override void Update()
         {

osu.Game/Graphics/UserInterface/ScreenTitle.cs

@@ -15,7 +15,7 @@ namespace osu.Game.Graphics.UserInterface
     {
         public const float ICON_WIDTH = ICON_SIZE + icon_spacing;
 
-        protected const float ICON_SIZE = 25;
+        public const float ICON_SIZE = 25;
 
         private SpriteIcon iconSprite;
         private readonly OsuSpriteText titleText, pageText;

osu.Game/Graphics/UserInterface/ScreenTitleTextureIcon.cs

@@ -0,0 +1,64 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osuTK;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    /// <summary>
+    /// A custom icon class for use with <see cref="ScreenTitle.CreateIcon()"/> based off a texture resource.
+    /// </summary>
+    public class ScreenTitleTextureIcon : CompositeDrawable
+    {
+        private const float circle_allowance = 0.8f;
+
+        private readonly string textureName;
+
+        public ScreenTitleTextureIcon(string textureName)
+        {
+            this.textureName = textureName;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures, OsuColour colours)
+        {
+            Size = new Vector2(ScreenTitle.ICON_SIZE / circle_allowance);
+
+            InternalChildren = new Drawable[]
+            {
+                new CircularContainer
+                {
+                    Masking = true,
+                    BorderColour = colours.Violet,
+                    BorderThickness = 3,
+                    MaskingSmoothness = 1,
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        new Sprite
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Texture = textures.Get(textureName),
+                            Size = new Vector2(circle_allowance),
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        },
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = colours.Violet,
+                            Alpha = 0,
+                            AlwaysPresent = true,
+                        },
+                    }
+                },
+            };
+        }
+    }
+}

osu.Game/Overlays/Changelog/ChangelogHeader.cs

@@ -7,13 +7,11 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API.Requests.Responses;
-using osuTK;
 
 namespace osu.Game.Overlays.Changelog
 {
@@ -123,48 +121,7 @@ namespace osu.Game.Overlays.Changelog
                 AccentColour = colours.Violet;
             }
 
-            protected override Drawable CreateIcon() => new ChangelogIcon();
+            protected override Drawable CreateIcon() => new ScreenTitleTextureIcon(@"Icons/changelog");
-
-            internal class ChangelogIcon : CompositeDrawable
-            {
-                private const float circle_allowance = 0.8f;
-
-                [BackgroundDependencyLoader]
-                private void load(TextureStore textures, OsuColour colours)
-                {
-                    Size = new Vector2(ICON_SIZE / circle_allowance);
-
-                    InternalChildren = new Drawable[]
-                    {
-                        new CircularContainer
-                        {
-                            Masking = true,
-                            BorderColour = colours.Violet,
-                            BorderThickness = 3,
-                            MaskingSmoothness = 1,
-                            RelativeSizeAxes = Axes.Both,
-                            Children = new Drawable[]
-                            {
-                                new Sprite
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Texture = textures.Get(@"Icons/changelog"),
-                                    Size = new Vector2(circle_allowance),
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                },
-                                new Box
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Colour = colours.Violet,
-                                    Alpha = 0,
-                                    AlwaysPresent = true,
-                                },
-                            }
-                        },
-                    };
-                }
-            }
         }
     }
 }

osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs

@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
-        private Cached initialStateCache = new Cached();
+        private readonly Cached initialStateCache = new Cached();
 
         public ScrollingHitObjectContainer()
         {

osu.Game/Screens/Play/SquareGraph.cs

@@ -75,7 +75,7 @@ namespace osu.Game.Screens.Play
             return base.Invalidate(invalidation, source, shallPropagate);
         }
 
-        private Cached layout = new Cached();
+        private readonly Cached layout = new Cached();
         private ScheduledDelegate scheduledCreate;
 
         protected override void Update()

osu.Game/Screens/Select/BeatmapCarousel.cs

@@ -93,8 +93,8 @@ namespace osu.Game.Screens.Select
         }
 
         private readonly List<float> yPositions = new List<float>();
-        private Cached itemsCache = new Cached();
+        private readonly Cached itemsCache = new Cached();
-        private Cached scrollPositionCache = new Cached();
+        private readonly Cached scrollPositionCache = new Cached();
 
         private readonly Container<DrawableCarouselItem> scrollableContent;
 

osu.Game/Storyboards/CommandTimeline.cs

@@ -15,10 +15,10 @@ namespace osu.Game.Storyboards
         public IEnumerable<TypedCommand> Commands => commands.OrderBy(c => c.StartTime);
         public bool HasCommands => commands.Count > 0;
 
-        private Cached<double> startTimeBacking;
+        private readonly Cached<double> startTimeBacking = new Cached<double>();
         public double StartTime => startTimeBacking.IsValid ? startTimeBacking : startTimeBacking.Value = HasCommands ? commands.Min(c => c.StartTime) : double.MinValue;
 
-        private Cached<double> endTimeBacking;
+        private readonly Cached<double> endTimeBacking = new Cached<double>();
         public double EndTime => endTimeBacking.IsValid ? endTimeBacking : endTimeBacking.Value = HasCommands ? commands.Max(c => c.EndTime) : double.MaxValue;
 
         public T StartValue => HasCommands ? commands.OrderBy(c => c.StartTime).First().StartValue : default;

osu.Game/osu.Game.csproj

@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.809.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.807.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.809.0" />
     <PackageReference Include="SharpCompress" Version="0.23.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

osu.iOS.props

@@ -105,8 +105,8 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.809.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.807.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.809.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.807.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.809.0" />
     <PackageReference Include="SharpCompress" Version="0.22.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />