Merge branch 'master' into fix-relax-mod-keypresses

osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs

@@ -62,6 +62,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 }
             };
 
+            bool overlayAboveNumber = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.HitCircleOverlayAboveNumber)?.Value ?? true;
+
+            if (!overlayAboveNumber)
+                ChangeInternalChildDepth(hitCircleText, -float.MaxValue);
+
             state.BindTo(drawableObject.State);
             state.BindValueChanged(updateState, true);
 

osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs

@@ -11,6 +11,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         SliderPathRadius,
         AllowSliderBallTint,
         CursorExpand,
-        CursorRotate
+        CursorRotate,
+        HitCircleOverlayAboveNumber
     }
 }

osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs

@@ -28,10 +28,11 @@ namespace osu.Game.Scoring.Legacy
         {
             var score = new Score
             {
-                ScoreInfo = new ScoreInfo(),
                 Replay = new Replay()
             };
 
+            WorkingBeatmap workingBeatmap;
+
             using (SerializationReader sr = new SerializationReader(stream))
             {
                 currentRuleset = GetRuleset(sr.ReadByte());
@@ -41,7 +42,7 @@ namespace osu.Game.Scoring.Legacy
 
                 var version = sr.ReadInt32();
 
-                var workingBeatmap = GetBeatmap(sr.ReadString());
+                workingBeatmap = GetBeatmap(sr.ReadString());
                 if (workingBeatmap is DummyWorkingBeatmap)
                     throw new BeatmapNotFoundException();
 
@@ -113,6 +114,10 @@ namespace osu.Game.Scoring.Legacy
 
             CalculateAccuracy(score.ScoreInfo);
 
+            // before returning for database import, we must restore the database-sourced BeatmapInfo.
+            // if not, the clone operation in GetPlayableBeatmap will cause a dereference and subsequent database exception.
+            score.ScoreInfo.Beatmap = workingBeatmap.BeatmapInfo;
+
             return score;
         }
 

osu.Game/Storyboards/Drawables/DrawableStoryboard.cs

@@ -50,7 +50,7 @@ namespace osu.Game.Storyboards.Drawables
 
             AddInternal(Content = new Container<DrawableStoryboardLayer>
             {
-                Size = new Vector2(640, 480),
+                RelativeSizeAxes = Axes.Both,
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             });

osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs

@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Storyboards.Drawables
 {
-    public class DrawableStoryboardLayer : LifetimeManagementContainer
+    public class DrawableStoryboardLayer : CompositeDrawable
     {
         public StoryboardLayer Layer { get; }
         public bool Enabled;
@@ -23,17 +23,34 @@ namespace osu.Game.Storyboards.Drawables
             Origin = Anchor.Centre;
             Enabled = layer.VisibleWhenPassing;
             Masking = layer.Masking;
+
+            InternalChild = new LayerElementContainer(layer);
         }
 
-        [BackgroundDependencyLoader]
-        private void load(CancellationToken? cancellationToken)
+        private class LayerElementContainer : LifetimeManagementContainer
         {
-            foreach (var element in Layer.Elements)
-            {
-                cancellationToken?.ThrowIfCancellationRequested();
+            private readonly StoryboardLayer storyboardLayer;
 
-                if (element.IsDrawable)
-                    AddInternal(element.CreateDrawable());
+            public LayerElementContainer(StoryboardLayer layer)
+            {
+                storyboardLayer = layer;
+
+                Width = 640;
+                Height = 480;
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(CancellationToken? cancellationToken)
+            {
+                foreach (var element in storyboardLayer.Elements)
+                {
+                    cancellationToken?.ThrowIfCancellationRequested();
+
+                    if (element.IsDrawable)
+                        AddInternal(element.CreateDrawable());
+                }
             }
         }
     }