From ee278a2e1bd3e460a7092e2348c84f0d305f8cb3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 15:55:36 +0900
Subject: [PATCH 01/31] Add taiko/catch/mania sample beatmaps

---
 .../Resources/sample-beatmap-catch.osu        | 30 +++++++++++++
 .../Resources/sample-beatmap-mania.osu        | 39 +++++++++++++++++
 .../Resources/sample-beatmap-taiko.osu        | 42 +++++++++++++++++++
 3 files changed, 111 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/sample-beatmap-catch.osu
 create mode 100644 osu.Game.Tests/Resources/sample-beatmap-mania.osu
 create mode 100644 osu.Game.Tests/Resources/sample-beatmap-taiko.osu

diff --git a/osu.Game.Tests/Resources/sample-beatmap-catch.osu b/osu.Game.Tests/Resources/sample-beatmap-catch.osu
new file mode 100644
index 0000000000..09ef762e3e
--- /dev/null
+++ b/osu.Game.Tests/Resources/sample-beatmap-catch.osu
@@ -0,0 +1,30 @@
+osu file format v14
+
+[General]
+SampleSet: Normal
+StackLeniency: 0.7
+Mode: 2
+
+[Difficulty]
+HPDrainRate:3
+CircleSize:5
+OverallDifficulty:8
+ApproachRate:8
+SliderMultiplier:3.59999990463257
+SliderTickRate:2
+
+[TimingPoints]
+24,352.941176470588,4,1,1,100,1,0
+6376,-50,4,1,1,100,0,0
+
+[HitObjects]
+32,183,24,5,0,0:0:0:0:
+106,123,200,1,10,0:0:0:0:
+199,108,376,1,2,0:0:0:0:
+305,105,553,5,4,0:0:0:0:
+386,112,729,1,14,0:0:0:0:
+486,197,906,5,12,0:0:0:0:
+14,199,1082,2,0,L|473:198,1,449.999988079071
+14,199,1700,6,6,P|248:33|490:222,1,629.9999833107,0|8,0:0|0:0,0:0:0:0:
+10,190,2494,2,8,B|252:29|254:335|468:167,1,449.999988079071,10|12,0:0|0:0,0:0:0:0:
+256,192,3112,12,0,3906,0:0:0:0:
\ No newline at end of file
diff --git a/osu.Game.Tests/Resources/sample-beatmap-mania.osu b/osu.Game.Tests/Resources/sample-beatmap-mania.osu
new file mode 100644
index 0000000000..04d6a31ab6
--- /dev/null
+++ b/osu.Game.Tests/Resources/sample-beatmap-mania.osu
@@ -0,0 +1,39 @@
+osu file format v14
+
+[General]
+SampleSet: Normal
+StackLeniency: 0.7
+Mode: 3
+
+[Difficulty]
+HPDrainRate:3
+CircleSize:5
+OverallDifficulty:8
+ApproachRate:8
+SliderMultiplier:3.59999990463257
+SliderTickRate:2
+
+[TimingPoints]
+24,352.941176470588,4,1,1,100,1,0
+6376,-50,4,1,1,100,0,0
+
+[HitObjects]
+51,192,24,1,0,0:0:0:0:
+153,192,200,1,0,0:0:0:0:
+358,192,376,1,0,0:0:0:0:
+460,192,553,1,0,0:0:0:0:
+460,192,729,128,0,1435:0:0:0:0:
+358,192,906,128,0,1612:0:0:0:0:
+256,192,1082,128,0,1788:0:0:0:0:
+153,192,1259,128,0,1965:0:0:0:0:
+51,192,1435,128,0,2141:0:0:0:0:
+51,192,2318,1,12,0:0:0:0:
+153,192,2318,1,4,0:0:0:0:
+256,192,2318,1,6,0:0:0:0:
+358,192,2318,1,14,0:0:0:0:
+460,192,2318,1,0,0:0:0:0:
+51,192,2494,128,0,2582:0:0:0:0:
+153,192,2494,128,14,2582:0:0:0:0:
+256,192,2494,128,6,2582:0:0:0:0:
+358,192,2494,128,4,2582:0:0:0:0:
+460,192,2494,128,12,2582:0:0:0:0:
\ No newline at end of file
diff --git a/osu.Game.Tests/Resources/sample-beatmap-taiko.osu b/osu.Game.Tests/Resources/sample-beatmap-taiko.osu
new file mode 100644
index 0000000000..94b4288336
--- /dev/null
+++ b/osu.Game.Tests/Resources/sample-beatmap-taiko.osu
@@ -0,0 +1,42 @@
+osu file format v14
+
+[General]
+SampleSet: Normal
+StackLeniency: 0.7
+Mode: 1
+
+[Difficulty]
+HPDrainRate:3
+CircleSize:5
+OverallDifficulty:8
+ApproachRate:8
+SliderMultiplier:3.59999990463257
+SliderTickRate:2
+
+[TimingPoints]
+24,352.941176470588,4,1,1,100,1,0
+6376,-50,4,1,1,100,0,0
+
+[HitObjects]
+231,129,24,1,0,0:0:0:0:
+231,129,200,1,0,0:0:0:0:
+231,129,376,1,0,0:0:0:0:
+231,129,553,1,0,0:0:0:0:
+231,129,729,1,0,0:0:0:0:
+373,132,906,1,4,0:0:0:0:
+373,132,1082,1,4,0:0:0:0:
+373,132,1259,1,4,0:0:0:0:
+373,132,1435,1,4,0:0:0:0:
+231,129,1788,1,8,0:0:0:0:
+231,129,1964,1,8,0:0:0:0:
+231,129,2140,1,8,0:0:0:0:
+231,129,2317,1,8,0:0:0:0:
+231,129,2493,1,8,0:0:0:0:
+373,132,2670,1,12,0:0:0:0:
+373,132,2846,1,12,0:0:0:0:
+373,132,3023,1,12,0:0:0:0:
+373,132,3199,1,12,0:0:0:0:
+51,189,3553,2,0,L|150:188,1,89.9999976158143
+52,191,3906,2,0,L|512:189,1,449.999988079071
+26,196,4612,2,4,L|501:195,1,449.999988079071
+17,242,5318,2,10,P|250:69|495:243,1,629.9999833107,0|8,0:0|0:0,0:0:0:0:
\ No newline at end of file

From ea0ebc8527035e4884acebd77e5cad73de3200e3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 16:04:58 +0900
Subject: [PATCH 02/31] Implement beatmap encoding for all legacy rulesets

---
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  | 53 ++++++++++++-------
 1 file changed, 33 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 44ccbb350d..af0adb65a5 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -13,6 +13,7 @@ using osu.Game.Beatmaps.Legacy;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Objects.Types;
+using osuTK;
 
 namespace osu.Game.Beatmaps.Formats
 {
@@ -197,32 +198,40 @@ namespace osu.Game.Beatmaps.Formats
 
             writer.WriteLine("[HitObjects]");
 
-            // TODO: implement other legacy rulesets
+            foreach (var h in beatmap.HitObjects)
+                handleHitObject(writer, h);
+        }
+
+        private void handleHitObject(TextWriter writer, HitObject hitObject)
+        {
+            Vector2 position = new Vector2(256, 192);
+
             switch (beatmap.BeatmapInfo.RulesetID)
             {
                 case 0:
-                    foreach (var h in beatmap.HitObjects)
-                        handleOsuHitObject(writer, h);
+                    position = ((IHasPosition)hitObject).Position;
+                    break;
+
+                case 2:
+                    position.X = ((IHasXPosition)hitObject).X * 512;
+                    break;
+
+                case 3:
+                    int totalColumns = (int)Math.Max(1, beatmap.BeatmapInfo.BaseDifficulty.CircleSize);
+                    position.X = (int)Math.Ceiling(((IHasXPosition)hitObject).X * (512f / totalColumns));
                     break;
             }
-        }
 
-        private void handleOsuHitObject(TextWriter writer, HitObject hitObject)
-        {
-            var positionData = (IHasPosition)hitObject;
-
-            writer.Write(FormattableString.Invariant($"{positionData.X},"));
-            writer.Write(FormattableString.Invariant($"{positionData.Y},"));
+            writer.Write(FormattableString.Invariant($"{position.X},"));
+            writer.Write(FormattableString.Invariant($"{position.Y},"));
             writer.Write(FormattableString.Invariant($"{hitObject.StartTime},"));
             writer.Write(FormattableString.Invariant($"{(int)getObjectType(hitObject)},"));
 
-            writer.Write(hitObject is IHasCurve
-                ? FormattableString.Invariant($"0,")
-                : FormattableString.Invariant($"{(int)toLegacyHitSoundType(hitObject.Samples)},"));
+            writer.Write(FormattableString.Invariant($"{(int)toLegacyHitSoundType(hitObject.Samples)},"));
 
             if (hitObject is IHasCurve curveData)
             {
-                addCurveData(writer, curveData, positionData);
+                addCurveData(writer, curveData, position);
                 writer.Write(getSampleBank(hitObject.Samples, zeroBanks: true));
             }
             else
@@ -237,11 +246,15 @@ namespace osu.Game.Beatmaps.Formats
 
         private static LegacyHitObjectType getObjectType(HitObject hitObject)
         {
-            var comboData = (IHasCombo)hitObject;
+            LegacyHitObjectType type = 0;
 
-            var type = (LegacyHitObjectType)(comboData.ComboOffset << 4);
+            if (hitObject is IHasCombo combo)
+            {
+                type = (LegacyHitObjectType)(combo.ComboOffset << 4);
 
-            if (comboData.NewCombo) type |= LegacyHitObjectType.NewCombo;
+                if (combo.NewCombo)
+                    type |= LegacyHitObjectType.NewCombo;
+            }
 
             switch (hitObject)
             {
@@ -261,7 +274,7 @@ namespace osu.Game.Beatmaps.Formats
             return type;
         }
 
-        private void addCurveData(TextWriter writer, IHasCurve curveData, IHasPosition positionData)
+        private void addCurveData(TextWriter writer, IHasCurve curveData, Vector2 position)
         {
             PathType? lastType = null;
 
@@ -297,13 +310,13 @@ namespace osu.Game.Beatmaps.Formats
                     else
                     {
                         // New segment with the same type - duplicate the control point
-                        writer.Write(FormattableString.Invariant($"{positionData.X + point.Position.Value.X}:{positionData.Y + point.Position.Value.Y}|"));
+                        writer.Write(FormattableString.Invariant($"{position.X + point.Position.Value.X}:{position.Y + point.Position.Value.Y}|"));
                     }
                 }
 
                 if (i != 0)
                 {
-                    writer.Write(FormattableString.Invariant($"{positionData.X + point.Position.Value.X}:{positionData.Y + point.Position.Value.Y}"));
+                    writer.Write(FormattableString.Invariant($"{position.X + point.Position.Value.X}:{position.Y + point.Position.Value.Y}"));
                     writer.Write(i != curveData.Path.ControlPoints.Count - 1 ? "|" : ",");
                 }
             }

From d957614fc96fe142dccaeec1030de08e3f4c7453 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 16:33:19 +0900
Subject: [PATCH 03/31] Cleanup handling of mania samples

---
 .../Beatmaps/ManiaBeatmapConverter.cs         | 21 +--------
 .../Legacy/DistanceObjectPatternGenerator.cs  | 10 ++--
 .../Legacy/EndTimeObjectPatternGenerator.cs   | 15 ++----
 .../Objects/Drawables/DrawableHoldNote.cs     |  5 ++
 osu.Game.Rulesets.Mania/Objects/HoldNote.cs   | 46 +++++++++++++++----
 5 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index 4187e39b43..b803caa1b7 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -238,9 +238,8 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                     {
                         StartTime = HitObject.StartTime,
                         Duration = endTimeData.Duration,
-                        Column = column,
-                        Head = { Samples = sampleInfoListAt(HitObject.StartTime) },
-                        Tail = { Samples = sampleInfoListAt(endTimeData.EndTime) },
+                        Samples = HitObject.Samples,
+                        NodeSamples = (HitObject as IHasRepeats)?.NodeSamples
                     });
                 }
                 else if (HitObject is IHasXPosition)
@@ -255,22 +254,6 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
 
                 return pattern;
             }
-
-            /// <summary>
-            /// Retrieves the sample info list at a point in time.
-            /// </summary>
-            /// <param name="time">The time to retrieve the sample info list from.</param>
-            /// <returns></returns>
-            private IList<HitSampleInfo> sampleInfoListAt(double time)
-            {
-                if (!(HitObject is IHasCurve curveData))
-                    return HitObject.Samples;
-
-                double segmentTime = (curveData.EndTime - HitObject.StartTime) / curveData.SpanCount();
-
-                int index = (int)(segmentTime == 0 ? 0 : (time - HitObject.StartTime) / segmentTime);
-                return curveData.NodeSamples[index];
-            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 315ef96e49..d8d5b67c0e 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -505,16 +505,14 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             }
             else
             {
-                var holdNote = new HoldNote
+                newObject = new HoldNote
                 {
                     StartTime = startTime,
-                    Column = column,
                     Duration = endTime - startTime,
-                    Head = { Samples = sampleInfoListAt(startTime) },
-                    Tail = { Samples = sampleInfoListAt(endTime) }
+                    Column = column,
+                    Samples = HitObject.Samples,
+                    NodeSamples = (HitObject as IHasRepeats)?.NodeSamples
                 };
-
-                newObject = holdNote;
             }
 
             pattern.Add(newObject);
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
index b3be08e1f7..907bed0d65 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
@@ -64,21 +64,14 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             if (holdNote)
             {
-                var hold = new HoldNote
+                newObject = new HoldNote
                 {
                     StartTime = HitObject.StartTime,
+                    Duration = endTime - HitObject.StartTime,
                     Column = column,
-                    Duration = endTime - HitObject.StartTime
+                    Samples = HitObject.Samples,
+                    NodeSamples = (HitObject as IHasRepeats)?.NodeSamples
                 };
-
-                if (hold.Head.Samples == null)
-                    hold.Head.Samples = new List<HitSampleInfo>();
-
-                hold.Head.Samples.Add(new HitSampleInfo { Name = HitSampleInfo.HIT_NORMAL });
-
-                hold.Tail.Samples = HitObject.Samples;
-
-                newObject = hold;
             }
             else
             {
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index a9ef661aaa..bc3a136a6a 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -127,6 +127,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             bodyPiece.Anchor = bodyPiece.Origin = e.NewValue == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
         }
 
+        public override void PlaySamples()
+        {
+            // The hold note does not play samples itself.
+        }
+
         protected override void Update()
         {
             base.Update();
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index 049bf55f90..04f8fd8c99 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
@@ -1,6 +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.
 
+using System.Collections.Generic;
+using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
@@ -28,7 +30,9 @@ namespace osu.Game.Rulesets.Mania.Objects
             set
             {
                 duration = value;
-                Tail.StartTime = EndTime;
+
+                if (Tail != null)
+                    Tail.StartTime = EndTime;
             }
         }
 
@@ -38,8 +42,12 @@ namespace osu.Game.Rulesets.Mania.Objects
             set
             {
                 base.StartTime = value;
-                Head.StartTime = value;
-                Tail.StartTime = EndTime;
+
+                if (Head != null)
+                    Head.StartTime = value;
+
+                if (Tail != null)
+                    Tail.StartTime = EndTime;
             }
         }
 
@@ -49,20 +57,26 @@ namespace osu.Game.Rulesets.Mania.Objects
             set
             {
                 base.Column = value;
-                Head.Column = value;
-                Tail.Column = value;
+
+                if (Head != null)
+                    Head.Column = value;
+
+                if (Tail != null)
+                    Tail.Column = value;
             }
         }
 
+        public List<IList<HitSampleInfo>> NodeSamples { get; set; }
+
         /// <summary>
         /// The head note of the hold.
         /// </summary>
-        public readonly Note Head = new Note();
+        public Note Head { get; private set; }
 
         /// <summary>
         /// The tail note of the hold.
         /// </summary>
-        public readonly TailNote Tail = new TailNote();
+        public TailNote Tail { get; private set; }
 
         /// <summary>
         /// The time between ticks of this hold.
@@ -83,8 +97,19 @@ namespace osu.Game.Rulesets.Mania.Objects
 
             createTicks();
 
-            AddNested(Head);
-            AddNested(Tail);
+            AddNested(Head = new Note
+            {
+                StartTime = StartTime,
+                Column = Column,
+                Samples = getNodeSamples(0),
+            });
+
+            AddNested(Tail = new TailNote
+            {
+                StartTime = EndTime,
+                Column = Column,
+                Samples = getNodeSamples(1),
+            });
         }
 
         private void createTicks()
@@ -105,5 +130,8 @@ namespace osu.Game.Rulesets.Mania.Objects
         public override Judgement CreateJudgement() => new IgnoreJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
+
+        private IList<HitSampleInfo> getNodeSamples(int nodeIndex) =>
+            nodeIndex < NodeSamples?.Count ? NodeSamples[nodeIndex] : Samples;
     }
 }

From cc0c82aaebac82c2d3a7eb1844eac44dab47da31 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 16:44:26 +0900
Subject: [PATCH 04/31] Implement IHasXPosition on ManiaHitObject

---
 .../Beatmaps/ManiaBeatmapConverter.cs                    | 3 +--
 osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs        | 9 ++++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index b803caa1b7..cb583ac1a9 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -13,7 +13,6 @@ using osu.Game.Rulesets.Mania.Beatmaps.Patterns;
 using osu.Game.Rulesets.Mania.MathUtils;
 using osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy;
 using osuTK;
-using osu.Game.Audio;
 
 namespace osu.Game.Rulesets.Mania.Beatmaps
 {
@@ -67,7 +66,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
             }
         }
 
-        public override bool CanConvert() => Beatmap.HitObjects.All(h => h is IHasXPosition || h is ManiaHitObject);
+        public override bool CanConvert() => Beatmap.HitObjects.All(h => h is IHasXPosition);
 
         protected override Beatmap<ManiaHitObject> ConvertBeatmap(IBeatmap original)
         {
diff --git a/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
index 995e1516cb..27bf50493d 100644
--- a/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
@@ -5,11 +5,12 @@ using osu.Framework.Bindables;
 using osu.Game.Rulesets.Mania.Objects.Types;
 using osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Objects
 {
-    public abstract class ManiaHitObject : HitObject, IHasColumn
+    public abstract class ManiaHitObject : HitObject, IHasColumn, IHasXPosition
     {
         public readonly Bindable<int> ColumnBindable = new Bindable<int>();
 
@@ -20,5 +21,11 @@ namespace osu.Game.Rulesets.Mania.Objects
         }
 
         protected override HitWindows CreateHitWindows() => new ManiaHitWindows();
+
+        #region LegacyBeatmapEncoder
+
+        float IHasXPosition.X => Column;
+
+        #endregion
     }
 }

From d8fdd73e170e8117961a3da8d1ef31e85738c9c2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 16:45:01 +0900
Subject: [PATCH 05/31] Implement IHasCurve on DrumRoll

---
 .../Beatmaps/TaikoBeatmapConverter.cs         |  6 ++--
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs   | 29 ++++++++++++++++++-
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  |  8 +++--
 3 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 695ada3a00..caf645d5a2 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
         /// osu! is generally slower than taiko, so a factor is added to increase
         /// speed. This must be used everywhere slider length or beat length is used.
         /// </summary>
-        private const float legacy_velocity_multiplier = 1.4f;
+        public const float LEGACY_VELOCITY_MULTIPLIER = 1.4f;
 
         /// <summary>
         /// Because swells are easier in taiko than spinners are in osu!,
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             // Rewrite the beatmap info to add the slider velocity multiplier
             original.BeatmapInfo = original.BeatmapInfo.Clone();
             original.BeatmapInfo.BaseDifficulty = original.BeatmapInfo.BaseDifficulty.Clone();
-            original.BeatmapInfo.BaseDifficulty.SliderMultiplier *= legacy_velocity_multiplier;
+            original.BeatmapInfo.BaseDifficulty.SliderMultiplier *= LEGACY_VELOCITY_MULTIPLIER;
 
             Beatmap<TaikoHitObject> converted = base.ConvertBeatmap(original);
 
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                     double speedAdjustedBeatLength = timingPoint.BeatLength / speedAdjustment;
 
                     // The true distance, accounting for any repeats. This ends up being the drum roll distance later
-                    double distance = distanceData.Distance * spans * legacy_velocity_multiplier;
+                    double distance = distanceData.Distance * spans * LEGACY_VELOCITY_MULTIPLIER;
 
                     // The velocity of the taiko hit object - calculated as the velocity of a drum roll
                     double taikoVelocity = taiko_base_distance * beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier / speedAdjustedBeatLength;
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index aacd78f176..ad0cd2f2a8 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -3,15 +3,20 @@
 
 using osu.Game.Rulesets.Objects.Types;
 using System;
+using System.Collections.Generic;
+using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko.Beatmaps;
 using osu.Game.Rulesets.Taiko.Judgements;
+using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class DrumRoll : TaikoHitObject, IHasEndTime
+    public class DrumRoll : TaikoHitObject, IHasEndTime, IHasCurve
     {
         /// <summary>
         /// Drum roll distance that results in a duration of 1 speed-adjusted beat length.
@@ -26,6 +31,11 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
         public double Duration { get; set; }
 
+        /// <summary>
+        /// Velocity of this <see cref="DrumRoll"/>.
+        /// </summary>
+        public double Velocity { get; private set; }
+
         /// <summary>
         /// Numer of ticks per beat length.
         /// </summary>
@@ -54,6 +64,10 @@ namespace osu.Game.Rulesets.Taiko.Objects
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
+            DifficultyControlPoint difficultyPoint = controlPointInfo.DifficultyPointAt(StartTime);
+
+            double scoringDistance = base_distance * difficulty.SliderMultiplier * difficultyPoint.SpeedMultiplier;
+            Velocity = scoringDistance / timingPoint.BeatLength;
 
             tickSpacing = timingPoint.BeatLength / TickRate;
             overallDifficulty = difficulty.OverallDifficulty;
@@ -93,5 +107,18 @@ namespace osu.Game.Rulesets.Taiko.Objects
         public override Judgement CreateJudgement() => new TaikoDrumRollJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
+
+        #region LegacyBeatmapEncoder
+
+        double IHasDistance.Distance => Duration * Velocity;
+
+        int IHasRepeats.RepeatCount { get => 0; set { } }
+
+        List<IList<HitSampleInfo>> IHasRepeats.NodeSamples => new List<IList<HitSampleInfo>>();
+
+        SliderPath IHasCurve.Path
+            => new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(1) }, ((IHasDistance)this).Distance / TaikoBeatmapConverter.LEGACY_VELOCITY_MULTIPLIER);
+
+        #endregion
     }
 }
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index af0adb65a5..4b760f1983 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -125,7 +125,12 @@ namespace osu.Game.Beatmaps.Formats
             writer.WriteLine(FormattableString.Invariant($"CircleSize: {beatmap.BeatmapInfo.BaseDifficulty.CircleSize}"));
             writer.WriteLine(FormattableString.Invariant($"OverallDifficulty: {beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty}"));
             writer.WriteLine(FormattableString.Invariant($"ApproachRate: {beatmap.BeatmapInfo.BaseDifficulty.ApproachRate}"));
-            writer.WriteLine(FormattableString.Invariant($"SliderMultiplier: {beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier}"));
+
+            // Taiko adjusts the slider multiplier (see: TaikoBeatmapConverter.LEGACY_VELOCITY_MULTIPLIER)
+            writer.WriteLine(beatmap.BeatmapInfo.RulesetID == 1
+                ? FormattableString.Invariant($"SliderMultiplier: {beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier / 1.4f}")
+                : FormattableString.Invariant($"SliderMultiplier: {beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier}"));
+
             writer.WriteLine(FormattableString.Invariant($"SliderTickRate: {beatmap.BeatmapInfo.BaseDifficulty.SliderTickRate}"));
         }
 
@@ -226,7 +231,6 @@ namespace osu.Game.Beatmaps.Formats
             writer.Write(FormattableString.Invariant($"{position.Y},"));
             writer.Write(FormattableString.Invariant($"{hitObject.StartTime},"));
             writer.Write(FormattableString.Invariant($"{(int)getObjectType(hitObject)},"));
-
             writer.Write(FormattableString.Invariant($"{(int)toLegacyHitSoundType(hitObject.Samples)},"));
 
             if (hitObject is IHasCurve curveData)

From 1f962f5c563d80f40208aa8f5e8fa0d1b54389d9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 17:20:37 +0900
Subject: [PATCH 06/31] Reword comment

---
 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index bc3a136a6a..770dd73e7a 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         public override void PlaySamples()
         {
-            // The hold note does not play samples itself.
+            // Samples are played by the head/tail notes.
         }
 
         protected override void Update()

From 6da0872ae55d9b07d2d1fe55a4db02455b18a9a6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 17:29:23 +0900
Subject: [PATCH 07/31] Use the last node sample for the tail note

---
 osu.Game.Rulesets.Mania/Objects/HoldNote.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index 04f8fd8c99..eea2c31260 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Rulesets.Mania.Objects
             {
                 StartTime = EndTime,
                 Column = Column,
-                Samples = getNodeSamples(1),
+                Samples = getNodeSamples((NodeSamples?.Count - 1) ?? 1),
             });
         }
 

From ba12e23d9eed0b48effa40f7734c1485adfa91cd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 21 Apr 2020 17:31:49 +0900
Subject: [PATCH 08/31] Fix inspection

---
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index ad0cd2f2a8..dc2f277e58 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -16,7 +16,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class DrumRoll : TaikoHitObject, IHasEndTime, IHasCurve
+    public class DrumRoll : TaikoHitObject, IHasCurve
     {
         /// <summary>
         /// Drum roll distance that results in a duration of 1 speed-adjusted beat length.

From 58af75ad576396258285b2722dfb07d1176f7889 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Apr 2020 13:45:12 +0900
Subject: [PATCH 09/31] Add back missing line

---
 osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index cb583ac1a9..1c8116754f 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -237,6 +237,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                     {
                         StartTime = HitObject.StartTime,
                         Duration = endTimeData.Duration,
+                        Column = column,
                         Samples = HitObject.Samples,
                         NodeSamples = (HitObject as IHasRepeats)?.NodeSamples
                     });

From 7cdc9a599c6ffb39c7635e63cbf8fa57bbcb2684 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Apr 2020 16:27:07 +0900
Subject: [PATCH 10/31] Fix mania holds written as spinners

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 4b760f1983..fc853a7a68 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -248,7 +248,7 @@ namespace osu.Game.Beatmaps.Formats
             writer.WriteLine();
         }
 
-        private static LegacyHitObjectType getObjectType(HitObject hitObject)
+        private LegacyHitObjectType getObjectType(HitObject hitObject)
         {
             LegacyHitObjectType type = 0;
 
@@ -267,7 +267,10 @@ namespace osu.Game.Beatmaps.Formats
                     break;
 
                 case IHasEndTime _:
-                    type |= LegacyHitObjectType.Spinner;
+                    if (beatmap.BeatmapInfo.RulesetID == 3)
+                        type |= LegacyHitObjectType.Hold;
+                    else
+                        type |= LegacyHitObjectType.Spinner;
                     break;
 
                 default:

From 3b805daa0b1fedac05e46e26fa6e77ba9cc1b4dc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Apr 2020 16:40:07 +0900
Subject: [PATCH 11/31] Fix hold note end time being written incorrectly

---
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index fc853a7a68..b5a8f1604c 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -240,8 +240,9 @@ namespace osu.Game.Beatmaps.Formats
             }
             else
             {
-                if (hitObject is IHasEndTime endTimeData)
-                    writer.Write(FormattableString.Invariant($"{endTimeData.EndTime},"));
+                if (hitObject is IHasEndTime _)
+                    addEndTimeData(writer, hitObject);
+
                 writer.Write(getSampleBank(hitObject.Samples));
             }
 
@@ -344,6 +345,20 @@ namespace osu.Game.Beatmaps.Formats
             }
         }
 
+        private void addEndTimeData(TextWriter writer, HitObject hitObject)
+        {
+            var endTimeData = (IHasEndTime)hitObject;
+            var type = getObjectType(hitObject);
+
+            char suffix = ',';
+
+            // Holds write the end time as if it's part of sample data.
+            if (type == LegacyHitObjectType.Hold)
+                suffix = ':';
+
+            writer.Write(FormattableString.Invariant($"{endTimeData.EndTime}{suffix}"));
+        }
+
         private string getSampleBank(IList<HitSampleInfo> samples, bool banksOnly = false, bool zeroBanks = false)
         {
             LegacySampleBank normalBank = toLegacySampleBank(samples.SingleOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL)?.Bank);

From 0a34fddcc3cfda42bc40e393374b7c0decd824d8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Apr 2020 19:38:27 +0900
Subject: [PATCH 12/31] Fix TestBeatmap not setting appropriate ruleset ID

---
 osu.Game/Tests/Beatmaps/TestBeatmap.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Tests/Beatmaps/TestBeatmap.cs b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
index 96e3c037a3..a7c84bf692 100644
--- a/osu.Game/Tests/Beatmaps/TestBeatmap.cs
+++ b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Tests.Beatmaps
             HitObjects = baseBeatmap.HitObjects;
 
             BeatmapInfo.Ruleset = ruleset;
+            BeatmapInfo.RulesetID = ruleset.ID ?? 0;
             BeatmapInfo.BeatmapSet.Metadata = BeatmapInfo.Metadata;
             BeatmapInfo.BeatmapSet.Beatmaps = new List<BeatmapInfo> { BeatmapInfo };
             BeatmapInfo.BeatmapSet.OnlineInfo = new BeatmapSetOnlineInfo

From 08982e0e00da8fe144793a8b7fa49713fdf98145 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 22 Apr 2020 19:49:21 +0900
Subject: [PATCH 13/31] Ensure editor tests wait for load to complete

---
 .../Editor/TestSceneEditorChangeStates.cs     | 21 +++++++------------
 osu.Game/Tests/Visual/EditorTestScene.cs      | 10 ++++++++-
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs b/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
index dd1b6cf6aa..c68015d1a2 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
@@ -4,35 +4,28 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
-using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
-using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Editor
 {
-    public class TestSceneEditorChangeStates : ScreenTestScene
+    public class TestSceneEditorChangeStates : EditorTestScene
     {
+        public TestSceneEditorChangeStates()
+            : base(new OsuRuleset())
+        {
+        }
+
         private EditorBeatmap editorBeatmap;
 
         public override void SetUpSteps()
         {
             base.SetUpSteps();
 
-            Screens.Edit.Editor editor = null;
-
-            AddStep("load editor", () =>
-            {
-                Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
-                LoadScreen(editor = new Screens.Edit.Editor());
-            });
-
-            AddUntilStep("wait for editor to load", () => editor.ChildrenOfType<HitObjectComposer>().FirstOrDefault()?.IsLoaded == true
-                                                          && editor.ChildrenOfType<TimelineArea>().FirstOrDefault()?.IsLoaded == true);
-            AddStep("get beatmap", () => editorBeatmap = editor.ChildrenOfType<EditorBeatmap>().Single());
+            AddStep("get beatmap", () => editorBeatmap = Editor.ChildrenOfType<EditorBeatmap>().Single());
         }
 
         [Test]
diff --git a/osu.Game/Tests/Visual/EditorTestScene.cs b/osu.Game/Tests/Visual/EditorTestScene.cs
index 80bc3bdb87..88e50d4858 100644
--- a/osu.Game/Tests/Visual/EditorTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorTestScene.cs
@@ -3,9 +3,13 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Testing;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit;
+using osu.Game.Screens.Edit.Compose.Components.Timeline;
 
 namespace osu.Game.Tests.Visual
 {
@@ -13,6 +17,8 @@ namespace osu.Game.Tests.Visual
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(Editor), typeof(EditorScreen) };
 
+        protected Editor Editor { get; private set; }
+
         private readonly Ruleset ruleset;
 
         protected EditorTestScene(Ruleset ruleset)
@@ -30,7 +36,9 @@ namespace osu.Game.Tests.Visual
         {
             base.SetUpSteps();
 
-            AddStep("Load editor", () => LoadScreen(new Editor()));
+            AddStep("load editor", () => LoadScreen(Editor = new Editor()));
+            AddUntilStep("wait for editor to load", () => Editor.ChildrenOfType<HitObjectComposer>().FirstOrDefault()?.IsLoaded == true
+                                                          && Editor.ChildrenOfType<TimelineArea>().FirstOrDefault()?.IsLoaded == true);
         }
     }
 }

From 40f11ed15c944dd0007a5d637a1215c2ac33c902 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 23 Apr 2020 10:37:05 +0900
Subject: [PATCH 14/31] Resolve broken test scene

---
 .../Visual/Editor/TestSceneEditorChangeStates.cs           | 7 ++++---
 osu.Game/Tests/Visual/EditorTestScene.cs                   | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs b/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
index 7b4747592a..efdcc6f78b 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
@@ -19,7 +19,6 @@ namespace osu.Game.Tests.Visual.Editor
         }
 
         private EditorBeatmap editorBeatmap;
-        private TestEditor editor;
 
         public override void SetUpSteps()
         {
@@ -153,9 +152,11 @@ namespace osu.Game.Tests.Visual.Editor
             AddAssert("no hitobject added", () => addedObject == null);
         }
 
-        private void addUndoSteps() => AddStep("undo", () => editor.Undo());
+        private void addUndoSteps() => AddStep("undo", () => ((TestEditor)Editor).Undo());
 
-        private void addRedoSteps() => AddStep("redo", () => editor.Redo());
+        private void addRedoSteps() => AddStep("redo", () => ((TestEditor)Editor).Redo());
+
+        protected override Screens.Edit.Editor CreateEditor() => new TestEditor();
 
         private class TestEditor : Screens.Edit.Editor
         {
diff --git a/osu.Game/Tests/Visual/EditorTestScene.cs b/osu.Game/Tests/Visual/EditorTestScene.cs
index 88e50d4858..caf2bc0ff1 100644
--- a/osu.Game/Tests/Visual/EditorTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorTestScene.cs
@@ -36,9 +36,11 @@ namespace osu.Game.Tests.Visual
         {
             base.SetUpSteps();
 
-            AddStep("load editor", () => LoadScreen(Editor = new Editor()));
+            AddStep("load editor", () => LoadScreen(Editor = CreateEditor()));
             AddUntilStep("wait for editor to load", () => Editor.ChildrenOfType<HitObjectComposer>().FirstOrDefault()?.IsLoaded == true
                                                           && Editor.ChildrenOfType<TimelineArea>().FirstOrDefault()?.IsLoaded == true);
         }
+
+        protected virtual Editor CreateEditor() => new Editor();
     }
 }

From 86ef73aa27934b377c5a931c0e66b2f96cc0fc9a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 23 Apr 2020 11:16:59 +0900
Subject: [PATCH 15/31] Implement HitObjectContainer.Clear()

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs               | 9 +++++++++
 .../Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index dea981c3ad..f4f66f1272 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -43,6 +43,15 @@ namespace osu.Game.Rulesets.UI
             return true;
         }
 
+        public virtual void Clear(bool disposeChildren = true)
+        {
+            ClearInternal(disposeChildren);
+
+            foreach (var kvp in startTimeMap)
+                kvp.Value.bindable.UnbindAll();
+            startTimeMap.Clear();
+        }
+
         public int IndexOf(DrawableHitObject hitObject) => IndexOfInternal(hitObject);
 
         private void onStartTimeChanged(DrawableHitObject hitObject)
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 108f98d5fc..57f58be55a 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -58,6 +58,14 @@ namespace osu.Game.Rulesets.UI.Scrolling
             return result;
         }
 
+        public override void Clear(bool disposeChildren = true)
+        {
+            base.Clear(disposeChildren);
+
+            initialStateCache.Invalidate();
+            hitObjectInitialStateCache.Clear();
+        }
+
         private float scrollLength;
 
         protected override void Update()

From 6df45164face4fb8b31e3cb7a9cfaf9d97003ec7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 23 Apr 2020 11:17:16 +0900
Subject: [PATCH 16/31] Expose direction from scrolling test container

---
 osu.Game/Tests/Visual/ScrollingTestContainer.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Tests/Visual/ScrollingTestContainer.cs b/osu.Game/Tests/Visual/ScrollingTestContainer.cs
index 3b741fcf1d..994f23577d 100644
--- a/osu.Game/Tests/Visual/ScrollingTestContainer.cs
+++ b/osu.Game/Tests/Visual/ScrollingTestContainer.cs
@@ -30,6 +30,11 @@ namespace osu.Game.Tests.Visual
             set => scrollingInfo.TimeRange.Value = value;
         }
 
+        public ScrollingDirection Direction
+        {
+            set => scrollingInfo.Direction.Value = value;
+        }
+
         public IScrollingInfo ScrollingInfo => scrollingInfo;
 
         [Cached(Type = typeof(IScrollingInfo))]

From 8d5732aabd87662ec038358e63b630e23153605b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 23 Apr 2020 12:17:11 +0900
Subject: [PATCH 17/31] Make placements happen on mouse down

---
 .../TestSceneSliderPlacementBlueprint.cs      | 17 ++++++++++++++++
 .../HitCircles/HitCirclePlacementBlueprint.cs | 20 +++++++++++++------
 .../Components/PathControlPointPiece.cs       |  4 +++-
 .../Sliders/SliderPlacementBlueprint.cs       | 10 +++++-----
 4 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderPlacementBlueprint.cs
index 9fc479953e..fe9973f4d8 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderPlacementBlueprint.cs
@@ -259,6 +259,23 @@ namespace osu.Game.Rulesets.Osu.Tests
             assertControlPointType(2, PathType.PerfectCurve);
         }
 
+        [Test]
+        public void TestBeginPlacementWithoutReleasingMouse()
+        {
+            addMovementStep(new Vector2(200));
+            AddStep("press left button", () => InputManager.PressButton(MouseButton.Left));
+
+            addMovementStep(new Vector2(400, 200));
+            AddStep("release left button", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertLength(200);
+            assertControlPointCount(2);
+            assertControlPointType(0, PathType.Linear);
+        }
+
         private void addMovementStep(Vector2 position) => AddStep($"move mouse to {position}", () => InputManager.MoveMouseTo(InputManager.ToScreenSpace(position)));
 
         private void addClickStep(MouseButton button)
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
index 407f5f540e..2f400160b8 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
@@ -6,6 +6,7 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
 using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
 {
@@ -28,16 +29,23 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
             circlePiece.UpdateFrom(HitObject);
         }
 
-        protected override bool OnClick(ClickEvent e)
+        protected override bool OnMouseDown(MouseDownEvent e)
         {
-            EndPlacement(true);
-            return true;
+            if (e.Button == MouseButton.Left)
+            {
+                BeginPlacement();
+                return true;
+            }
+
+            return base.OnMouseDown(e);
         }
 
-        public override void UpdatePosition(Vector2 screenSpacePosition)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
-            BeginPlacement();
-            HitObject.Position = ToLocalSpace(screenSpacePosition);
+            if (e.Button == MouseButton.Left)
+                EndPlacement(true);
         }
+
+        public override void UpdatePosition(Vector2 screenSpacePosition) => HitObject.Position = ToLocalSpace(screenSpacePosition);
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index fed149b5c5..d0c1eb5317 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -28,7 +28,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         public Action<PathControlPointPiece, MouseButtonEvent> RequestSelection;
 
         public readonly BindableBool IsSelected = new BindableBool();
-
         public readonly PathControlPoint ControlPoint;
 
         private readonly Slider slider;
@@ -146,6 +145,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
         protected override bool OnDragStart(DragStartEvent e)
         {
+            if (RequestSelection == null)
+                return false;
+
             if (e.Button == MouseButton.Left)
             {
                 changeHandler?.BeginChange();
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 9af972dbce..ac30f5a762 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -82,8 +82,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             }
         }
 
-        protected override bool OnClick(ClickEvent e)
+        protected override bool OnMouseDown(MouseDownEvent e)
         {
+            if (e.Button != MouseButton.Left)
+                return base.OnMouseDown(e);
+
             switch (state)
             {
                 case PlacementState.Initial:
@@ -91,9 +94,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                     break;
 
                 case PlacementState.Body:
-                    if (e.Button != MouseButton.Left)
-                        break;
-
                     if (canPlaceNewControlPoint(out var lastPoint))
                     {
                         // Place a new point by detatching the current cursor.
@@ -111,7 +111,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                         currentSegmentLength = 1;
                     }
 
-                    return true;
+                    break;
             }
 
             return true;

From c59096a9419c3087d35137350bc480a90972d3c6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 23 Apr 2020 12:05:34 +0900
Subject: [PATCH 18/31] Fix note placement

---
 .../ManiaPlacementBlueprintTestScene.cs       |  2 -
 .../TestSceneNotePlacementBlueprint.cs        | 42 +++++++++++++++++++
 .../Blueprints/ManiaPlacementBlueprint.cs     |  2 +-
 .../Edit/Blueprints/NotePlacementBlueprint.cs |  9 ++++
 4 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
index afde1c9521..aac77c9c1c 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaPlacementBlueprintTestScene.cs
@@ -41,8 +41,6 @@ namespace osu.Game.Rulesets.Mania.Tests
                 AccentColour = Color4.OrangeRed,
                 Clock = new FramedClock(new StopwatchClock()), // No scroll
             });
-
-            AddStep("change direction", () => ((ScrollingTestContainer)HitObjectContainer).Flip());
         }
 
         protected override Container CreateHitObjectContainer() => new ScrollingTestContainer(ScrollingDirection.Down) { RelativeSizeAxes = Axes.Both };
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneNotePlacementBlueprint.cs
index d7b539a2a0..2d97e61aa5 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneNotePlacementBlueprint.cs
@@ -1,17 +1,59 @@
 // 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.Extensions.IEnumerableExtensions;
+using osu.Framework.Testing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Tests.Visual;
+using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
     public class TestSceneNotePlacementBlueprint : ManiaPlacementBlueprintTestScene
     {
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            this.ChildrenOfType<HitObjectContainer>().ForEach(c => c.Clear());
+
+            ResetPlacement();
+
+            ((ScrollingTestContainer)HitObjectContainer).Direction = ScrollingDirection.Down;
+        });
+
+        [Test]
+        public void TestPlaceBeforeCurrentTimeDownwards()
+        {
+            AddStep("move mouse before current time", () => InputManager.MoveMouseTo(this.ChildrenOfType<Column>().Single().ScreenSpaceDrawQuad.BottomLeft - new Vector2(0, 10)));
+
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("note start time < 0", () => getNote().StartTime < 0);
+        }
+
+        [Test]
+        public void TestPlaceAfterCurrentTimeDownwards()
+        {
+            AddStep("move mouse after current time", () => InputManager.MoveMouseTo(this.ChildrenOfType<Column>().Single()));
+
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("note start time > 0", () => getNote().StartTime > 0);
+        }
+
+        private Note getNote() => this.ChildrenOfType<DrawableNote>().FirstOrDefault()?.HitObject;
+
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableNote((Note)hitObject);
         protected override PlacementBlueprint CreateBlueprint() => new NotePlacementBlueprint();
     }
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index 6ddf212266..f228daa5e3 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
                 return base.OnMouseDown(e);
 
             HitObject.Column = Column.Index;
-            BeginPlacement(TimeAt(e.ScreenSpaceMousePosition));
+            BeginPlacement(TimeAt(e.ScreenSpaceMousePosition), true);
             return true;
         }
 
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
index 32c6a6fd07..fd8ef52cef 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
+using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
@@ -26,5 +27,13 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             Width = SnappedWidth;
             Position = SnappedMousePosition;
         }
+
+        public override void UpdatePosition(Vector2 screenSpacePosition)
+        {
+            base.UpdatePosition(screenSpacePosition);
+
+            // Continue updating the position until placement is finished on mouse up.
+            BeginPlacement(TimeAt(screenSpacePosition), true);
+        }
     }
 }

From 22d2607ff58eb51bfa38d04e08a097011caabf8e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 23 Apr 2020 12:53:09 +0900
Subject: [PATCH 19/31] Only commit if placement is active

---
 .../Edit/Blueprints/NotePlacementBlueprint.cs                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
index fd8ef52cef..888ce695c2 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             base.UpdatePosition(screenSpacePosition);
 
             // Continue updating the position until placement is finished on mouse up.
-            BeginPlacement(TimeAt(screenSpacePosition), true);
+            BeginPlacement(TimeAt(screenSpacePosition), PlacementActive);
         }
     }
 }

From 4f0b5a34d3a1325b77d9901cfd43d6af55a0e29c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 23 Apr 2020 12:53:23 +0900
Subject: [PATCH 20/31] Fix hold note placement body sized incorrectly

---
 .../Objects/Drawables/DrawableHoldNote.cs                    | 5 ++++-
 .../Objects/Drawables/Pieces/DefaultBodyPiece.cs             | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index a9ef661aaa..d63c0326a7 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -51,7 +51,10 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
             AddRangeInternal(new[]
             {
-                bodyPiece = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HoldNoteBody, hitObject.Column), _ => new DefaultBodyPiece())
+                bodyPiece = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HoldNoteBody, hitObject.Column), _ => new DefaultBodyPiece
+                {
+                    RelativeSizeAxes = Axes.Both
+                })
                 {
                     RelativeSizeAxes = Axes.X
                 },
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs
index 0ee0a14df3..bc4a095395 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/DefaultBodyPiece.cs
@@ -34,7 +34,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
 
         public DefaultBodyPiece()
         {
-            RelativeSizeAxes = Axes.Both;
             Blending = BlendingParameters.Additive;
 
             AddLayout(subtractionCache);

From ab93c819b54f930211c507f28ea23b3ae9ca6cfa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Apr 2020 15:26:03 +0900
Subject: [PATCH 21/31] Add metric right background element

---
 .../metrics-skin/taiko-bar-right@2x.png          | Bin 0 -> 7830 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-bar-right@2x.png

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-bar-right@2x.png b/osu.Game.Rulesets.Taiko.Tests/Resources/metrics-skin/taiko-bar-right@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ca8a40d88a13e447d26cd8c0e777173d8e60445
GIT binary patch
literal 7830
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
Of{?|_1M@zM+V&ruzN7m9

literal 0
HcmV?d00001


From e3a3144236fe6e2790dafb5198248392b9227145 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Thu, 23 Apr 2020 11:07:55 +0300
Subject: [PATCH 22/31] Rename editor tests namespace from "Editor" to
 "Editing"

---
 osu.Game.Tests/{Editor => Editing}/EditorChangeHandlerTest.cs | 2 +-
 .../{Editor => Editing}/LegacyEditorBeatmapPatcherTest.cs     | 2 +-
 .../TestSceneHitObjectComposerDistanceSnapping.cs             | 2 +-
 .../Visual/{Editor => Editing}/TestSceneBeatDivisorControl.cs | 2 +-
 .../Visual/{Editor => Editing}/TestSceneComposeScreen.cs      | 2 +-
 .../Visual/{Editor => Editing}/TestSceneDistanceSnapGrid.cs   | 2 +-
 .../Visual/{Editor => Editing}/TestSceneEditorChangeStates.cs | 4 ++--
 .../{Editor => Editing}/TestSceneEditorComposeRadioButtons.cs | 2 +-
 .../Visual/{Editor => Editing}/TestSceneEditorMenuBar.cs      | 2 +-
 .../Visual/{Editor => Editing}/TestSceneEditorSeekSnapping.cs | 2 +-
 .../{Editor => Editing}/TestSceneEditorSummaryTimeline.cs     | 2 +-
 .../Visual/{Editor => Editing}/TestSceneHitObjectComposer.cs  | 2 +-
 .../Visual/{Editor => Editing}/TestScenePlaybackControl.cs    | 2 +-
 .../TestSceneTimelineBlueprintContainer.cs                    | 2 +-
 .../{Editor => Editing}/TestSceneTimelineTickDisplay.cs       | 2 +-
 .../Visual/{Editor => Editing}/TestSceneTimingScreen.cs       | 2 +-
 .../Visual/{Editor => Editing}/TestSceneWaveform.cs           | 2 +-
 .../{Editor => Editing}/TestSceneZoomableScrollContainer.cs   | 2 +-
 .../Visual/{Editor => Editing}/TimelineTestScene.cs           | 2 +-
 19 files changed, 20 insertions(+), 20 deletions(-)
 rename osu.Game.Tests/{Editor => Editing}/EditorChangeHandlerTest.cs (98%)
 rename osu.Game.Tests/{Editor => Editing}/LegacyEditorBeatmapPatcherTest.cs (99%)
 rename osu.Game.Tests/{Editor => Editing}/TestSceneHitObjectComposerDistanceSnapping.cs (99%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneBeatDivisorControl.cs (98%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneComposeScreen.cs (96%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneDistanceSnapGrid.cs (99%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneEditorChangeStates.cs (98%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneEditorComposeRadioButtons.cs (97%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneEditorMenuBar.cs (99%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneEditorSeekSnapping.cs (99%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneEditorSummaryTimeline.cs (95%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneHitObjectComposer.cs (98%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestScenePlaybackControl.cs (96%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneTimelineBlueprintContainer.cs (95%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneTimelineTickDisplay.cs (95%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneTimingScreen.cs (96%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneWaveform.cs (98%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TestSceneZoomableScrollContainer.cs (99%)
 rename osu.Game.Tests/Visual/{Editor => Editing}/TimelineTestScene.cs (99%)

diff --git a/osu.Game.Tests/Editor/EditorChangeHandlerTest.cs b/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
similarity index 98%
rename from osu.Game.Tests/Editor/EditorChangeHandlerTest.cs
rename to osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
index 9613f250c4..feda1ae0e9 100644
--- a/osu.Game.Tests/Editor/EditorChangeHandlerTest.cs
+++ b/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
@@ -5,7 +5,7 @@ using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Screens.Edit;
 
-namespace osu.Game.Tests.Editor
+namespace osu.Game.Tests.Editing
 {
     [TestFixture]
     public class EditorChangeHandlerTest
diff --git a/osu.Game.Tests/Editor/LegacyEditorBeatmapPatcherTest.cs b/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
similarity index 99%
rename from osu.Game.Tests/Editor/LegacyEditorBeatmapPatcherTest.cs
rename to osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
index c24418d688..a3ab677d96 100644
--- a/osu.Game.Tests/Editor/LegacyEditorBeatmapPatcherTest.cs
+++ b/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
@@ -17,7 +17,7 @@ using osu.Game.Screens.Edit;
 using osuTK;
 using Decoder = osu.Game.Beatmaps.Formats.Decoder;
 
-namespace osu.Game.Tests.Editor
+namespace osu.Game.Tests.Editing
 {
     [TestFixture]
     public class LegacyEditorBeatmapPatcherTest
diff --git a/osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
similarity index 99%
rename from osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs
rename to osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
index 3cb5909ba9..168ec0f09d 100644
--- a/osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
@@ -14,7 +14,7 @@ using osu.Game.Rulesets.Osu.Edit;
 using osu.Game.Screens.Edit;
 using osu.Game.Tests.Visual;
 
-namespace osu.Game.Tests.Editor
+namespace osu.Game.Tests.Editing
 {
     [HeadlessTest]
     public class TestSceneHitObjectComposerDistanceSnapping : EditorClockTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
similarity index 98%
rename from osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
index fd7a5980f3..f6e69fd8bf 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
@@ -14,7 +14,7 @@ using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 using osuTK.Input;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     public class TestSceneBeatDivisorControl : OsuManualInputManagerTestScene
     {
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneComposeScreen.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeScreen.cs
similarity index 96%
rename from osu.Game.Tests/Visual/Editor/TestSceneComposeScreen.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneComposeScreen.cs
index a8830824c0..6f5655006e 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneComposeScreen.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeScreen.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneComposeScreen : EditorClockTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneDistanceSnapGrid.cs b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Editor/TestSceneDistanceSnapGrid.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
index f49256a633..417d16fdb0 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneDistanceSnapGrid.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
@@ -13,7 +13,7 @@ using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     public class TestSceneDistanceSnapGrid : EditorClockTestScene
     {
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs
similarity index 98%
rename from osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs
index efc2a6f552..d85bf15d52 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs
@@ -11,7 +11,7 @@ using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     public class TestSceneEditorChangeStates : ScreenTestScene
     {
@@ -162,7 +162,7 @@ namespace osu.Game.Tests.Visual.Editor
 
         private void addRedoSteps() => AddStep("redo", () => editor.Redo());
 
-        private class TestEditor : Screens.Edit.Editor
+        private class TestEditor : Editor
         {
             public new void Undo() => base.Undo();
 
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeRadioButtons.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorComposeRadioButtons.cs
similarity index 97%
rename from osu.Game.Tests/Visual/Editor/TestSceneEditorComposeRadioButtons.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneEditorComposeRadioButtons.cs
index 1709067d5d..2deeaef1f6 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeRadioButtons.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorComposeRadioButtons.cs
@@ -7,7 +7,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Edit.Components.RadioButtons;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneEditorComposeRadioButtons : OsuTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorMenuBar.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorMenuBar.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Editor/TestSceneEditorMenuBar.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneEditorMenuBar.cs
index 53c2d62067..2cbdacb61c 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorMenuBar.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorMenuBar.cs
@@ -10,7 +10,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Edit.Components.Menus;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneEditorMenuBar : OsuTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorSeekSnapping.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSeekSnapping.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Editor/TestSceneEditorSeekSnapping.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneEditorSeekSnapping.cs
index 3118e0cabe..41d1459103 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorSeekSnapping.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSeekSnapping.cs
@@ -13,7 +13,7 @@ using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneEditorSeekSnapping : EditorClockTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorSummaryTimeline.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
similarity index 95%
rename from osu.Game.Tests/Visual/Editor/TestSceneEditorSummaryTimeline.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
index 2e04eb50ca..c92423545d 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorSummaryTimeline.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Edit.Components.Timelines.Summary;
 using osuTK;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneEditorSummaryTimeline : EditorClockTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneHitObjectComposer.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
similarity index 98%
rename from osu.Game.Tests/Visual/Editor/TestSceneHitObjectComposer.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
index e41c2427fb..ddaca26220 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneHitObjectComposer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
@@ -20,7 +20,7 @@ using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneHitObjectComposer : EditorClockTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestScenePlaybackControl.cs b/osu.Game.Tests/Visual/Editing/TestScenePlaybackControl.cs
similarity index 96%
rename from osu.Game.Tests/Visual/Editor/TestScenePlaybackControl.cs
rename to osu.Game.Tests/Visual/Editing/TestScenePlaybackControl.cs
index 0d4fe4366d..3af976cae0 100644
--- a/osu.Game.Tests/Visual/Editor/TestScenePlaybackControl.cs
+++ b/osu.Game.Tests/Visual/Editing/TestScenePlaybackControl.cs
@@ -9,7 +9,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Screens.Edit.Components;
 using osuTK;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestScenePlaybackControl : OsuTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs
similarity index 95%
rename from osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs
index 4d8f877575..5ab2f49b4a 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs
@@ -7,7 +7,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneTimelineBlueprintContainer : TimelineTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneTimelineTickDisplay.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineTickDisplay.cs
similarity index 95%
rename from osu.Game.Tests/Visual/Editor/TestSceneTimelineTickDisplay.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneTimelineTickDisplay.cs
index 43a3cd6122..e33040acdc 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneTimelineTickDisplay.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineTickDisplay.cs
@@ -8,7 +8,7 @@ using osu.Game.Screens.Edit.Compose.Components;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneTimelineTickDisplay : TimelineTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneTimingScreen.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
similarity index 96%
rename from osu.Game.Tests/Visual/Editor/TestSceneTimingScreen.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
index ae09a7fa47..a6dbe9571e 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneTimingScreen.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Timing;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneTimingScreen : EditorClockTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneWaveform.cs b/osu.Game.Tests/Visual/Editing/TestSceneWaveform.cs
similarity index 98%
rename from osu.Game.Tests/Visual/Editor/TestSceneWaveform.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneWaveform.cs
index e2762f3d5f..0c1296b82c 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneWaveform.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneWaveform.cs
@@ -14,7 +14,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Osu;
 using osuTK.Graphics;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneWaveform : OsuTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneZoomableScrollContainer.cs b/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Editor/TestSceneZoomableScrollContainer.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
index 19d19c2759..082268d824 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneZoomableScrollContainer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
@@ -15,7 +15,7 @@ using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     public class TestSceneZoomableScrollContainer : OsuManualInputManagerTestScene
     {
diff --git a/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Editor/TimelineTestScene.cs
rename to osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
index 7081eb3af5..56b2860e96 100644
--- a/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
@@ -18,7 +18,7 @@ using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     public abstract class TimelineTestScene : EditorClockTestScene
     {

From 1c13fa6c6199ed5a51d985f140b209fb804ddd4a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Apr 2020 10:27:32 +0900
Subject: [PATCH 23/31] Fix editor crashing when entering with no beatmap
 selected

---
 .../Edit/Compose/Components/Timeline/Timeline.cs      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 1cb4f737c1..8e6b3d5424 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -60,9 +60,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 waveform.Waveform = b.NewValue.Waveform;
                 track = b.NewValue.Track;
 
-                MaxZoom = getZoomLevelForVisibleMilliseconds(500);
-                MinZoom = getZoomLevelForVisibleMilliseconds(10000);
-                Zoom = getZoomLevelForVisibleMilliseconds(2000);
+                if (track.Length > 0)
+                {
+                    MaxZoom = getZoomLevelForVisibleMilliseconds(500);
+                    MinZoom = getZoomLevelForVisibleMilliseconds(10000);
+                    Zoom = getZoomLevelForVisibleMilliseconds(2000);
+                }
             }, true);
         }
 
@@ -135,7 +138,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private void scrollToTrackTime()
         {
-            if (!track.IsLoaded)
+            if (!track.IsLoaded || track.Length == 0)
                 return;
 
             ScrollTo((float)(adjustableClock.CurrentTime / track.Length) * Content.DrawWidth, false);

From ca692f30e66fabf102579803561c96ef2d176d9b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Apr 2020 12:27:56 +0900
Subject: [PATCH 24/31] Do full placement on mouse down

---
 .../Blueprints/HitCircles/HitCirclePlacementBlueprint.cs  | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
index 2f400160b8..dad199715e 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
@@ -33,19 +33,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
         {
             if (e.Button == MouseButton.Left)
             {
-                BeginPlacement();
+                EndPlacement(true);
                 return true;
             }
 
             return base.OnMouseDown(e);
         }
 
-        protected override void OnMouseUp(MouseUpEvent e)
-        {
-            if (e.Button == MouseButton.Left)
-                EndPlacement(true);
-        }
-
         public override void UpdatePosition(Vector2 screenSpacePosition) => HitObject.Position = ToLocalSpace(screenSpacePosition);
     }
 }

From 2b0deec491f5260a3c68763cfaccf45384ec32a0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 24 Apr 2020 13:20:41 +0900
Subject: [PATCH 25/31] Finish note placement on mouse down

---
 .../Edit/Blueprints/HoldNotePlacementBlueprint.cs    |  7 +++++++
 .../Edit/Blueprints/ManiaPlacementBlueprint.cs       |  6 ------
 .../Edit/Blueprints/NotePlacementBlueprint.cs        | 12 +++++++-----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index 7bbde400ea..b3dd392202 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Graphics;
+using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
 using osuTK;
@@ -46,6 +47,12 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             bodyPiece.Height = (bottomPosition - topPosition).Y;
         }
 
+        protected override void OnMouseUp(MouseUpEvent e)
+        {
+            base.OnMouseUp(e);
+            EndPlacement(true);
+        }
+
         private double originalStartTime;
 
         public override void UpdatePosition(Vector2 screenSpacePosition)
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index f228daa5e3..400abb6380 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -54,12 +54,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             return true;
         }
 
-        protected override void OnMouseUp(MouseUpEvent e)
-        {
-            EndPlacement(true);
-            base.OnMouseUp(e);
-        }
-
         public override void UpdatePosition(Vector2 screenSpacePosition)
         {
             if (!PlacementActive)
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
index 888ce695c2..2b7b383dbe 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
@@ -2,9 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
+using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
@@ -28,12 +28,14 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             Position = SnappedMousePosition;
         }
 
-        public override void UpdatePosition(Vector2 screenSpacePosition)
+        protected override bool OnMouseDown(MouseDownEvent e)
         {
-            base.UpdatePosition(screenSpacePosition);
+            base.OnMouseDown(e);
 
-            // Continue updating the position until placement is finished on mouse up.
-            BeginPlacement(TimeAt(screenSpacePosition), PlacementActive);
+            // Place the note immediately.
+            EndPlacement(true);
+
+            return true;
         }
     }
 }

From 05b3db0147aadad9a8114d9f74f4cfdfd045aa14 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Apr 2020 16:56:18 +0900
Subject: [PATCH 26/31] Remove masking

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 8402ebb4c4..6f7d4a1854 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -55,7 +55,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Name = "Right area",
                     RelativeSizeAxes = Axes.Both,
                     RelativePositionAxes = Axes.Both,
-                    Masking = true,
                     Children = new Drawable[]
                     {
                         new Container

From cbcd915ec8489caf449c02f42f3e3abf801a69fc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Apr 2020 18:18:10 +0900
Subject: [PATCH 27/31] Fix crash on switching comments page at an inopportune
 time

---
 osu.Game/Overlays/Comments/CommentsContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 591a9dc86e..e7bfeaf968 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -153,7 +153,7 @@ namespace osu.Game.Overlays.Comments
             request?.Cancel();
             loadCancellation?.Cancel();
             request = new GetCommentsRequest(id.Value, type.Value, Sort.Value, currentPage++, 0);
-            request.Success += onSuccess;
+            request.Success += res => Schedule(() => onSuccess(res));
             api.PerformAsync(request);
         }
 

From 37cc1ed5a244cae4d2cddbf2c8dc54e9c2ea5c34 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 25 Apr 2020 09:45:11 +0300
Subject: [PATCH 28/31] Fix potential null reference while hiding toolbar

---
 osu.Game/Overlays/Toolbar/Toolbar.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 227347112c..bac73c4379 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Overlays.Toolbar
 
         protected override void PopOut()
         {
-            userButton?.StateContainer.Hide();
+            userButton.StateContainer?.Hide();
 
             this.MoveToY(-DrawSize.Y, transition_time, Easing.OutQuint);
             this.FadeOut(transition_time);

From 1953c8fc107d87a9941597ec94235a180f05b339 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 25 Apr 2020 09:53:09 +0300
Subject: [PATCH 29/31] Fix ruleset selector not receiving key input on toolbar
 absence

---
 osu.Game/Overlays/Toolbar/Toolbar.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index bac73c4379..301747acbc 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -33,6 +33,10 @@ namespace osu.Game.Overlays.Toolbar
 
         private readonly Bindable<OverlayActivation> overlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All);
 
+        // Required for toolbar components that need to listen for key input
+        // to invoke specific actions while toolbar is in hidden state.
+        public override bool PropagateNonPositionalInputSubTree => true;
+
         public Toolbar()
         {
             RelativeSizeAxes = Axes.X;

From f0ebbb1807aaf293751bce16c6c08c7bae15ea6d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 25 Apr 2020 09:54:37 +0300
Subject: [PATCH 30/31] Rewrite toolbar test scene and add test cases

---
 .../Visual/Menus/TestSceneToolbar.cs          | 62 ++++++++++++++++---
 1 file changed, 52 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
index f24589ed35..8fbbc8ebd8 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
@@ -5,13 +5,17 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
 using osu.Game.Overlays.Toolbar;
+using osu.Game.Rulesets;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Menus
 {
     [TestFixture]
-    public class TestSceneToolbar : OsuTestScene
+    public class TestSceneToolbar : OsuManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -21,24 +25,62 @@ namespace osu.Game.Tests.Visual.Menus
             typeof(ToolbarNotificationButton),
         };
 
-        public TestSceneToolbar()
+        private Toolbar toolbar;
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            Child = toolbar = new Toolbar { State = { Value = Visibility.Visible } };
+        });
+
+        [Test]
+        public void TestNotificationCounter()
         {
-            var toolbar = new Toolbar { State = { Value = Visibility.Visible } };
             ToolbarNotificationButton notificationButton = null;
 
-            AddStep("create toolbar", () =>
-            {
-                Add(toolbar);
-                notificationButton = toolbar.Children.OfType<FillFlowContainer>().Last().Children.OfType<ToolbarNotificationButton>().First();
-            });
-
-            void setNotifications(int count) => AddStep($"set notification count to {count}", () => notificationButton.NotificationCount.Value = count);
+            AddStep("retrieve notification button", () => notificationButton = toolbar.ChildrenOfType<ToolbarNotificationButton>().Single());
 
             setNotifications(1);
             setNotifications(2);
             setNotifications(3);
             setNotifications(0);
             setNotifications(144);
+
+            void setNotifications(int count)
+                => AddStep($"set notification count to {count}",
+                    () => notificationButton.NotificationCount.Value = count);
+        }
+
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestRulesetSwitchingShortcut(bool toolbarHidden)
+        {
+            ToolbarRulesetSelector rulesetSelector = null;
+
+            if (toolbarHidden)
+                AddStep("hide toolbar", () => toolbar.Hide());
+
+            AddStep("retrieve ruleset selector", () => rulesetSelector = toolbar.ChildrenOfType<ToolbarRulesetSelector>().Single());
+
+            for (int i = 0; i < 4; i++)
+            {
+                var expected = rulesets.AvailableRulesets.ElementAt(i);
+                var numberKey = Key.Number1 + i;
+
+                AddStep($"switch to ruleset {i} via shortcut", () =>
+                {
+                    InputManager.PressKey(Key.ControlLeft);
+                    InputManager.PressKey(numberKey);
+
+                    InputManager.ReleaseKey(Key.ControlLeft);
+                    InputManager.ReleaseKey(numberKey);
+                });
+
+                AddUntilStep("ruleset switched", () => rulesetSelector.Current.Value.Equals(expected));
+            }
         }
     }
 }

From b50e8471d20fd113db31027692d472524b0d02f5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 25 Apr 2020 18:23:09 +0900
Subject: [PATCH 31/31] Reword comment

---
 osu.Game/Overlays/Toolbar/Toolbar.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 301747acbc..1b748cb672 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -33,8 +33,7 @@ namespace osu.Game.Overlays.Toolbar
 
         private readonly Bindable<OverlayActivation> overlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All);
 
-        // Required for toolbar components that need to listen for key input
-        // to invoke specific actions while toolbar is in hidden state.
+        // Toolbar components like RulesetSelector should receive keyboard input events even when the toolbar is hidden.
         public override bool PropagateNonPositionalInputSubTree => true;
 
         public Toolbar()