Merge conflict "resolution"

osu.Android.props

@@ -51,7 +51,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.315.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.331.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.327.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.331.0" />
   </ItemGroup>
 </Project>

osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs

@@ -72,10 +72,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
         protected override Skill[] CreateSkills(IBeatmap beatmap)
         {
             using (var catcher = new Catcher(beatmap.BeatmapInfo.BaseDifficulty))
-            {
                 halfCatcherWidth = catcher.CatchWidth * 0.5f;
-                halfCatcherWidth *= 0.8f; // We're only using 80% of the catcher's width to simulate imperfect gameplay.
-            }
 
             return new Skill[]
             {

osu.Game.Rulesets.Catch/UI/Catcher.cs

@@ -37,10 +37,15 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public CatcherAnimationState CurrentState { get; private set; }
 
+        /// <summary>
+        /// The width of the catcher which can receive fruit. Equivalent to "catchMargin" in osu-stable.
+        /// </summary>
+        private const float allowed_catch_range = 0.8f;
+
         /// <summary>
         /// Width of the area that can be used to attempt catches during gameplay.
         /// </summary>
-        internal float CatchWidth => CatcherArea.CATCHER_SIZE * Math.Abs(Scale.X);
+        internal float CatchWidth => CatcherArea.CATCHER_SIZE * Math.Abs(Scale.X) * allowed_catch_range;
 
         protected bool Dashing
         {

osu.Game.Rulesets.Catch/UI/CatcherSprite.cs

@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public CatcherSprite(CatcherAnimationState state)
             : base(new CatchSkinComponent(componentFromState(state)), _ =>
-                new DefaultCatcherSprite(state), confineMode: ConfineMode.ScaleDownToFit)
+                new DefaultCatcherSprite(state), confineMode: ConfineMode.ScaleToFit)
         {
             RelativeSizeAxes = Axes.None;
             Size = new Vector2(CatcherArea.CATCHER_SIZE);

osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs

@@ -90,7 +90,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             void handleHitCircle(DrawableHitCircle circle)
             {
-                if (!circle.IsHovered)
+                if (!circle.HitArea.IsHovered)
                     return;
 
                 Debug.Assert(circle.HitObject.HitWindows != null);

osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs

@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
     /// <summary>
     /// A single follow point positioned between two adjacent <see cref="DrawableOsuHitObject"/>s.
     /// </summary>
-    public class FollowPoint : Container
+    public class FollowPoint : Container, IAnimationTimeReference
     {
         private const float width = 8;
 
@@ -45,5 +45,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                 }
             }, confineMode: ConfineMode.NoScaling);
         }
+
+        public double AnimationStartTime { get; set; }
     }
 }

osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs

@@ -116,6 +116,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 
             int point = 0;
 
+            ClearInternal();
+
             for (int d = (int)(spacing * 1.5); d < distance - spacing; d += spacing)
             {
                 float fraction = (float)d / distance;
@@ -126,13 +128,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 
                 FollowPoint fp;
 
-                if (InternalChildren.Count > point)
+                AddInternal(fp = new FollowPoint());
-                {
-                    fp = (FollowPoint)InternalChildren[point];
-                    fp.ClearTransforms();
-                }
-                else
-                    AddInternal(fp = new FollowPoint());
 
                 fp.Position = pointStartPosition;
                 fp.Rotation = rotation;
@@ -142,6 +138,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                 if (firstTransformStartTime == null)
                     firstTransformStartTime = fadeInTime;
 
+                fp.AnimationStartTime = fadeInTime;
+
                 using (fp.BeginAbsoluteSequence(fadeInTime))
                 {
                     fp.FadeIn(osuEnd.TimeFadeIn);

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.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs

@@ -43,16 +43,15 @@ namespace osu.Game.Tests.Visual.Gameplay
                         {
                             new ExposedSkinnableDrawable("default", _ => new DefaultBox(), _ => true),
                             new ExposedSkinnableDrawable("available", _ => new DefaultBox(), _ => true),
-                            new ExposedSkinnableDrawable("available", _ => new DefaultBox(), _ => true, ConfineMode.ScaleToFit),
                             new ExposedSkinnableDrawable("available", _ => new DefaultBox(), _ => true, ConfineMode.NoScaling)
                         }
                     },
                 };
             });
 
-            AddAssert("check sizes", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 30, 30, 30, 50 }));
+            AddAssert("check sizes", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 30, 30, 50 }));
             AddStep("adjust scale", () => fill.Scale = new Vector2(2));
-            AddAssert("check sizes unchanged by scale", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 30, 30, 30, 50 }));
+            AddAssert("check sizes unchanged by scale", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 30, 30, 50 }));
         }
 
         [Test]
@@ -74,7 +73,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                         Children = new[]
                         {
                             new ExposedSkinnableDrawable("default", _ => new DefaultBox(), _ => true),
-                            new ExposedSkinnableDrawable("available", _ => new DefaultBox(), _ => true),
                             new ExposedSkinnableDrawable("available", _ => new DefaultBox(), _ => true, ConfineMode.ScaleToFit),
                             new ExposedSkinnableDrawable("available", _ => new DefaultBox(), _ => true, ConfineMode.NoScaling)
                         }
@@ -82,9 +80,9 @@ namespace osu.Game.Tests.Visual.Gameplay
                 };
             });
 
-            AddAssert("check sizes", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 50, 30, 50, 30 }));
+            AddAssert("check sizes", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 50, 50, 30 }));
             AddStep("adjust scale", () => fill.Scale = new Vector2(2));
-            AddAssert("check sizes unchanged by scale", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 50, 30, 50, 30 }));
+            AddAssert("check sizes unchanged by scale", () => fill.Children.Select(c => c.Drawable.DrawWidth).SequenceEqual(new float[] { 50, 50, 30 }));
         }
 
         [Test]
@@ -182,7 +180,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             public new Drawable Drawable => base.Drawable;
 
             public ExposedSkinnableDrawable(string name, Func<ISkinComponent, Drawable> defaultImplementation, Func<ISkinSource, bool> allowFallback = null,
-                                            ConfineMode confineMode = ConfineMode.ScaleDownToFit)
+                                            ConfineMode confineMode = ConfineMode.ScaleToFit)
                 : base(new TestSkinComponent(name), defaultImplementation, allowFallback, confineMode)
             {
             }

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/Skinning/IAnimationTimeReference.cs

@@ -0,0 +1,25 @@
+// 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.Timing;
+
+namespace osu.Game.Skinning
+{
+    /// <summary>
+    /// Denotes an object which provides a reference time to start animations from.
+    /// </summary>
+    [Cached]
+    public interface IAnimationTimeReference
+    {
+        /// <summary>
+        /// The reference clock.
+        /// </summary>
+        IFrameBasedClock Clock { get; }
+
+        /// <summary>
+        /// The time which animations should be started from, relative to <see cref="Clock"/>.
+        /// </summary>
+        double AnimationStartTime { get; }
+    }
+}

osu.Game/Skinning/LegacySkinExtensions.cs

@@ -3,10 +3,12 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.Timing;
 
 namespace osu.Game.Skinning
 {
@@ -22,7 +24,7 @@ namespace osu.Game.Skinning
 
                 if (textures.Length > 0)
                 {
-                    var animation = new TextureAnimation
+                    var animation = new SkinnableTextureAnimation
                     {
                         DefaultFrameLength = getFrameLength(source, applyConfigFrameRate, textures),
                         Repeat = looping,
@@ -53,6 +55,25 @@ namespace osu.Game.Skinning
             }
         }
 
+        public class SkinnableTextureAnimation : TextureAnimation
+        {
+            [Resolved(canBeNull: true)]
+            private IAnimationTimeReference timeReference { get; set; }
+
+            public SkinnableTextureAnimation()
+                : base(false)
+            {
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                if (timeReference != null)
+                    Clock = new FramedOffsetClock(timeReference.Clock) { Offset = -timeReference.AnimationStartTime };
+            }
+        }
+
         private const double default_frame_time = 1000 / 60d;
 
         private static double getFrameLength(ISkin source, bool applyConfigFrameRate, Texture[] textures)

osu.Game/Skinning/SkinnableDrawable.cs

@@ -98,20 +98,13 @@ namespace osu.Game.Skinning
 
                     switch (confineMode)
                     {
-                        case ConfineMode.NoScaling:
+                        case ConfineMode.ScaleToFit:
-                            return;
+                            Drawable.RelativeSizeAxes = Axes.Both;
-
+                            Drawable.Size = Vector2.One;
-                        case ConfineMode.ScaleDownToFit:
+                            Drawable.Scale = Vector2.One;
-                            if (Drawable.DrawSize.X <= DrawSize.X && Drawable.DrawSize.Y <= DrawSize.Y)
+                            Drawable.FillMode = FillMode.Fit;
-                                return;
-
                             break;
                     }
-
-                    Drawable.RelativeSizeAxes = Axes.Both;
-                    Drawable.Size = Vector2.One;
-                    Drawable.Scale = Vector2.One;
-                    Drawable.FillMode = FillMode.Fit;
                 }
                 finally
                 {
@@ -127,7 +120,6 @@ namespace osu.Game.Skinning
         /// Don't apply any scaling. This allows the user element to be of any size, exceeding specified bounds.
         /// </summary>
         NoScaling,
-        ScaleDownToFit,
         ScaleToFit,
     }
 }

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 class LayerElementContainer : LifetimeManagementContainer
-        private void load(CancellationToken? cancellationToken)
         {
-            foreach (var element in Layer.Elements)
+            private readonly StoryboardLayer storyboardLayer;
-            {
-                cancellationToken?.ThrowIfCancellationRequested();
 
-                if (element.IsDrawable)
+            public LayerElementContainer(StoryboardLayer layer)
-                    AddInternal(element.CreateDrawable());
+            {
+                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());
+                }
             }
         }
     }

osu.Game/osu.Game.csproj

@@ -22,8 +22,8 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.315.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.331.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.327.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.331.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />

osu.iOS.props

@@ -70,8 +70,8 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.315.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.331.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.327.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.331.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -79,7 +79,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.327.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.331.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />