Merge branch 'master' into user-profile/decouple-from-api-user

osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModNoScope.cs

@@ -18,6 +18,36 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
     {
         protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();
 
+        [Test]
+        public void TestAlwaysHidden()
+        {
+            CreateModTest(new ModTestData
+            {
+                Mod = new CatchModNoScope
+                {
+                    HiddenComboCount = { Value = 0 },
+                },
+                Autoplay = true,
+                PassCondition = () => Player.ScoreProcessor.Combo.Value == 2,
+                Beatmap = new Beatmap
+                {
+                    HitObjects = new List<HitObject>
+                    {
+                        new Fruit
+                        {
+                            X = CatchPlayfield.CENTER_X * 0.5f,
+                            StartTime = 1000,
+                        },
+                        new Fruit
+                        {
+                            X = CatchPlayfield.CENTER_X * 1.5f,
+                            StartTime = 2000,
+                        }
+                    }
+                }
+            });
+        }
+
         [Test]
         public void TestVisibleDuringBreak()
         {

osu.Game.Rulesets.Catch/Mods/CatchModNoScope.cs

@@ -26,6 +26,9 @@ namespace osu.Game.Rulesets.Catch.Mods
             var catchPlayfield = (CatchPlayfield)playfield;
             bool shouldAlwaysShowCatcher = IsBreakTime.Value;
             float targetAlpha = shouldAlwaysShowCatcher ? 1 : ComboBasedAlpha;
+
+            // AlwaysPresent required for catcher to still act on input when fully hidden.
+            catchPlayfield.CatcherArea.AlwaysPresent = true;
             catchPlayfield.CatcherArea.Alpha = (float)Interpolation.Lerp(catchPlayfield.CatcherArea.Alpha, targetAlpha, Math.Clamp(catchPlayfield.Time.Elapsed / TRANSITION_DURATION, 0, 1));
         }
     }

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

@@ -11,7 +11,6 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osuTK;
-using osuTK.Input;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
@@ -106,41 +105,17 @@ namespace osu.Game.Rulesets.Catch.UI
             return false;
         }
 
-        protected override bool OnMouseDown(MouseDownEvent e)
-        {
-            return updateAction(e.Button, getTouchCatchActionFromInput(e.ScreenSpaceMousePosition));
-        }
-
         protected override bool OnTouchDown(TouchDownEvent e)
         {
             return updateAction(e.Touch.Source, getTouchCatchActionFromInput(e.ScreenSpaceTouch.Position));
         }
 
-        protected override bool OnMouseMove(MouseMoveEvent e)
-        {
-            Show();
-
-            TouchCatchAction? action = getTouchCatchActionFromInput(e.ScreenSpaceMousePosition);
-
-            // multiple mouse buttons may be pressed and handling the same action.
-            foreach (MouseButton button in e.PressedButtons)
-                updateAction(button, action);
-
-            return false;
-        }
-
         protected override void OnTouchMove(TouchMoveEvent e)
         {
             updateAction(e.Touch.Source, getTouchCatchActionFromInput(e.ScreenSpaceTouch.Position));
             base.OnTouchMove(e);
         }
 
-        protected override void OnMouseUp(MouseUpEvent e)
-        {
-            updateAction(e.Button, null);
-            base.OnMouseUp(e);
-        }
-
         protected override void OnTouchUp(TouchUpEvent e)
         {
             updateAction(e.Touch.Source, null);

osu.Game.Rulesets.Mania/UI/Column.cs

@@ -209,18 +209,6 @@ namespace osu.Game.Rulesets.Mania.UI
                 keyBindingContainer = maniaInputManager?.KeyBindingContainer;
             }
 
-            protected override bool OnMouseDown(MouseDownEvent e)
-            {
-                keyBindingContainer?.TriggerPressed(column.Action.Value);
-                return base.OnMouseDown(e);
-            }
-
-            protected override void OnMouseUp(MouseUpEvent e)
-            {
-                keyBindingContainer?.TriggerReleased(column.Action.Value);
-                base.OnMouseUp(e);
-            }
-
             protected override bool OnTouchDown(TouchDownEvent e)
             {
                 keyBindingContainer?.TriggerPressed(column.Action.Value);

osu.Game.Rulesets.Osu/Skinning/Argon/ArgonFollowCircle.cs

@@ -1,35 +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.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Utils;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Argon
 {
     public partial class ArgonFollowCircle : FollowCircle
     {
+        private readonly CircularContainer circleContainer;
+        private readonly Box circleFill;
+
+        private readonly IBindable<Color4> accentColour = new Bindable<Color4>();
+
+        [Resolved(canBeNull: true)]
+        private DrawableHitObject? parentObject { get; set; }
+
         public ArgonFollowCircle()
         {
-            InternalChild = new CircularContainer
+            InternalChild = circleContainer = new CircularContainer
             {
                 RelativeSizeAxes = Axes.Both,
                 Masking = true,
                 BorderThickness = 4,
-                BorderColour = ColourInfo.GradientVertical(Colour4.FromHex("FC618F"), Colour4.FromHex("BB1A41")),
                 Blending = BlendingParameters.Additive,
-                Child = new Box
+                Child = circleFill = new Box
                 {
-                    Colour = ColourInfo.GradientVertical(Colour4.FromHex("FC618F"), Colour4.FromHex("BB1A41")),
                     RelativeSizeAxes = Axes.Both,
                     Alpha = 0.3f,
                 }
             };
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            if (parentObject != null)
+                accentColour.BindTo(parentObject.AccentColour);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            accentColour.BindValueChanged(colour =>
+            {
+                circleContainer.BorderColour = ColourInfo.GradientVertical(colour.NewValue, colour.NewValue.Darken(0.5f));
+                circleFill.Colour = ColourInfo.GradientVertical(colour.NewValue, colour.NewValue.Darken(0.5f));
+            }, true);
+        }
+
         protected override void OnSliderPress()
         {
             const float duration = 300f;

osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs

@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
@@ -21,6 +23,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
         private readonly Vector2 defaultIconScale = new Vector2(0.6f, 0.8f);
 
+        private readonly IBindable<Color4> accentColour = new Bindable<Color4>();
+
         [Resolved(canBeNull: true)]
         private DrawableHitObject? parentObject { get; set; }
 
@@ -37,7 +41,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             {
                 fill = new Box
                 {
-                    Colour = ColourInfo.GradientVertical(Colour4.FromHex("FC618F"), Colour4.FromHex("BB1A41")),
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -53,10 +56,22 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             };
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            if (parentObject != null)
+                accentColour.BindTo(parentObject.AccentColour);
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
+            accentColour.BindValueChanged(colour =>
+            {
+                fill.Colour = ColourInfo.GradientVertical(colour.NewValue, colour.NewValue.Darken(0.5f));
+            }, true);
+
             if (parentObject != null)
             {
                 parentObject.ApplyCustomUpdateState += updateStateTransforms;

osu.Game.Rulesets.Taiko/Mods/TaikoModClassic.cs

@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
         public void ApplyToDrawableRuleset(DrawableRuleset<TaikoHitObject> drawableRuleset)
         {
             drawableTaikoRuleset = (DrawableTaikoRuleset)drawableRuleset;
-            drawableTaikoRuleset.LockPlayfieldAspect.Value = false;
+            drawableTaikoRuleset.LockPlayfieldMaxAspect.Value = false;
 
             var playfield = (TaikoPlayfield)drawableRuleset.Playfield;
             playfield.ClassicHitTargetPosition.Value = true;

osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs

@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Taiko.UI
     {
         public new BindableDouble TimeRange => base.TimeRange;
 
-        public readonly BindableBool LockPlayfieldAspect = new BindableBool(true);
+        public readonly BindableBool LockPlayfieldMaxAspect = new BindableBool(true);
 
         protected override ScrollVisualisationMethod VisualisationMethod => ScrollVisualisationMethod.Overlapping;
 
@@ -78,7 +78,7 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new TaikoPlayfieldAdjustmentContainer
         {
-            LockPlayfieldAspect = { BindTarget = LockPlayfieldAspect }
+            LockPlayfieldMaxAspect = { BindTarget = LockPlayfieldMaxAspect }
         };
 
         protected override PassThroughInputManager CreateInputManager() => new TaikoInputManager(Ruleset.RulesetInfo);

osu.Game.Rulesets.Taiko/UI/DrumTouchInputArea.cs

@@ -107,24 +107,6 @@ namespace osu.Game.Rulesets.Taiko.UI
             return false;
         }
 
-        protected override bool OnMouseDown(MouseDownEvent e)
-        {
-            if (!validMouse(e))
-                return false;
-
-            handleDown(e.Button, e.ScreenSpaceMousePosition);
-            return true;
-        }
-
-        protected override void OnMouseUp(MouseUpEvent e)
-        {
-            if (!validMouse(e))
-                return;
-
-            handleUp(e.Button);
-            base.OnMouseUp(e);
-        }
-
         protected override bool OnTouchDown(TouchDownEvent e)
         {
             handleDown(e.Touch.Source, e.ScreenSpaceTouchDownPosition);

osu.Game.Rulesets.Taiko/UI/TaikoPlayfieldAdjustmentContainer.cs

@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         private const float default_relative_height = TaikoPlayfield.DEFAULT_HEIGHT / 768;
         private const float default_aspect = 16f / 9f;
 
-        public readonly IBindable<bool> LockPlayfieldAspect = new BindableBool(true);
+        public readonly IBindable<bool> LockPlayfieldMaxAspect = new BindableBool(true);
 
         protected override void Update()
         {
@@ -21,7 +21,12 @@ namespace osu.Game.Rulesets.Taiko.UI
 
             float height = default_relative_height;
 
-            if (LockPlayfieldAspect.Value)
+            // Players coming from stable expect to be able to change the aspect ratio regardless of the window size.
+            // We originally wanted to limit this more, but there was considerable pushback from the community.
+            //
+            // As a middle-ground, the aspect ratio can still be adjusted in the downwards direction but has a maximum limit.
+            // This is still a bit weird, because readability changes with window size, but it is what it is.
+            if (LockPlayfieldMaxAspect.Value && Parent.ChildSize.X / Parent.ChildSize.Y > default_aspect)
                 height *= Math.Clamp(Parent.ChildSize.X / Parent.ChildSize.Y, 0.4f, 4) / default_aspect;
 
             Height = height;

osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs

@@ -6,6 +6,7 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Components.Timelines.Summary;
@@ -21,7 +22,13 @@ namespace osu.Game.Tests.Visual.Editing
 
         public TestSceneEditorSummaryTimeline()
         {
-            editorBeatmap = new EditorBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo));
+            var beatmap = CreateBeatmap(new OsuRuleset().RulesetInfo);
+
+            beatmap.ControlPointInfo.Add(100000, new TimingControlPoint { BeatLength = 100 });
+            beatmap.ControlPointInfo.Add(50000, new DifficultyControlPoint { SliderVelocity = 2 });
+            beatmap.BeatmapInfo.Bookmarks = new[] { 75000, 125000 };
+
+            editorBeatmap = new EditorBeatmap(beatmap);
         }
 
         protected override void LoadComplete()

osu.Game.Tests/Visual/Editing/TestScenePreviewTime.cs

@@ -0,0 +1,35 @@
+// 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 System.Linq;
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
+
+namespace osu.Game.Tests.Visual.Editing
+{
+    public partial class TestScenePreviewTime : EditorTestScene
+    {
+        protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
+
+        [Test]
+        public void TestSceneSetPreviewTimingPoint()
+        {
+            AddStep("seek to 1000", () => EditorClock.Seek(1000));
+            AddAssert("time is 1000", () => EditorClock.CurrentTime == 1000);
+            AddStep("set current time as preview point", () => Editor.SetPreviewPointToCurrentTime());
+            AddAssert("preview time is 1000", () => EditorBeatmap.PreviewTime.Value == 1000);
+        }
+
+        [Test]
+        public void TestScenePreviewTimeline()
+        {
+            AddStep("set preview time to -1", () => EditorBeatmap.PreviewTime.Value = -1);
+            AddAssert("preview time line should not show", () => !Editor.ChildrenOfType<PreviewTimePart>().Single().Children.Any());
+            AddStep("set preview time to 1000", () => EditorBeatmap.PreviewTime.Value = 1000);
+            AddAssert("preview time line should show", () => Editor.ChildrenOfType<PreviewTimePart>().Single().Children.Single().Alpha == 1);
+        }
+    }
+}

osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsRoomSettingsPlaylist.cs

@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -46,10 +47,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("item removed", () => !playlist.Items.Contains(selectedItem));
         }
 
-        [Test]
+        [TestCase(true)]
-        public void TestNextItemSelectedAfterDeletion()
+        [TestCase(false)]
+        public void TestNextItemSelectedAfterDeletion(bool allowSelection)
         {
-            createPlaylist();
+            createPlaylist(p =>
+            {
+                p.AllowSelection = allowSelection;
+            });
 
             moveToItem(0);
             AddStep("click", () => InputManager.Click(MouseButton.Left));
@@ -57,7 +62,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             moveToDeleteButton(0);
             AddStep("click delete button", () => InputManager.Click(MouseButton.Left));
 
-            AddAssert("item 0 is selected", () => playlist.SelectedItem.Value == playlist.Items[0]);
+            AddAssert("item 0 is " + (allowSelection ? "selected" : "not selected"), () => playlist.SelectedItem.Value == (allowSelection ? playlist.Items[0] : null));
         }
 
         [Test]
@@ -117,7 +122,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             InputManager.MoveMouseTo(item.ChildrenOfType<DrawableRoomPlaylistItem.PlaylistRemoveButton>().ElementAt(0), offset);
         });
 
-        private void createPlaylist()
+        private void createPlaylist(Action<TestPlaylist> setupPlaylist = null)
         {
             AddStep("create playlist", () =>
             {
@@ -154,6 +159,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         }
                     });
                 }
+
+                setupPlaylist?.Invoke(playlist);
             });
 
             AddUntilStep("wait for items to load", () => playlist.ItemMap.Values.All(i => i.IsLoaded));

osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs

@@ -54,6 +54,8 @@ namespace osu.Game.Tests.Visual.Online
             {
                 overlay.ShowBeatmapSet(new APIBeatmapSet
                 {
+                    Genre = new BeatmapSetOnlineGenre { Id = 15, Name = "Future genre" },
+                    Language = new BeatmapSetOnlineLanguage { Id = 15, Name = "Future language" },
                     OnlineID = 1235,
                     Title = @"an awesome beatmap",
                     Artist = @"naru narusegawa",

osu.Game.Tests/Visual/UserInterface/TestSceneSettingsToolboxGroup.cs

@@ -55,6 +55,16 @@ namespace osu.Game.Tests.Visual.UserInterface
             };
         });
 
+        [Test]
+        public void TestDisplay()
+        {
+            AddRepeatStep("toggle expanded state", () =>
+            {
+                InputManager.MoveMouseTo(group.ChildrenOfType<IconButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            }, 5);
+        }
+
         [Test]
         public void TestClickExpandButtonMultipleTimes()
         {

osu.Game/Beatmaps/BeatmapSetOnlineNomination.cs

@@ -0,0 +1,22 @@
+// 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 Newtonsoft.Json;
+
+namespace osu.Game.Beatmaps
+{
+    public struct BeatmapSetOnlineNomination
+    {
+        [JsonProperty(@"beatmapset_id")]
+        public int BeatmapsetId { get; set; }
+
+        [JsonProperty(@"reset")]
+        public bool Reset { get; set; }
+
+        [JsonProperty(@"rulesets")]
+        public string[]? Rulesets { get; set; }
+
+        [JsonProperty(@"user_id")]
+        public int UserId { get; set; }
+    }
+}

osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs

@@ -5,16 +5,19 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
+using osu.Game.Localisation;
 
 namespace osu.Game.Beatmaps.Drawables.Cards
 {
-    public abstract partial class BeatmapCard : OsuClickableContainer
+    public abstract partial class BeatmapCard : OsuClickableContainer, IHasContextMenu
     {
         public const float TRANSITION_DURATION = 400;
         public const float CORNER_RADIUS = 10;
@@ -96,5 +99,10 @@ namespace osu.Game.Beatmaps.Drawables.Cards
                     throw new ArgumentOutOfRangeException(nameof(size), size, @"Unsupported card size");
             }
         }
+
+        public MenuItem[] ContextMenuItems => new MenuItem[]
+        {
+            new OsuMenuItem(ContextMenuStrings.ViewBeatmap, MenuItemType.Highlighted, Action),
+        };
     }
 }

osu.Game/Beatmaps/Drawables/Cards/BeatmapCardContent.cs

@@ -138,9 +138,18 @@ namespace osu.Game.Beatmaps.Drawables.Cards
             // This avoids depth issues where a hovered (scaled) card to the right of another card would be beneath the card to the left.
             this.ScaleTo(Expanded.Value ? 1.03f : 1, 500, Easing.OutQuint);
 
-            background.FadeTo(Expanded.Value ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+            if (Expanded.Value)
-            dropdownContent.FadeTo(Expanded.Value ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+            {
-            borderContainer.FadeTo(Expanded.Value ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+                background.FadeIn(BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+                dropdownContent.FadeIn(BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+                borderContainer.FadeIn(BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+            }
+            else
+            {
+                background.FadeOut(BeatmapCard.TRANSITION_DURATION / 3f, Easing.OutQuint);
+                dropdownContent.FadeOut(BeatmapCard.TRANSITION_DURATION / 3f, Easing.OutQuint);
+                borderContainer.FadeOut(BeatmapCard.TRANSITION_DURATION / 3f, Easing.OutQuint);
+            }
 
             content.TweenEdgeEffectTo(new EdgeEffectParameters
             {

osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs

@@ -300,7 +300,7 @@ namespace osu.Game.Beatmaps.Formats
             {
                 var comboColour = colours[i];
 
-                writer.Write(FormattableString.Invariant($"Combo{i}: "));
+                writer.Write(FormattableString.Invariant($"Combo{1 + i}: "));
                 writer.Write(FormattableString.Invariant($"{(byte)(comboColour.R * byte.MaxValue)},"));
                 writer.Write(FormattableString.Invariant($"{(byte)(comboColour.G * byte.MaxValue)},"));
                 writer.Write(FormattableString.Invariant($"{(byte)(comboColour.B * byte.MaxValue)},"));

osu.Game/Beatmaps/WorkingBeatmap.cs

@@ -34,8 +34,6 @@ namespace osu.Game.Beatmaps
         // TODO: remove once the fallback lookup is not required (and access via `working.BeatmapInfo.Metadata` directly).
         public BeatmapMetadata Metadata => BeatmapInfo.Metadata;
 
-        public Waveform Waveform => waveform.Value;
-
         public Storyboard Storyboard => storyboard.Value;
 
         public Texture Background => GetBackground(); // Texture uses ref counting, so we want to return a new instance every usage.
@@ -48,10 +46,11 @@ namespace osu.Game.Beatmaps
 
         private readonly object beatmapFetchLock = new object();
 
-        private readonly Lazy<Waveform> waveform;
         private readonly Lazy<Storyboard> storyboard;
         private readonly Lazy<ISkin> skin;
+
         private Track track; // track is not Lazy as we allow transferring and loading multiple times.
+        private Waveform waveform; // waveform is also not Lazy as the track may change.
 
         protected WorkingBeatmap(BeatmapInfo beatmapInfo, AudioManager audioManager)
         {
@@ -60,7 +59,6 @@ namespace osu.Game.Beatmaps
             BeatmapInfo = beatmapInfo;
             BeatmapSetInfo = beatmapInfo.BeatmapSet ?? new BeatmapSetInfo();
 
-            waveform = new Lazy<Waveform>(GetWaveform);
             storyboard = new Lazy<Storyboard>(GetStoryboard);
             skin = new Lazy<ISkin>(GetSkin);
         }
@@ -108,7 +106,16 @@ namespace osu.Game.Beatmaps
 
         public virtual bool TrackLoaded => track != null;
 
-        public Track LoadTrack() => track = GetBeatmapTrack() ?? GetVirtualTrack(1000);
+        public Track LoadTrack()
+        {
+            track = GetBeatmapTrack() ?? GetVirtualTrack(1000);
+
+            // the track may have changed, recycle the current waveform.
+            waveform?.Dispose();
+            waveform = null;
+
+            return track;
+        }
 
         public void PrepareTrackForPreview(bool looping, double offsetFromPreviewPoint = 0)
         {
@@ -171,6 +178,12 @@ namespace osu.Game.Beatmaps
 
         #endregion
 
+        #region Waveform
+
+        public Waveform Waveform => waveform ??= GetWaveform();
+
+        #endregion
+
         #region Beatmap
 
         public virtual bool BeatmapLoaded => beatmapLoadTask?.IsCompleted ?? false;

osu.Game/Database/LegacyImportManager.cs

@@ -54,14 +54,14 @@ namespace osu.Game.Database
 
         public void UpdateStorage(string stablePath) => cachedStorage = new StableStorage(stablePath, gameHost as DesktopGameHost);
 
-        public bool CheckHardLinkAvailability()
+        public bool CheckSongsFolderHardLinkAvailability()
         {
             var stableStorage = GetCurrentStableStorage();
 
             if (stableStorage == null || gameHost is not DesktopGameHost desktopGameHost)
                 return false;
 
-            string testExistingPath = stableStorage.GetFullPath(string.Empty);
+            string testExistingPath = stableStorage.GetSongStorage().GetFullPath(string.Empty);
             string testDestinationPath = desktopGameHost.Storage.GetFullPath(string.Empty);
 
             return HardLinkHelper.CheckAvailability(testDestinationPath, testExistingPath);

osu.Game/Graphics/UserInterface/HistoryTextBox.cs

@@ -45,6 +45,9 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override bool OnKeyDown(KeyDownEvent e)
         {
+            if (e.ControlPressed || e.AltPressed || e.SuperPressed || e.ShiftPressed)
+                return false;
+
             switch (e.Key)
             {
                 case Key.Up:

osu.Game/Localisation/ContextMenuStrings.cs

@@ -0,0 +1,24 @@
+// 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.Localisation;
+
+namespace osu.Game.Localisation
+{
+    public static class ContextMenuStrings
+    {
+        private const string prefix = @"osu.Game.Resources.Localisation.ContextMenu";
+
+        /// <summary>
+        /// "View profile"
+        /// </summary>
+        public static LocalisableString ViewProfile => new TranslatableString(getKey(@"view_profile"), @"View profile");
+
+        /// <summary>
+        /// "View beatmap"
+        /// </summary>
+        public static LocalisableString ViewBeatmap => new TranslatableString(getKey(@"view_beatmap"), @"View beatmap");
+
+        private static string getKey(string key) => $@"{prefix}:{key}";
+    }
+}

osu.Game/Online/API/APIAccess.cs

@@ -259,7 +259,11 @@ namespace osu.Game.Online.API
 
             var friendsReq = new GetFriendsRequest();
             friendsReq.Failure += _ => state.Value = APIState.Failing;
-            friendsReq.Success += res => friends.AddRange(res);
+            friendsReq.Success += res =>
+            {
+                friends.Clear();
+                friends.AddRange(res);
+            };
 
             if (!handleRequest(friendsReq))
             {

osu.Game/Online/API/Requests/GetScoresRequest.cs

@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
@@ -11,10 +9,11 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets.Mods;
 using System.Text;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace osu.Game.Online.API.Requests
 {
-    public class GetScoresRequest : APIRequest<APIScoresCollection>
+    public class GetScoresRequest : APIRequest<APIScoresCollection>, IEquatable<GetScoresRequest>
     {
         public const int MAX_SCORES_PER_REQUEST = 50;
 
@@ -23,7 +22,7 @@ namespace osu.Game.Online.API.Requests
         private readonly IRulesetInfo ruleset;
         private readonly IEnumerable<IMod> mods;
 
-        public GetScoresRequest(IBeatmapInfo beatmapInfo, IRulesetInfo ruleset, BeatmapLeaderboardScope scope = BeatmapLeaderboardScope.Global, IEnumerable<IMod> mods = null)
+        public GetScoresRequest(IBeatmapInfo beatmapInfo, IRulesetInfo ruleset, BeatmapLeaderboardScope scope = BeatmapLeaderboardScope.Global, IEnumerable<IMod>? mods = null)
         {
             if (beatmapInfo.OnlineID <= 0)
                 throw new InvalidOperationException($"Cannot lookup a beatmap's scores without having a populated {nameof(IBeatmapInfo.OnlineID)}.");
@@ -51,5 +50,16 @@ namespace osu.Game.Online.API.Requests
 
             return query.ToString();
         }
+
+        public bool Equals(GetScoresRequest? other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return beatmapInfo.Equals(other.beatmapInfo)
+                   && scope == other.scope
+                   && ruleset.Equals(other.ruleset)
+                   && mods.SequenceEqual(other.mods);
+        }
     }
 }

osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs

@@ -111,6 +111,12 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"language")]
         public BeatmapSetOnlineLanguage Language { get; set; }
 
+        [JsonProperty(@"current_nominations")]
+        public BeatmapSetOnlineNomination[]? CurrentNominations { get; set; }
+
+        [JsonProperty(@"related_users")]
+        public APIUser[]? RelatedUsers { get; set; }
+
         public string Source { get; set; } = string.Empty;
 
         [JsonProperty(@"tags")]

osu.Game/Online/Chat/MessageFormatter.cs

@@ -341,6 +341,8 @@ namespace osu.Game.Online.Chat
         OpenWiki,
         Custom,
         OpenChangelog,
+        FilterBeatmapSetGenre,
+        FilterBeatmapSetLanguage,
     }
 
     public class Link : IComparable<Link>

osu.Game/OsuGame.cs

@@ -46,6 +46,7 @@ using osu.Game.Online;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Chat;
 using osu.Game.Overlays;
+using osu.Game.Overlays.BeatmapListing;
 using osu.Game.Overlays.Music;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Overlays.Toolbar;
@@ -359,6 +360,14 @@ namespace osu.Game
                         SearchBeatmapSet(argString);
                     break;
 
+                case LinkAction.FilterBeatmapSetGenre:
+                    FilterBeatmapSetGenre((SearchGenre)link.Argument);
+                    break;
+
+                case LinkAction.FilterBeatmapSetLanguage:
+                    FilterBeatmapSetLanguage((SearchLanguage)link.Argument);
+                    break;
+
                 case LinkAction.OpenEditorTimestamp:
                 case LinkAction.JoinMultiplayerMatch:
                 case LinkAction.Spectate:
@@ -463,6 +472,10 @@ namespace osu.Game
         /// <param name="query">The query to search for.</param>
         public void SearchBeatmapSet(string query) => waitForReady(() => beatmapListing, _ => beatmapListing.ShowWithSearch(query));
 
+        public void FilterBeatmapSetGenre(SearchGenre genre) => waitForReady(() => beatmapListing, _ => beatmapListing.ShowWithGenreFilter(genre));
+
+        public void FilterBeatmapSetLanguage(SearchLanguage language) => waitForReady(() => beatmapListing, _ => beatmapListing.ShowWithLanguageFilter(language));
+
         /// <summary>
         /// Show a wiki's page as an overlay
         /// </summary>

osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs

@@ -145,6 +145,12 @@ namespace osu.Game.Overlays.BeatmapListing
         public void Search(string query)
             => Schedule(() => searchControl.Query.Value = query);
 
+        public void FilterGenre(SearchGenre genre)
+            => Schedule(() => searchControl.Genre.Value = genre);
+
+        public void FilterLanguage(SearchLanguage language)
+            => Schedule(() => searchControl.Language.Value = language);
+
         protected override void LoadComplete()
         {
             base.LoadComplete();

osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs

@@ -12,6 +12,7 @@ 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.Input.Events;
 using osu.Framework.Localisation;
 using osuTK;
@@ -100,9 +101,30 @@ namespace osu.Game.Overlays.BeatmapListing
 
         protected partial class MultipleSelectionFilterTabItem : FilterTabItem<T>
         {
+            private readonly Box selectedUnderline;
+
+            protected override bool HighlightOnHoverWhenActive => true;
+
             public MultipleSelectionFilterTabItem(T value)
                 : base(value)
             {
+                // This doesn't match any actual design, but should make it easier for the user to understand
+                // that filters are applied until we settle on a final design.
+                AddInternal(selectedUnderline = new Box
+                {
+                    Depth = float.MaxValue,
+                    RelativeSizeAxes = Axes.X,
+                    Height = 1.5f,
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.CentreLeft,
+                });
+            }
+
+            protected override void UpdateState()
+            {
+                base.UpdateState();
+                selectedUnderline.FadeTo(Active.Value ? 1 : 0, 200, Easing.OutQuint);
+                selectedUnderline.FadeColour(IsHovered ? ColourProvider.Content2 : GetStateColour(), 200, Easing.OutQuint);
             }
 
             protected override bool OnClick(ClickEvent e)

osu.Game/Overlays/BeatmapListing/FilterTabItem.cs

@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.BeatmapListing
     public partial class FilterTabItem<T> : TabItem<T>
     {
         [Resolved]
-        private OverlayColourProvider colourProvider { get; set; }
+        protected OverlayColourProvider ColourProvider { get; private set; }
 
         private OsuSpriteText text;
 
@@ -52,38 +52,42 @@ namespace osu.Game.Overlays.BeatmapListing
         {
             base.LoadComplete();
 
-            updateState();
+            UpdateState();
             FinishTransforms(true);
         }
 
         protected override bool OnHover(HoverEvent e)
         {
             base.OnHover(e);
-            updateState();
+            UpdateState();
             return true;
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
             base.OnHoverLost(e);
-            updateState();
+            UpdateState();
         }
 
-        protected override void OnActivated() => updateState();
+        protected override void OnActivated() => UpdateState();
 
-        protected override void OnDeactivated() => updateState();
+        protected override void OnDeactivated() => UpdateState();
 
         /// <summary>
         /// Returns the label text to be used for the supplied <paramref name="value"/>.
         /// </summary>
         protected virtual LocalisableString LabelFor(T value) => (value as Enum)?.GetLocalisableDescription() ?? value.ToString();
 
-        private void updateState()
+        protected virtual bool HighlightOnHoverWhenActive => false;
+
+        protected virtual void UpdateState()
         {
-            text.FadeColour(IsHovered ? colourProvider.Light1 : GetStateColour(), 200, Easing.OutQuint);
+            bool highlightHover = IsHovered && (!Active.Value || HighlightOnHoverWhenActive);
-            text.Font = text.Font.With(weight: Active.Value ? FontWeight.SemiBold : FontWeight.Regular);
+
+            text.FadeColour(highlightHover ? ColourProvider.Content2 : GetStateColour(), 200, Easing.OutQuint);
+            text.Font = text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Regular);
         }
 
-        protected virtual Color4 GetStateColour() => Active.Value ? colourProvider.Content1 : colourProvider.Light2;
+        protected virtual Color4 GetStateColour() => Active.Value ? ColourProvider.Content1 : ColourProvider.Light2;
     }
 }

osu.Game/Overlays/BeatmapListingOverlay.cs

@@ -110,6 +110,18 @@ namespace osu.Game.Overlays
             ScrollFlow.ScrollToStart();
         }
 
+        public void ShowWithGenreFilter(SearchGenre genre)
+        {
+            ShowWithSearch(string.Empty);
+            filterControl.FilterGenre(genre);
+        }
+
+        public void ShowWithLanguageFilter(SearchLanguage language)
+        {
+            ShowWithSearch(string.Empty);
+            filterControl.FilterLanguage(language);
+        }
+
         protected override BeatmapListingHeader CreateHeader() => new BeatmapListingHeader();
 
         protected override Color4 BackgroundColour => ColourProvider.Background6;

osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs

@@ -10,7 +10,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
-using osu.Game.Graphics.Cursor;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
@@ -91,79 +90,74 @@ namespace osu.Game.Overlays.BeatmapSet
                             },
                         },
                     },
-                    new OsuContextMenuContainer
+                    new Container
                     {
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
-                        Child = new Container
+                        Padding = new MarginPadding
                         {
-                            RelativeSizeAxes = Axes.X,
+                            Vertical = BeatmapSetOverlay.Y_PADDING,
-                            AutoSizeAxes = Axes.Y,
+                            Left = BeatmapSetOverlay.X_PADDING,
-                            Padding = new MarginPadding
+                            Right = BeatmapSetOverlay.X_PADDING + BeatmapSetOverlay.RIGHT_WIDTH,
+                        },
+                        Children = new Drawable[]
+                        {
+                            fadeContent = new FillFlowContainer
                             {
-                                Vertical = BeatmapSetOverlay.Y_PADDING,
+                                RelativeSizeAxes = Axes.X,
-                                Left = BeatmapSetOverlay.X_PADDING,
+                                AutoSizeAxes = Axes.Y,
-                                Right = BeatmapSetOverlay.X_PADDING + BeatmapSetOverlay.RIGHT_WIDTH,
+                                Direction = FillDirection.Vertical,
-                            },
+                                Children = new Drawable[]
-                            Children = new Drawable[]
-                            {
-                                fadeContent = new FillFlowContainer
                                 {
-                                    RelativeSizeAxes = Axes.X,
+                                    new Container
-                                    AutoSizeAxes = Axes.Y,
-                                    Direction = FillDirection.Vertical,
-                                    Children = new Drawable[]
                                     {
-                                        new Container
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Child = Picker = new BeatmapPicker(),
+                                    },
+                                    title = new MetadataFlowContainer(s =>
+                                    {
+                                        s.Font = OsuFont.GetFont(size: 30, weight: FontWeight.SemiBold, italics: true);
+                                    })
+                                    {
+                                        Margin = new MarginPadding { Top = 15 },
+                                    },
+                                    artist = new MetadataFlowContainer(s =>
+                                    {
+                                        s.Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium, italics: true);
+                                    })
+                                    {
+                                        Margin = new MarginPadding { Bottom = 20 },
+                                    },
+                                    new Container
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Child = author = new AuthorInfo(),
+                                    },
+                                    beatmapAvailability = new BeatmapAvailability(),
+                                    new Container
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        Height = buttons_height,
+                                        Margin = new MarginPadding { Top = 10 },
+                                        Children = new Drawable[]
                                         {
-                                            RelativeSizeAxes = Axes.X,
+                                            favouriteButton = new FavouriteButton
-                                            AutoSizeAxes = Axes.Y,
-                                            Child = Picker = new BeatmapPicker(),
-                                        },
-                                        title = new MetadataFlowContainer(s =>
-                                        {
-                                            s.Font = OsuFont.GetFont(size: 30, weight: FontWeight.SemiBold, italics: true);
-                                        })
-                                        {
-                                            Margin = new MarginPadding { Top = 15 },
-                                        },
-                                        artist = new MetadataFlowContainer(s =>
-                                        {
-                                            s.Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium, italics: true);
-                                        })
-                                        {
-                                            Margin = new MarginPadding { Bottom = 20 },
-                                        },
-                                        new Container
-                                        {
-                                            RelativeSizeAxes = Axes.X,
-                                            AutoSizeAxes = Axes.Y,
-                                            Child = author = new AuthorInfo(),
-                                        },
-                                        beatmapAvailability = new BeatmapAvailability(),
-                                        new Container
-                                        {
-                                            RelativeSizeAxes = Axes.X,
-                                            Height = buttons_height,
-                                            Margin = new MarginPadding { Top = 10 },
-                                            Children = new Drawable[]
                                             {
-                                                favouriteButton = new FavouriteButton
+                                                BeatmapSet = { BindTarget = BeatmapSet }
-                                                {
-                                                    BeatmapSet = { BindTarget = BeatmapSet }
-                                                },
-                                                downloadButtonsContainer = new FillFlowContainer
-                                                {
-                                                    RelativeSizeAxes = Axes.Both,
-                                                    Padding = new MarginPadding { Left = buttons_height + buttons_spacing },
-                                                    Spacing = new Vector2(buttons_spacing),
-                                                },
                                             },
-                                        },
+                                            downloadButtonsContainer = new FillFlowContainer
+                                            {
+                                                RelativeSizeAxes = Axes.Both,
+                                                Padding = new MarginPadding { Left = buttons_height + buttons_spacing },
+                                                Spacing = new Vector2(buttons_spacing),
+                                            },
+                                        }
                                     },
                                 },
-                            }
+                            },
-                        },
+                        }
                     },
                     loading = new LoadingSpinner
                     {

osu.Game/Overlays/BeatmapSet/Info.cs

@@ -3,14 +3,17 @@
 
 #nullable disable
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays.BeatmapListing;
 
 namespace osu.Game.Overlays.BeatmapSet
 {
@@ -34,7 +37,10 @@ namespace osu.Game.Overlays.BeatmapSet
 
         public Info()
         {
-            MetadataSection source, tags, genre, language;
+            MetadataSectionNominators nominators;
+            MetadataSection source, tags;
+            MetadataSectionGenre genre;
+            MetadataSectionLanguage language;
             OsuSpriteText notRankedPlaceholder;
 
             RelativeSizeAxes = Axes.X;
@@ -59,7 +65,7 @@ namespace osu.Game.Overlays.BeatmapSet
                             Child = new Container
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                Child = new MetadataSection(MetadataType.Description),
+                                Child = new MetadataSectionDescription(),
                             },
                         },
                         new Container
@@ -76,12 +82,13 @@ namespace osu.Game.Overlays.BeatmapSet
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
                                 Direction = FillDirection.Full,
-                                Children = new[]
+                                Children = new Drawable[]
                                 {
-                                    source = new MetadataSection(MetadataType.Source),
+                                    nominators = new MetadataSectionNominators(),
-                                    genre = new MetadataSection(MetadataType.Genre) { Width = 0.5f },
+                                    source = new MetadataSectionSource(),
-                                    language = new MetadataSection(MetadataType.Language) { Width = 0.5f },
+                                    genre = new MetadataSectionGenre { Width = 0.5f },
-                                    tags = new MetadataSection(MetadataType.Tags),
+                                    language = new MetadataSectionLanguage { Width = 0.5f },
+                                    tags = new MetadataSectionTags(),
                                 },
                             },
                         },
@@ -118,10 +125,11 @@ namespace osu.Game.Overlays.BeatmapSet
 
             BeatmapSet.ValueChanged += b =>
             {
-                source.Text = b.NewValue?.Source ?? string.Empty;
+                nominators.Metadata = (b.NewValue?.CurrentNominations ?? Array.Empty<BeatmapSetOnlineNomination>(), b.NewValue?.RelatedUsers ?? Array.Empty<APIUser>());
-                tags.Text = b.NewValue?.Tags ?? string.Empty;
+                source.Metadata = b.NewValue?.Source ?? string.Empty;
-                genre.Text = b.NewValue?.Genre.Name ?? string.Empty;
+                tags.Metadata = b.NewValue?.Tags ?? string.Empty;
-                language.Text = b.NewValue?.Language.Name ?? string.Empty;
+                genre.Metadata = b.NewValue?.Genre ?? new BeatmapSetOnlineGenre { Id = (int)SearchGenre.Unspecified };
+                language.Metadata = b.NewValue?.Language ?? new BeatmapSetOnlineLanguage { Id = (int)SearchLanguage.Unspecified };
                 bool setHasLeaderboard = b.NewValue?.Status > 0;
                 successRate.Alpha = setHasLeaderboard ? 1 : 0;
                 notRankedPlaceholder.Alpha = setHasLeaderboard ? 0 : 1;

osu.Game/Overlays/BeatmapSet/MetadataSection.cs

@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
@@ -11,26 +9,45 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Online.Chat;
 using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Overlays.BeatmapSet
 {
-    public partial class MetadataSection : Container
+    public abstract partial class MetadataSection : MetadataSection<string>
+    {
+        public override string Metadata
+        {
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                {
+                    this.FadeOut(TRANSITION_DURATION);
+                    return;
+                }
+
+                base.Metadata = value;
+            }
+        }
+
+        protected MetadataSection(MetadataType type, Action<string>? searchAction = null)
+            : base(type, searchAction)
+        {
+        }
+    }
+
+    public abstract partial class MetadataSection<T> : Container
     {
         private readonly FillFlowContainer textContainer;
-        private readonly MetadataType type;
+        private TextFlowContainer? textFlow;
-        private TextFlowContainer textFlow;
 
-        private readonly Action<string> searchAction;
+        protected readonly Action<T>? SearchAction;
 
-        private const float transition_duration = 250;
+        protected const float TRANSITION_DURATION = 250;
 
-        public MetadataSection(MetadataType type, Action<string> searchAction = null)
+        protected MetadataSection(MetadataType type, Action<T>? searchAction = null)
         {
-            this.type = type;
+            SearchAction = searchAction;
-            this.searchAction = searchAction;
 
             Alpha = 0;
 
@@ -53,7 +70,7 @@ namespace osu.Game.Overlays.BeatmapSet
                         AutoSizeAxes = Axes.Y,
                         Child = new OsuSpriteText
                         {
-                            Text = this.type.GetLocalisableDescription(),
+                            Text = type.GetLocalisableDescription(),
                             Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 14),
                         },
                     },
@@ -61,23 +78,23 @@ namespace osu.Game.Overlays.BeatmapSet
             };
         }
 
-        public string Text
+        public virtual T Metadata
         {
             set
             {
-                if (string.IsNullOrEmpty(value))
+                if (value == null)
                 {
-                    this.FadeOut(transition_duration);
+                    this.FadeOut(TRANSITION_DURATION);
                     return;
                 }
 
-                this.FadeIn(transition_duration);
+                this.FadeIn(TRANSITION_DURATION);
 
-                setTextAsync(value);
+                setTextFlowAsync(value);
             }
         }
 
-        private void setTextAsync(string text)
+        private void setTextFlowAsync(T metadata)
         {
             LoadComponentAsync(new LinkFlowContainer(s => s.Font = s.Font.With(size: 14))
             {
@@ -88,44 +105,15 @@ namespace osu.Game.Overlays.BeatmapSet
             {
                 textFlow?.Expire();
 
-                switch (type)
+                AddMetadata(metadata, loaded);
-                {
-                    case MetadataType.Tags:
-                        string[] tags = text.Split(" ");
-
-                        for (int i = 0; i <= tags.Length - 1; i++)
-                        {
-                            string tag = tags[i];
-
-                            if (searchAction != null)
-                                loaded.AddLink(tag, () => searchAction(tag));
-                            else
-                                loaded.AddLink(tag, LinkAction.SearchBeatmapSet, tag);
-
-                            if (i != tags.Length - 1)
-                                loaded.AddText(" ");
-                        }
-
-                        break;
-
-                    case MetadataType.Source:
-                        if (searchAction != null)
-                            loaded.AddLink(text, () => searchAction(text));
-                        else
-                            loaded.AddLink(text, LinkAction.SearchBeatmapSet, text);
-
-                        break;
-
-                    default:
-                        loaded.AddText(text);
-                        break;
-                }
 
                 textContainer.Add(textFlow = loaded);
 
                 // fade in if we haven't yet.
-                textContainer.FadeIn(transition_duration);
+                textContainer.FadeIn(TRANSITION_DURATION);
             });
         }
+
+        protected abstract void AddMetadata(T metadata, LinkFlowContainer loaded);
     }
 }

osu.Game/Overlays/BeatmapSet/MetadataSectionDescription.cs

@@ -0,0 +1,21 @@
+// 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 System;
+using osu.Game.Graphics.Containers;
+
+namespace osu.Game.Overlays.BeatmapSet
+{
+    public partial class MetadataSectionDescription : MetadataSection
+    {
+        public MetadataSectionDescription(Action<string>? searchAction = null)
+            : base(MetadataType.Description, searchAction)
+        {
+        }
+
+        protected override void AddMetadata(string metadata, LinkFlowContainer loaded)
+        {
+            loaded.AddText(metadata);
+        }
+    }
+}

osu.Game/Overlays/BeatmapSet/MetadataSectionGenre.cs

@@ -0,0 +1,30 @@
+// 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 System;
+using osu.Framework.Extensions;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics.Containers;
+using osu.Game.Online.Chat;
+using osu.Game.Overlays.BeatmapListing;
+
+namespace osu.Game.Overlays.BeatmapSet
+{
+    public partial class MetadataSectionGenre : MetadataSection<BeatmapSetOnlineGenre>
+    {
+        public MetadataSectionGenre(Action<BeatmapSetOnlineGenre>? searchAction = null)
+            : base(MetadataType.Genre, searchAction)
+        {
+        }
+
+        protected override void AddMetadata(BeatmapSetOnlineGenre metadata, LinkFlowContainer loaded)
+        {
+            var genre = (SearchGenre)metadata.Id;
+
+            if (Enum.IsDefined(genre))
+                loaded.AddLink(genre.GetLocalisableDescription(), LinkAction.FilterBeatmapSetGenre, genre);
+            else
+                loaded.AddText(metadata.Name);
+        }
+    }
+}

osu.Game/Overlays/BeatmapSet/MetadataSectionLanguage.cs

@@ -0,0 +1,30 @@
+// 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 System;
+using osu.Framework.Extensions;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics.Containers;
+using osu.Game.Online.Chat;
+using osu.Game.Overlays.BeatmapListing;
+
+namespace osu.Game.Overlays.BeatmapSet
+{
+    public partial class MetadataSectionLanguage : MetadataSection<BeatmapSetOnlineLanguage>
+    {
+        public MetadataSectionLanguage(Action<BeatmapSetOnlineLanguage>? searchAction = null)
+            : base(MetadataType.Language, searchAction)
+        {
+        }
+
+        protected override void AddMetadata(BeatmapSetOnlineLanguage metadata, LinkFlowContainer loaded)
+        {
+            var language = (SearchLanguage)metadata.Id;
+
+            if (Enum.IsDefined(language))
+                loaded.AddLink(language.GetLocalisableDescription(), LinkAction.FilterBeatmapSetLanguage, language);
+            else
+                loaded.AddText(metadata.Name);
+        }
+    }
+}

osu.Game/Overlays/BeatmapSet/MetadataSectionNominators.cs

@@ -0,0 +1,63 @@
+// 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 System;
+using System.Linq;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics.Containers;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Resources.Localisation.Web;
+
+namespace osu.Game.Overlays.BeatmapSet
+{
+    public partial class MetadataSectionNominators : MetadataSection<(BeatmapSetOnlineNomination[] CurrentNominations, APIUser[] RelatedUsers)>
+    {
+        public override (BeatmapSetOnlineNomination[] CurrentNominations, APIUser[] RelatedUsers) Metadata
+        {
+            set
+            {
+                if (value.CurrentNominations.Length == 0)
+                {
+                    this.FadeOut(TRANSITION_DURATION);
+                    return;
+                }
+
+                base.Metadata = value;
+            }
+        }
+
+        public MetadataSectionNominators(Action<(BeatmapSetOnlineNomination[] CurrentNominations, APIUser[] RelatedUsers)>? searchAction = null)
+            : base(MetadataType.Nominators, searchAction)
+        {
+        }
+
+        protected override void AddMetadata((BeatmapSetOnlineNomination[] CurrentNominations, APIUser[] RelatedUsers) metadata, LinkFlowContainer loaded)
+        {
+            int[] nominatorIds = metadata.CurrentNominations.Select(n => n.UserId).ToArray();
+
+            int nominatorsFound = 0;
+
+            foreach (int nominatorId in nominatorIds)
+            {
+                foreach (var user in metadata.RelatedUsers)
+                {
+                    if (nominatorId != user.OnlineID) continue;
+
+                    nominatorsFound++;
+
+                    loaded.AddUserLink(new APIUser
+                    {
+                        Username = user.Username,
+                        Id = nominatorId,
+                    });
+
+                    if (nominatorsFound < nominatorIds.Length)
+                        loaded.AddText(CommonStrings.ArrayAndWordsConnector);
+
+                    break;
+                }
+            }
+        }
+    }
+}

osu.Game/Overlays/BeatmapSet/MetadataSectionSource.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 System;
+using osu.Game.Graphics.Containers;
+using osu.Game.Online.Chat;
+
+namespace osu.Game.Overlays.BeatmapSet
+{
+    public partial class MetadataSectionSource : MetadataSection
+    {
+        public MetadataSectionSource(Action<string>? searchAction = null)
+            : base(MetadataType.Source, searchAction)
+        {
+        }
+
+        protected override void AddMetadata(string metadata, LinkFlowContainer loaded)
+        {
+            if (SearchAction != null)
+                loaded.AddLink(metadata, () => SearchAction(metadata));
+            else
+                loaded.AddLink(metadata, LinkAction.SearchBeatmapSet, metadata);
+        }
+    }
+}

osu.Game/Overlays/BeatmapSet/MetadataSectionTags.cs

@@ -0,0 +1,35 @@
+// 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 System;
+using osu.Game.Graphics.Containers;
+using osu.Game.Online.Chat;
+
+namespace osu.Game.Overlays.BeatmapSet
+{
+    public partial class MetadataSectionTags : MetadataSection
+    {
+        public MetadataSectionTags(Action<string>? searchAction = null)
+            : base(MetadataType.Tags, searchAction)
+        {
+        }
+
+        protected override void AddMetadata(string metadata, LinkFlowContainer loaded)
+        {
+            string[] tags = metadata.Split(" ");
+
+            for (int i = 0; i <= tags.Length - 1; i++)
+            {
+                string tag = tags[i];
+
+                if (SearchAction != null)
+                    loaded.AddLink(tag, () => SearchAction(tag));
+                else
+                    loaded.AddLink(tag, LinkAction.SearchBeatmapSet, tag);
+
+                if (i != tags.Length - 1)
+                    loaded.AddText(" ");
+            }
+        }
+    }
+}

osu.Game/Overlays/BeatmapSet/MetadataType.cs

@@ -23,6 +23,9 @@ namespace osu.Game.Overlays.BeatmapSet
         Genre,
 
         [LocalisableDescription(typeof(BeatmapsetsStrings), nameof(BeatmapsetsStrings.ShowInfoLanguage))]
-        Language
+        Language,
+
+        [LocalisableDescription(typeof(BeatmapsetsStrings), nameof(BeatmapsetsStrings.ShowInfoNominators))]
+        Nominators,
     }
 }

osu.Game/Overlays/Chat/DrawableUsername.cs

@@ -17,9 +17,11 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Localisation;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Chat;
+using osu.Game.Resources.Localisation.Web;
 using osuTK;
 using osuTK.Graphics;
 
@@ -148,11 +150,11 @@ namespace osu.Game.Overlays.Chat
 
                 List<MenuItem> items = new List<MenuItem>
                 {
-                    new OsuMenuItem("View Profile", MenuItemType.Highlighted, openUserProfile)
+                    new OsuMenuItem(ContextMenuStrings.ViewProfile, MenuItemType.Highlighted, openUserProfile)
                 };
 
                 if (!user.Equals(api.LocalUser.Value))
-                    items.Add(new OsuMenuItem("Start Chat", MenuItemType.Standard, openUserChannel));
+                    items.Add(new OsuMenuItem(UsersStrings.CardSendMessage, MenuItemType.Standard, openUserChannel));
 
                 return items.ToArray();
             }

osu.Game/Overlays/Chat/Listing/ChannelListingItem.cs

@@ -38,7 +38,7 @@ namespace osu.Game.Overlays.Chat.Listing
         private Box hoverBox = null!;
         private SpriteIcon checkbox = null!;
         private OsuSpriteText channelText = null!;
-        private OsuSpriteText topicText = null!;
+        private OsuTextFlowContainer topicText = null!;
         private IBindable<bool> channelJoined = null!;
 
         [Resolved]
@@ -65,8 +65,8 @@ namespace osu.Game.Overlays.Chat.Listing
 
             Masking = true;
             CornerRadius = 5;
-            RelativeSizeAxes = Axes.X;
+            RelativeSizeAxes = Content.RelativeSizeAxes = Axes.X;
-            Height = 20 + (vertical_margin * 2);
+            AutoSizeAxes = Content.AutoSizeAxes = Axes.Y;
 
             Children = new Drawable[]
             {
@@ -79,14 +79,19 @@ namespace osu.Game.Overlays.Chat.Listing
                 },
                 new GridContainer
                 {
-                    RelativeSizeAxes = Axes.Both,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
                     ColumnDimensions = new[]
                     {
                         new Dimension(GridSizeMode.Absolute, 40),
                         new Dimension(GridSizeMode.Absolute, 200),
-                        new Dimension(GridSizeMode.Absolute, 400),
+                        new Dimension(maxSize: 400),
                         new Dimension(GridSizeMode.AutoSize),
-                        new Dimension(),
+                        new Dimension(GridSizeMode.Absolute, 50), // enough for any 5 digit user count
+                    },
+                    RowDimensions = new[]
+                    {
+                        new Dimension(GridSizeMode.AutoSize, minSize: 20 + (vertical_margin * 2)),
                     },
                     Content = new[]
                     {
@@ -108,12 +113,13 @@ namespace osu.Game.Overlays.Chat.Listing
                                 Font = OsuFont.Torus.With(size: text_size, weight: FontWeight.SemiBold),
                                 Margin = new MarginPadding { Bottom = 2 },
                             },
-                            topicText = new OsuSpriteText
+                            topicText = new OsuTextFlowContainer(t => t.Font = OsuFont.Torus.With(size: text_size))
                             {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreLeft,
                                 Text = Channel.Topic,
-                                Font = OsuFont.Torus.With(size: text_size),
                                 Margin = new MarginPadding { Bottom = 2 },
                             },
                             new SpriteIcon

osu.Game/Overlays/FirstRunSetup/ScreenImportFromStable.cs

@@ -122,8 +122,8 @@ namespace osu.Game.Overlays.FirstRunSetup
             stableLocatorTextBox.Current.Value = storage.GetFullPath(string.Empty);
             importButton.Enabled.Value = true;
 
-            bool available = legacyImportManager.CheckHardLinkAvailability();
+            bool available = legacyImportManager.CheckSongsFolderHardLinkAvailability();
-            Logger.Log($"Hard link support is {available}");
+            Logger.Log($"Hard link support for beatmaps is {available}");
 
             if (available)
             {

osu.Game/Overlays/OnlineOverlay.cs

@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
+using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online;
 
@@ -38,20 +39,30 @@ namespace osu.Game.Overlays
                 {
                     RelativeSizeAxes = Axes.Both,
                     ScrollbarVisible = false,
-                    Child = new FillFlowContainer
+                    Child = new OsuContextMenuContainer
                     {
-                        AutoSizeAxes = Axes.Y,
                         RelativeSizeAxes = Axes.X,
-                        Direction = FillDirection.Vertical,
+                        AutoSizeAxes = Axes.Y,
-                        Children = new Drawable[]
+                        Child = new PopoverContainer
                         {
-                            Header.With(h => h.Depth = float.MinValue),
+                            RelativeSizeAxes = Axes.X,
-                            content = new PopoverContainer
+                            AutoSizeAxes = Axes.Y,
+                            Child = new FillFlowContainer
                             {
                                 RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y
+                                AutoSizeAxes = Axes.Y,
+                                Direction = FillDirection.Vertical,
+                                Children = new Drawable[]
+                                {
+                                    Header.With(h => h.Depth = float.MinValue),
+                                    content = new Container
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y
+                                    }
+                                }
                             }
-                        }
+                        },
                     }
                 },
                 Loading = new LoadingLayer(true)

osu.Game/Overlays/SettingsToolboxGroup.cs

@@ -126,7 +126,8 @@ namespace osu.Game.Overlays
         {
             base.LoadComplete();
 
-            Expanded.BindValueChanged(updateExpandedState, true);
+            Expanded.BindValueChanged(_ => updateExpandedState(true));
+            updateExpandedState(false);
 
             this.Delay(600).Schedule(updateFadeState);
         }
@@ -161,21 +162,25 @@ namespace osu.Game.Overlays
             return base.OnInvalidate(invalidation, source);
         }
 
-        private void updateExpandedState(ValueChangedEvent<bool> expanded)
+        private void updateExpandedState(bool animate)
         {
             // clearing transforms is necessary to avoid a previous height transform
             // potentially continuing to get processed while content has changed to autosize.
             content.ClearTransforms();
 
-            if (expanded.NewValue)
+            if (Expanded.Value)
+            {
                 content.AutoSizeAxes = Axes.Y;
+                content.AutoSizeDuration = animate ? transition_duration : 0;
+                content.AutoSizeEasing = Easing.OutQuint;
+            }
             else
             {
                 content.AutoSizeAxes = Axes.None;
-                content.ResizeHeightTo(0, transition_duration, Easing.OutQuint);
+                content.ResizeHeightTo(0, animate ? transition_duration : 0, Easing.OutQuint);
             }
 
-            headerContent.FadeColour(expanded.NewValue ? Color4.White : OsuColour.Gray(0.5f), 200, Easing.OutQuint);
+            headerContent.FadeColour(Expanded.Value ? Color4.White : OsuColour.Gray(0.5f), 200, Easing.OutQuint);
         }
 
         private void updateFadeState()

osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs

@@ -99,6 +99,18 @@ namespace osu.Game.Screens.Backgrounds
             }
         }
 
+        /// <summary>
+        /// Reloads beatmap's background.
+        /// </summary>
+        public void RefreshBackground()
+        {
+            Schedule(() =>
+            {
+                cancellationSource?.Cancel();
+                LoadComponentAsync(new BeatmapBackground(beatmap), switchBackground, (cancellationSource = new CancellationTokenSource()).Token);
+            });
+        }
+
         private void switchBackground(BeatmapBackground b)
         {
             float newDepth = 0;

osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/PreviewTimePart.cs

@@ -0,0 +1,41 @@
+// 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.Bindables;
+using osu.Game.Graphics;
+using osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations;
+
+namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
+{
+    public partial class PreviewTimePart : TimelinePart
+    {
+        private readonly BindableInt previewTime = new BindableInt();
+
+        protected override void LoadBeatmap(EditorBeatmap beatmap)
+        {
+            base.LoadBeatmap(beatmap);
+
+            previewTime.UnbindAll();
+            previewTime.BindTo(beatmap.PreviewTime);
+            previewTime.BindValueChanged(t =>
+            {
+                Clear();
+
+                if (t.NewValue >= 0)
+                    Add(new PreviewTimeVisualisation(t.NewValue));
+            }, true);
+        }
+
+        private partial class PreviewTimeVisualisation : PointVisualisation
+        {
+            public PreviewTimeVisualisation(double time)
+                : base(time)
+            {
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours) => Colour = colours.Green1;
+        }
+    }
+}

osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs

@@ -41,6 +41,13 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary
                     RelativeSizeAxes = Axes.Both,
                     Height = 0.35f
                 },
+                new PreviewTimePart
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.TopCentre,
+                    RelativeSizeAxes = Axes.Both,
+                    Height = 0.35f
+                },
                 new Container
                 {
                     Name = "centre line",

osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs

@@ -5,6 +5,7 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -35,8 +36,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         public readonly Bindable<bool> TicksVisible = new Bindable<bool>();
 
-        public readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
-
         [Resolved]
         private EditorClock editorClock { get; set; }
 
@@ -92,6 +91,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private double trackLengthForZoom;
 
+        private readonly IBindable<Track> track = new Bindable<Track>();
+
         [BackgroundDependencyLoader]
         private void load(IBindable<WorkingBeatmap> beatmap, OsuColour colours, OsuConfigManager config)
         {
@@ -139,11 +140,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             waveformOpacity = config.GetBindable<float>(OsuSetting.EditorWaveformOpacity);
 
-            Beatmap.BindTo(beatmap);
+            track.BindTo(editorClock.Track);
-            Beatmap.BindValueChanged(b =>
+            track.BindValueChanged(_ => waveform.Waveform = beatmap.Value.Waveform, true);
-            {
-                waveform.Waveform = b.NewValue.Waveform;
-            }, true);
 
             Zoom = (float)(defaultTimelineZoom * editorBeatmap.BeatmapInfo.TimelineZoom);
         }

osu.Game/Screens/Edit/Editor.cs

@@ -322,6 +322,13 @@ namespace osu.Game.Screens.Edit
                                                 State = { BindTarget = editorHitMarkers },
                                             }
                                         }
+                                    },
+                                    new MenuItem("Timing")
+                                    {
+                                        Items = new MenuItem[]
+                                        {
+                                            new EditorMenuItem("Set preview point to current time", MenuItemType.Standard, SetPreviewPointToCurrentTime)
+                                        }
                                     }
                                 }
                             },
@@ -801,6 +808,11 @@ namespace osu.Game.Screens.Edit
 
         protected void Redo() => changeHandler?.RestoreState(1);
 
+        protected void SetPreviewPointToCurrentTime()
+        {
+            editorBeatmap.PreviewTime.Value = (int)clock.CurrentTime;
+        }
+
         private void resetTrack(bool seekToStart = false)
         {
             Beatmap.Value.Track.Stop();

osu.Game/Screens/Edit/EditorBeatmap.cs

@@ -86,6 +86,8 @@ namespace osu.Game.Screens.Edit
         [Resolved]
         private EditorClock editorClock { get; set; }
 
+        public BindableInt PreviewTime { get; }
+
         private readonly IBeatmapProcessor beatmapProcessor;
 
         private readonly Dictionary<HitObject, Bindable<double>> startTimeBindables = new Dictionary<HitObject, Bindable<double>>();
@@ -107,6 +109,14 @@ namespace osu.Game.Screens.Edit
 
             foreach (var obj in HitObjects)
                 trackStartTime(obj);
+
+            PreviewTime = new BindableInt(BeatmapInfo.Metadata.PreviewTime);
+            PreviewTime.BindValueChanged(s =>
+            {
+                BeginChange();
+                BeatmapInfo.Metadata.PreviewTime = s.NewValue;
+                EndChange();
+            });
         }
 
         /// <summary>

osu.Game/Screens/Edit/Setup/ResourcesSection.cs

@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System.IO;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -16,25 +14,28 @@ namespace osu.Game.Screens.Edit.Setup
 {
     internal partial class ResourcesSection : SetupSection
     {
-        private LabelledFileChooser audioTrackChooser;
+        private LabelledFileChooser audioTrackChooser = null!;
-        private LabelledFileChooser backgroundChooser;
+        private LabelledFileChooser backgroundChooser = null!;
 
         public override LocalisableString Title => EditorSetupStrings.ResourcesHeader;
 
         [Resolved]
-        private MusicController music { get; set; }
+        private MusicController music { get; set; } = null!;
 
         [Resolved]
-        private BeatmapManager beatmaps { get; set; }
+        private BeatmapManager beatmaps { get; set; } = null!;
 
         [Resolved]
-        private IBindable<WorkingBeatmap> working { get; set; }
+        private IBindable<WorkingBeatmap> working { get; set; } = null!;
 
         [Resolved]
-        private EditorBeatmap editorBeatmap { get; set; }
+        private EditorBeatmap editorBeatmap { get; set; } = null!;
 
         [Resolved]
-        private SetupScreenHeader header { get; set; }
+        private Editor? editor { get; set; }
+
+        [Resolved]
+        private SetupScreenHeader header { get; set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -93,6 +94,8 @@ namespace osu.Game.Screens.Edit.Setup
             working.Value.Metadata.BackgroundFile = destination.Name;
             header.Background.UpdateBackground();
 
+            editor?.ApplyToBackground(bg => bg.RefreshBackground());
+
             return true;
         }
 
@@ -125,17 +128,17 @@ namespace osu.Game.Screens.Edit.Setup
             return true;
         }
 
-        private void backgroundChanged(ValueChangedEvent<FileInfo> file)
+        private void backgroundChanged(ValueChangedEvent<FileInfo?> file)
         {
-            if (!ChangeBackgroundImage(file.NewValue))
+            if (file.NewValue == null || !ChangeBackgroundImage(file.NewValue))
                 backgroundChooser.Current.Value = file.OldValue;
 
             updatePlaceholderText();
         }
 
-        private void audioTrackChanged(ValueChangedEvent<FileInfo> file)
+        private void audioTrackChanged(ValueChangedEvent<FileInfo?> file)
         {
-            if (!ChangeAudioTrack(file.NewValue))
+            if (file.NewValue == null || !ChangeAudioTrack(file.NewValue))
                 audioTrackChooser.Current.Value = file.OldValue;
 
             updatePlaceholderText();

osu.Game/Screens/Edit/Timing/TapTimingControl.cs

@@ -88,7 +88,7 @@ namespace osu.Game.Screens.Edit.Timing
                                                     Anchor = Anchor.CentreLeft,
                                                     Origin = Anchor.CentreLeft,
                                                 },
-                                                new WaveformComparisonDisplay(),
+                                                new WaveformComparisonDisplay()
                                             }
                                         },
                                     }

osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Audio;
@@ -150,7 +151,7 @@ namespace osu.Game.Screens.Edit.Timing
             if (!displayLocked.Value)
             {
                 float trackLength = (float)beatmap.Value.Track.Length;
-                int totalBeatsAvailable = (int)(trackLength / timingPoint.BeatLength);
+                int totalBeatsAvailable = (int)((trackLength - timingPoint.Time) / timingPoint.BeatLength);
 
                 Scheduler.AddOnce(showFromBeat, (int)(e.MousePosition.X / DrawWidth * totalBeatsAvailable));
             }
@@ -294,13 +295,18 @@ namespace osu.Game.Screens.Edit.Timing
             [Resolved]
             private OverlayColourProvider colourProvider { get; set; } = null!;
 
+            [Resolved]
+            private IBindable<WorkingBeatmap> beatmap { get; set; } = null!;
+
+            private readonly IBindable<Track> track = new Bindable<Track>();
+
             public WaveformRow(bool isMainRow)
             {
                 this.isMainRow = isMainRow;
             }
 
             [BackgroundDependencyLoader]
-            private void load(IBindable<WorkingBeatmap> beatmap)
+            private void load(EditorClock clock)
             {
                 InternalChildren = new Drawable[]
                 {
@@ -330,6 +336,13 @@ namespace osu.Game.Screens.Edit.Timing
                         Colour = colourProvider.Content2
                     }
                 };
+
+                track.BindTo(clock.Track);
+            }
+
+            protected override void LoadComplete()
+            {
+                track.ValueChanged += _ => waveformGraph.Waveform = beatmap.Value.Waveform;
             }
 
             public int BeatIndex { set => beatIndexText.Text = value.ToString(); }

osu.Game/Screens/Menu/OsuLogo.cs

@@ -282,7 +282,7 @@ namespace osu.Game.Screens.Menu
 
             if (beatIndex < 0) return;
 
-            if (IsHovered)
+            if (Action != null && IsHovered)
             {
                 this.Delay(early_activation).Schedule(() =>
                 {
@@ -361,11 +361,11 @@ namespace osu.Game.Screens.Menu
             }
         }
 
-        public override bool HandlePositionalInput => base.HandlePositionalInput && Action != null && Alpha > 0.2f;
+        public override bool HandlePositionalInput => base.HandlePositionalInput && Alpha > 0.2f;
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
-            if (e.Button != MouseButton.Left) return false;
+            if (e.Button != MouseButton.Left) return true;
 
             logoBounceContainer.ScaleTo(0.9f, 1000, Easing.Out);
             return true;
@@ -380,18 +380,21 @@ namespace osu.Game.Screens.Menu
 
         protected override bool OnClick(ClickEvent e)
         {
-            if (Action?.Invoke() ?? true)
-                sampleClick.Play();
-
             flashLayer.ClearTransforms();
             flashLayer.Alpha = 0.4f;
             flashLayer.FadeOut(1500, Easing.OutExpo);
+
+            if (Action?.Invoke() == true)
+                sampleClick.Play();
+
             return true;
         }
 
         protected override bool OnHover(HoverEvent e)
         {
-            logoHoverContainer.ScaleTo(1.1f, 500, Easing.OutElastic);
+            if (Action != null)
+                logoHoverContainer.ScaleTo(1.1f, 500, Easing.OutElastic);
+
             return true;
         }
 

osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs

@@ -156,6 +156,8 @@ namespace osu.Game.Screens.OnlinePlay
 
         protected override FillFlowContainer<RearrangeableListItem<PlaylistItem>> CreateListFillFlowContainer() => new FillFlowContainer<RearrangeableListItem<PlaylistItem>>
         {
+            LayoutDuration = 200,
+            LayoutEasing = Easing.OutQuint,
             Spacing = new Vector2(0, 2)
         };
 

osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsPlaylist.cs

@@ -24,7 +24,8 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
                 Items.Remove(item);
 
-                SelectedItem.Value = nextItem ?? Items.LastOrDefault();
+                if (AllowSelection && SelectedItem.Value == item)
+                    SelectedItem.Value = nextItem ?? Items.LastOrDefault();
             };
         }
     }

osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs

@@ -171,13 +171,13 @@ namespace osu.Game.Screens.Play.HUD
             for (int i = 0; i < Flow.Count; i++)
             {
                 Flow.SetLayoutPosition(orderedByScore[i], i);
-                orderedByScore[i].ScorePosition = CheckValidScorePosition(i + 1) ? i + 1 : null;
+                orderedByScore[i].ScorePosition = CheckValidScorePosition(orderedByScore[i], i + 1) ? i + 1 : null;
             }
 
             sorting.Validate();
         }
 
-        protected virtual bool CheckValidScorePosition(int i) => true;
+        protected virtual bool CheckValidScorePosition(GameplayLeaderboardScore score, int position) => true;
 
         private partial class InputDisabledScrollContainer : OsuScrollContainer
         {

osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs

@@ -100,16 +100,16 @@ namespace osu.Game.Screens.Play.HUD
             local.DisplayOrder.Value = long.MaxValue;
         }
 
-        protected override bool CheckValidScorePosition(int i)
+        protected override bool CheckValidScorePosition(GameplayLeaderboardScore score, int position)
         {
             // change displayed position to '-' when there are 50 already submitted scores and tracked score is last
-            if (scoreSource.Value != PlayBeatmapDetailArea.TabType.Local)
+            if (score.Tracked && scoreSource.Value != PlayBeatmapDetailArea.TabType.Local)
             {
-                if (i == Flow.Count && Flow.Count > GetScoresRequest.MAX_SCORES_PER_REQUEST)
+                if (position == Flow.Count && Flow.Count > GetScoresRequest.MAX_SCORES_PER_REQUEST)
                     return false;
             }
 
-            return base.CheckValidScorePosition(i);
+            return base.CheckValidScorePosition(score, position);
         }
 
         private void updateVisibility() =>

osu.Game/Screens/Select/BeatmapDetails.cs

@@ -141,9 +141,9 @@ namespace osu.Game.Screens.Select
                                                     LayoutEasing = Easing.OutQuad,
                                                     Children = new[]
                                                     {
-                                                        description = new MetadataSection(MetadataType.Description, searchOnSongSelect),
+                                                        description = new MetadataSectionDescription(searchOnSongSelect),
-                                                        source = new MetadataSection(MetadataType.Source, searchOnSongSelect),
+                                                        source = new MetadataSectionSource(searchOnSongSelect),
-                                                        tags = new MetadataSection(MetadataType.Tags, searchOnSongSelect),
+                                                        tags = new MetadataSectionTags(searchOnSongSelect),
                                                     },
                                                 },
                                             },
@@ -187,9 +187,9 @@ namespace osu.Game.Screens.Select
         private void updateStatistics()
         {
             advanced.BeatmapInfo = BeatmapInfo;
-            description.Text = BeatmapInfo?.DifficultyName;
+            description.Metadata = BeatmapInfo?.DifficultyName ?? string.Empty;
-            source.Text = BeatmapInfo?.Metadata.Source;
+            source.Metadata = BeatmapInfo?.Metadata.Source ?? string.Empty;
-            tags.Text = BeatmapInfo?.Metadata.Tags;
+            tags.Metadata = BeatmapInfo?.Metadata.Tags ?? string.Empty;
 
             // failTimes may have been previously fetched
             if (ratings != null && failTimes != null)

osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs

@@ -152,14 +152,23 @@ namespace osu.Game.Screens.Select.Leaderboards
             else if (filterMods)
                 requestMods = mods.Value;
 
-            scoreRetrievalRequest = new GetScoresRequest(fetchBeatmapInfo, fetchRuleset, Scope, requestMods);
+            scoreRetrievalRequest?.Cancel();
 
-            scoreRetrievalRequest.Success += response => SetScores(
+            var newRequest = new GetScoresRequest(fetchBeatmapInfo, fetchRuleset, Scope, requestMods);
-                scoreManager.OrderByTotalScore(response.Scores.Select(s => s.ToScoreInfo(rulesets, fetchBeatmapInfo))),
+            newRequest.Success += response => Schedule(() =>
-                response.UserScore?.CreateScoreInfo(rulesets, fetchBeatmapInfo)
+            {
-            );
+                // Request may have changed since fetch request.
+                // Can't rely on request cancellation due to Schedule inside SetScores so let's play it safe.
+                if (!newRequest.Equals(scoreRetrievalRequest))
+                    return;
 
-            return scoreRetrievalRequest;
+                SetScores(
+                    scoreManager.OrderByTotalScore(response.Scores.Select(s => s.ToScoreInfo(rulesets, fetchBeatmapInfo))),
+                    response.UserScore?.CreateScoreInfo(rulesets, fetchBeatmapInfo)
+                );
+            });
+
+            return scoreRetrievalRequest = newRequest;
         }
 
         protected override LeaderboardScore CreateDrawableScore(ScoreInfo model, int index) => new LeaderboardScore(model, index, IsOnlineScope)

osu.Game/Tests/Visual/EditorTestScene.cs

@@ -102,6 +102,8 @@ namespace osu.Game.Tests.Visual
 
             public new void Redo() => base.Redo();
 
+            public new void SetPreviewPointToCurrentTime() => base.SetPreviewPointToCurrentTime();
+
             public new bool Save() => base.Save();
 
             public new void Cut() => base.Cut();

osu.Game/Users/UserPanel.cs

@@ -1,9 +1,8 @@
 // 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.
 
-#nullable disable
-
 using System;
+using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
@@ -14,8 +13,11 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Graphics.Cursor;
 using osu.Game.Graphics.Containers;
-using JetBrains.Annotations;
+using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.Chat;
+using osu.Game.Resources.Localisation.Web;
+using osu.Game.Localisation;
 
 namespace osu.Game.Users
 {
@@ -27,11 +29,11 @@ namespace osu.Game.Users
         /// Perform an action in addition to showing the user's profile.
         /// This should be used to perform auxiliary tasks and not as a primary action for clicking a user panel (to maintain a consistent UX).
         /// </summary>
-        public new Action Action;
+        public new Action? Action;
 
-        protected Action ViewProfile { get; private set; }
+        protected Action ViewProfile { get; private set; } = null!;
 
-        protected Drawable Background { get; private set; }
+        protected Drawable Background { get; private set; } = null!;
 
         protected UserPanel(APIUser user)
             : base(HoverSampleSet.Button)
@@ -41,14 +43,23 @@ namespace osu.Game.Users
             User = user;
         }
 
-        [Resolved(canBeNull: true)]
+        [Resolved]
-        private UserProfileOverlay profileOverlay { get; set; }
+        private UserProfileOverlay? profileOverlay { get; set; }
-
-        [Resolved(canBeNull: true)]
-        protected OverlayColourProvider ColourProvider { get; private set; }
 
         [Resolved]
-        protected OsuColour Colours { get; private set; }
+        private IAPIProvider api { get; set; } = null!;
+
+        [Resolved]
+        private ChannelManager? channelManager { get; set; }
+
+        [Resolved]
+        private ChatOverlay? chatOverlay { get; set; }
+
+        [Resolved]
+        protected OverlayColourProvider? ColourProvider { get; private set; }
+
+        [Resolved]
+        protected OsuColour Colours { get; private set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -79,7 +90,6 @@ namespace osu.Game.Users
             };
         }
 
-        [NotNull]
         protected abstract Drawable CreateLayout();
 
         protected OsuSpriteText CreateUsername() => new OsuSpriteText
@@ -89,9 +99,26 @@ namespace osu.Game.Users
             Text = User.Username,
         };
 
-        public MenuItem[] ContextMenuItems => new MenuItem[]
+        public MenuItem[] ContextMenuItems
         {
-            new OsuMenuItem("View Profile", MenuItemType.Highlighted, ViewProfile),
+            get
-        };
+            {
+                List<MenuItem> items = new List<MenuItem>
+                {
+                    new OsuMenuItem(ContextMenuStrings.ViewProfile, MenuItemType.Highlighted, ViewProfile)
+                };
+
+                if (!User.Equals(api.LocalUser.Value))
+                {
+                    items.Add(new OsuMenuItem(UsersStrings.CardSendMessage, MenuItemType.Standard, () =>
+                    {
+                        channelManager?.OpenPrivateChannel(User);
+                        chatOverlay?.Show();
+                    }));
+                }
+
+                return items.ToArray();
+            }
+        }
     }
 }