wip

.vscode/launch.json

@@ -11,11 +11,7 @@
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build tests (Debug)",
-            "linux": {
-                "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Game.Tests/bin/Debug/netcoreapp2.1:${env:LD_LIBRARY_PATH}"
-                }
-            },
+            "env": {},
             "console": "internalConsole"
         },
         {
@@ -28,11 +24,7 @@
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build tests (Release)",
-            "linux": {
-                "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Game.Tests/bin/Release/netcoreapp2.1:${env:LD_LIBRARY_PATH}"
-                }
-            },
+            "env": {},
             "console": "internalConsole"
         },
         {
@@ -45,11 +37,7 @@
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build osu! (Debug)",
-            "linux": {
-                "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp2.1:${env:LD_LIBRARY_PATH}"
-                }
-            },
+            "env": {},
             "console": "internalConsole"
         },
         {
@@ -62,11 +50,7 @@
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build osu! (Release)",
-            "linux": {
-                "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp2.1:${env:LD_LIBRARY_PATH}"
-                }
-            },
+            "env": {},
             "console": "internalConsole"
         }
     ]

osu.Game.Rulesets.Mania.Tests/TestCaseNotes.cs

@@ -153,6 +153,9 @@ namespace osu.Game.Rulesets.Mania.Tests
                     if (!(obj.HitObject is IHasEndTime endTime))
                         continue;
 
+                    if (!obj.HasNestedHitObjects)
+                        continue;
+
                     foreach (var nested in obj.NestedHitObjects)
                     {
                         double finalPosition = (nested.HitObject.StartTime - obj.HitObject.StartTime) / endTime.Duration;

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs

@@ -93,9 +93,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 base.AccentColour = value;
                 Body.AccentColour = AccentColour;
                 Ball.AccentColour = AccentColour;
-
-                foreach (var drawableHitObject in NestedHitObjects)
-                    drawableHitObject.AccentColour = AccentColour;
+                if (HasNestedHitObjects)
+                    foreach (var drawableHitObject in NestedHitObjects)
+                        drawableHitObject.AccentColour = AccentColour;
             }
         }
 
@@ -136,7 +136,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             if (!userTriggered && Time.Current >= slider.EndTime)
             {
-                var judgementsCount = NestedHitObjects.Count();
+                var judgementsCount = NestedHitObjects.Count;
                 var judgementsHit = NestedHitObjects.Count(h => h.IsHit);
 
                 var hitFraction = (double)judgementsHit / judgementsCount;

osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs

@@ -11,7 +11,6 @@ using osu.Game.Audio;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Beatmaps.Timing;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Beatmaps.Formats
@@ -212,41 +211,5 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.IsTrue(hitObjects[1].Samples.Any(s => s.Name == SampleInfo.HIT_CLAP));
             }
         }
-
-        [Test]
-        public void TestDecodeCustomSamples()
-        {
-            var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
-            using (var resStream = Resource.OpenResource("custom-samples.osu"))
-            using (var stream = new StreamReader(resStream))
-            {
-                var hitObjects = decoder.Decode(stream).HitObjects;
-
-                Assert.AreEqual("hitnormal", getTestableSampleInfo(hitObjects[0]).Name);
-                Assert.AreEqual("hitnormal", getTestableSampleInfo(hitObjects[1]).Name);
-                Assert.AreEqual("hitnormal2", getTestableSampleInfo(hitObjects[2]).Name);
-                Assert.AreEqual("hitnormal", getTestableSampleInfo(hitObjects[3]).Name);
-            }
-
-            SampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.SampleControlPoint.ApplyTo(new SampleInfo { Name = "hitnormal" });
-        }
-
-        [Test]
-        public void TestDecodeCustomHitObjectSamples()
-        {
-            var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
-            using (var resStream = Resource.OpenResource("custom-hitobject-samples.osu"))
-            using (var stream = new StreamReader(resStream))
-            {
-                var hitObjects = decoder.Decode(stream).HitObjects;
-
-                Assert.AreEqual("hit_1.wav", hitObjects[0].Samples[0].LookupNames.First());
-                Assert.AreEqual("hit_2.wav", hitObjects[1].Samples[0].LookupNames.First());
-                Assert.AreEqual("hitnormal2", getTestableSampleInfo(hitObjects[2]).Name);
-                Assert.AreEqual("hit_1.wav", hitObjects[3].Samples[0].LookupNames.First());
-            }
-
-            SampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.SampleControlPoint.ApplyTo(new SampleInfo { Name = "hitnormal" });
-        }
     }
 }

osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs

@@ -118,11 +118,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         public void TestParity(string beatmap)
         {
             var legacy = decode(beatmap, out Beatmap json);
-            json.WithDeepEqual(legacy)
-                .IgnoreProperty(r => r.DeclaringType == typeof(HitWindows)
-                                     // Todo: CustomSampleBank shouldn't exist going forward, we need a conversion mechanism
-                                     || r.Name == nameof(LegacyDecoder<Beatmap>.LegacySampleControlPoint.CustomSampleBank))
-                .Assert();
+            json.WithDeepEqual(legacy).IgnoreProperty(r => r.DeclaringType == typeof(HitWindows)).Assert();
         }
 
         /// <summary>

osu.Game.Tests/Resources/custom-hitobject-samples.osu

@@ -1,16 +0,0 @@
-osu file format v14
-
-[General]
-SampleSet: Normal
-
-[TimingPoints]
-2170,468.75,4,1,0,40,1,0
-2638,-100,4,1,1,40,0,0
-3107,-100,4,1,2,40,0,0
-3576,-100,4,1,0,40,0,0
-
-[HitObjects]
-255,193,2170,1,0,0:0:0:0:hit_1.wav
-256,191,2638,5,0,0:0:0:0:hit_2.wav
-255,193,3107,1,0,0:0:0:0:
-256,191,3576,1,0,0:0:0:0:hit_1.wav

osu.Game.Tests/Resources/custom-samples.osu

@@ -1,16 +0,0 @@
-osu file format v14
-
-[General]
-SampleSet: Normal
-
-[TimingPoints]
-2170,468.75,4,1,0,40,1,0
-2638,-100,4,1,1,40,0,0
-3107,-100,4,1,2,40,0,0
-3576,-100,4,1,0,40,0,0
-
-[HitObjects]
-255,193,2170,1,0,0:0:0:0:
-256,191,2638,5,0,0:0:0:0:
-255,193,3107,1,0,0:0:0:0:
-256,191,3576,1,0,0:0:0:0:

osu.Game.Tests/Visual/TestCaseButtonSystem.cs

@@ -1,6 +1,9 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -13,6 +16,13 @@ namespace osu.Game.Tests.Visual
     [TestFixture]
     public class TestCaseButtonSystem : OsuTestCase
     {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(ButtonSystem),
+            typeof(ButtonArea),
+            typeof(Button)
+        };
+
         public TestCaseButtonSystem()
         {
             OsuLogo logo;
@@ -30,6 +40,9 @@ namespace osu.Game.Tests.Visual
             };
 
             buttons.SetOsuLogo(logo);
+
+            foreach (var s in Enum.GetValues(typeof(ButtonSystemState)).OfType<ButtonSystemState>().Skip(1))
+                AddStep($"State to {s}", () => buttons.State = s);
         }
     }
 }

osu.Game/Audio/SampleInfo.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using System.Collections.Generic;
 
 namespace osu.Game.Audio
 {
@@ -33,21 +32,5 @@ namespace osu.Game.Audio
         /// The sample volume.
         /// </summary>
         public int Volume;
-
-        /// <summary>
-        /// Retrieve all possible filenames that can be used as a source, returned in order of preference (highest first).
-        /// </summary>
-        public virtual IEnumerable<string> LookupNames
-        {
-            get
-            {
-                if (!string.IsNullOrEmpty(Namespace))
-                    yield return $"{Namespace}/{Bank}-{Name}";
-
-                yield return $"{Bank}-{Name}"; // Without namespace as a fallback even when we have a namespace
-            }
-        }
-
-        public SampleInfo Clone() => (SampleInfo)MemberwiseClone();
     }
 }

osu.Game/Beatmaps/ControlPoints/ControlPoint.cs

@@ -14,15 +14,6 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         public int CompareTo(ControlPoint other) => Time.CompareTo(other.Time);
 
-        /// <summary>
-        /// Whether this <see cref="ControlPoint"/> provides the same parametric changes as another <see cref="ControlPoint"/>.
-        /// Basically an equality check without considering the <see cref="Time"/>.
-        /// </summary>
-        /// <param name="other">The <see cref="ControlPoint"/> to compare to.</param>
-        /// <returns>Whether this <see cref="ControlPoint"/> is equivalent to <paramref name="other"/>.</returns>
-        public virtual bool EquivalentTo(ControlPoint other) => true;
-
-        public bool Equals(ControlPoint other)
-            => EquivalentTo(other) && Time.Equals(other?.Time);
+        public bool Equals(ControlPoint other) => Time.Equals(other?.Time);
     }
 }

osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs

@@ -17,10 +17,5 @@ namespace osu.Game.Beatmaps.ControlPoints
         }
 
         private double speedMultiplier = 1;
-
-        public override bool EquivalentTo(ControlPoint other)
-            => base.EquivalentTo(other)
-               && other is DifficultyControlPoint difficulty
-               && SpeedMultiplier.Equals(difficulty.SpeedMultiplier);
     }
 }

osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs

@@ -14,11 +14,5 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// Whether the first bar line of this control point is ignored.
         /// </summary>
         public bool OmitFirstBarLine;
-
-        public override bool EquivalentTo(ControlPoint other)
-            => base.EquivalentTo(other)
-               && other is EffectControlPoint effect
-               && KiaiMode.Equals(effect.KiaiMode)
-               && OmitFirstBarLine.Equals(effect.OmitFirstBarLine);
     }
 }

osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs

@@ -30,25 +30,5 @@ namespace osu.Game.Beatmaps.ControlPoints
             Name = sampleName,
             Volume = SampleVolume,
         };
-
-        /// <summary>
-        /// Applies <see cref="SampleBank"/> and <see cref="SampleVolume"/> to a <see cref="SampleInfo"/> if necessary, returning the modified <see cref="SampleInfo"/>.
-        /// </summary>
-        /// <param name="sampleInfo">The <see cref="SampleInfo"/>. This will not be modified.</param>
-        /// <returns>The modified <see cref="SampleInfo"/>. This does not share a reference with <paramref name="sampleInfo"/>.</returns>
-        public virtual SampleInfo ApplyTo(SampleInfo sampleInfo)
-        {
-            var newSampleInfo = sampleInfo.Clone();
-            newSampleInfo.Bank = sampleInfo.Bank ?? SampleBank;
-            newSampleInfo.Name = sampleInfo.Name;
-            newSampleInfo.Volume = sampleInfo.Volume > 0 ? sampleInfo.Volume : SampleVolume;
-            return newSampleInfo;
-        }
-
-        public override bool EquivalentTo(ControlPoint other)
-            => base.EquivalentTo(other)
-               && other is SampleControlPoint sample
-               && SampleBank.Equals(sample.SampleBank)
-               && SampleVolume.Equals(sample.SampleVolume);
     }
 }

osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs

@@ -23,11 +23,5 @@ namespace osu.Game.Beatmaps.ControlPoints
         }
 
         private double beatLength = 1000;
-
-        public override bool EquivalentTo(ControlPoint other)
-            => base.EquivalentTo(other)
-               && other is TimingControlPoint timing
-               && TimeSignature.Equals(timing.TimeSignature)
-               && BeatLength.Equals(timing.BeatLength);
     }
 }

osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs

@@ -289,9 +289,9 @@ namespace osu.Game.Beatmaps.Formats
                 if (split.Length >= 4)
                     sampleSet = (LegacySampleBank)int.Parse(split[3]);
 
-                int customSampleBank = 0;
-                if (split.Length >= 5)
-                    customSampleBank = int.Parse(split[4]);
+                //SampleBank sampleBank = SampleBank.Default;
+                //if (split.Length >= 5)
+                //    sampleBank = (SampleBank)int.Parse(split[4]);
 
                 int sampleVolume = defaultSampleVolume;
                 if (split.Length >= 6)
@@ -314,9 +314,13 @@ namespace osu.Game.Beatmaps.Formats
                 if (stringSampleSet == @"none")
                     stringSampleSet = @"normal";
 
+                DifficultyControlPoint difficultyPoint = beatmap.ControlPointInfo.DifficultyPointAt(time);
+                SampleControlPoint samplePoint = beatmap.ControlPointInfo.SamplePointAt(time);
+                EffectControlPoint effectPoint = beatmap.ControlPointInfo.EffectPointAt(time);
+
                 if (timingChange)
                 {
-                    handleTimingControlPoint(new TimingControlPoint
+                    beatmap.ControlPointInfo.TimingPoints.Add(new TimingControlPoint
                     {
                         Time = time,
                         BeatLength = beatLength,
@@ -324,68 +328,41 @@ namespace osu.Game.Beatmaps.Formats
                     });
                 }
 
-                handleDifficultyControlPoint(new DifficultyControlPoint
+                if (speedMultiplier != difficultyPoint.SpeedMultiplier)
                 {
-                    Time = time,
-                    SpeedMultiplier = speedMultiplier
-                });
+                    beatmap.ControlPointInfo.DifficultyPoints.RemoveAll(x => x.Time == time);
+                    beatmap.ControlPointInfo.DifficultyPoints.Add(new DifficultyControlPoint
+                    {
+                        Time = time,
+                        SpeedMultiplier = speedMultiplier
+                    });
+                }
 
-                handleEffectControlPoint(new EffectControlPoint
+                if (stringSampleSet != samplePoint.SampleBank || sampleVolume != samplePoint.SampleVolume)
                 {
-                    Time = time,
-                    KiaiMode = kiaiMode,
-                    OmitFirstBarLine = omitFirstBarSignature
-                });
+                    beatmap.ControlPointInfo.SamplePoints.Add(new SampleControlPoint
+                    {
+                        Time = time,
+                        SampleBank = stringSampleSet,
+                        SampleVolume = sampleVolume
+                    });
+                }
 
-                handleSampleControlPoint(new LegacySampleControlPoint
+                if (kiaiMode != effectPoint.KiaiMode || omitFirstBarSignature != effectPoint.OmitFirstBarLine)
                 {
-                    Time = time,
-                    SampleBank = stringSampleSet,
-                    SampleVolume = sampleVolume,
-                    CustomSampleBank = customSampleBank
-                });
+                    beatmap.ControlPointInfo.EffectPoints.Add(new EffectControlPoint
+                    {
+                        Time = time,
+                        KiaiMode = kiaiMode,
+                        OmitFirstBarLine = omitFirstBarSignature
+                    });
+                }
             }
             catch (FormatException e)
             {
             }
         }
 
-        private void handleTimingControlPoint(TimingControlPoint newPoint)
-        {
-            beatmap.ControlPointInfo.TimingPoints.Add(newPoint);
-        }
-
-        private void handleDifficultyControlPoint(DifficultyControlPoint newPoint)
-        {
-            var existing = beatmap.ControlPointInfo.DifficultyPointAt(newPoint.Time);
-
-            if (newPoint.EquivalentTo(existing))
-                return;
-
-            beatmap.ControlPointInfo.DifficultyPoints.RemoveAll(x => x.Time == newPoint.Time);
-            beatmap.ControlPointInfo.DifficultyPoints.Add(newPoint);
-        }
-
-        private void handleEffectControlPoint(EffectControlPoint newPoint)
-        {
-            var existing = beatmap.ControlPointInfo.EffectPointAt(newPoint.Time);
-
-            if (newPoint.EquivalentTo(existing))
-                return;
-
-            beatmap.ControlPointInfo.EffectPoints.Add(newPoint);
-        }
-
-        private void handleSampleControlPoint(SampleControlPoint newPoint)
-        {
-            var existing = beatmap.ControlPointInfo.SamplePointAt(newPoint.Time);
-
-            if (newPoint.EquivalentTo(existing))
-                return;
-
-            beatmap.ControlPointInfo.SamplePoints.Add(newPoint);
-        }
-
         private void handleHitObject(string line)
         {
             // If the ruleset wasn't specified, assume the osu!standard ruleset.

osu.Game/Beatmaps/Formats/LegacyDecoder.cs

@@ -5,8 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using osu.Framework.Logging;
-using osu.Game.Audio;
-using osu.Game.Beatmaps.ControlPoints;
 using OpenTK.Graphics;
 
 namespace osu.Game.Beatmaps.Formats
@@ -169,25 +167,5 @@ namespace osu.Game.Beatmaps.Formats
             Pass = 2,
             Foreground = 3
         }
-
-        internal class LegacySampleControlPoint : SampleControlPoint
-        {
-            public int CustomSampleBank;
-
-            public override SampleInfo ApplyTo(SampleInfo sampleInfo)
-            {
-                var baseInfo = base.ApplyTo(sampleInfo);
-
-                if (CustomSampleBank > 1)
-                    baseInfo.Name += CustomSampleBank;
-
-                return baseInfo;
-            }
-
-            public override bool EquivalentTo(ControlPoint other)
-                => base.EquivalentTo(other)
-                   && other is LegacySampleControlPoint legacy
-                   && CustomSampleBank == legacy.CustomSampleBank;
-        }
     }
 }

osu.Game/Input/Bindings/GlobalActionContainer.cs

@@ -40,6 +40,7 @@ namespace osu.Game.Input.Bindings
 
             new KeyBinding(InputKey.Escape, GlobalAction.Back),
             new KeyBinding(InputKey.MouseButton1, GlobalAction.Back)
+            new KeyBinding(InputKey.Space, GlobalAction.Back),
         };
 
         public IEnumerable<KeyBinding> InGameKeyBindings => new[]
@@ -86,7 +87,7 @@ namespace osu.Game.Input.Bindings
         [Description("Toggle gameplay mouse buttons")]
         ToggleGameplayMouseButtons,
 
-        [Description("Go back")]
+        [Description("Back")]
         Back,
 
         [Description("Increase scroll speed")]
@@ -94,5 +95,8 @@ namespace osu.Game.Input.Bindings
 
         [Description("Decrease scroll speed")]
         DecreaseScrollSpeed,
+
+        [Description("Select")]
+        Select,
     }
 }

osu.Game/OsuGame.cs

@@ -250,8 +250,7 @@ namespace osu.Game
                 new VolumeControlReceptor
                 {
                     RelativeSizeAxes = Axes.Both,
-                    ActionRequested = action => volume.Adjust(action),
-                    ScrollActionRequested = (action, amount, isPrecise) => volume.Adjust(action, amount, isPrecise),
+                    ActionRequested = action => volume.Adjust(action)
                 },
                 mainContent = new Container { RelativeSizeAxes = Axes.Both },
                 overlayContent = new Container { RelativeSizeAxes = Axes.Both, Depth = float.MinValue },

osu.Game/Overlays/Dialog/PopupDialog.cs

@@ -69,10 +69,10 @@ namespace osu.Game.Overlays.Dialog
                     {
                         if (actionInvoked) return;
 
+                        Hide();
+
                         actionInvoked = true;
                         action?.Invoke();
-
-                        Hide();
                     };
                 }
             }

osu.Game/Overlays/KeyBinding/KeyBindingRow.cs

@@ -186,7 +186,7 @@ namespace osu.Game.Overlays.KeyBinding
             {
                 if (bindTarget.IsHovered)
                 {
-                    bindTarget.UpdateKeyCombination(KeyCombination.FromInputState(state, state.Mouse.ScrollDelta));
+                    bindTarget.UpdateKeyCombination(new KeyCombination(KeyCombination.FromInputState(state).Keys.Append(state.Mouse.ScrollDelta.Y > 0 ? InputKey.MouseWheelUp : InputKey.MouseWheelDown)));
                     finalise();
                     return true;
                 }

osu.Game/Overlays/Volume/VolumeControlReceptor.cs

@@ -9,13 +9,11 @@ using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Volume
 {
-    public class VolumeControlReceptor : Container, IScrollBindingHandler<GlobalAction>, IHandleGlobalInput
+    public class VolumeControlReceptor : Container, IKeyBindingHandler<GlobalAction>, IHandleGlobalInput
     {
         public Func<GlobalAction, bool> ActionRequested;
-        public Func<GlobalAction, float, bool, bool> ScrollActionRequested;
 
         public bool OnPressed(GlobalAction action) => ActionRequested?.Invoke(action) ?? false;
-        public bool OnScroll(GlobalAction action, float amount, bool isPrecise) => ScrollActionRequested?.Invoke(action, amount, isPrecise) ?? false;
         public bool OnReleased(GlobalAction action) => false;
     }
 }

osu.Game/Overlays/Volume/VolumeMeter.cs

@@ -12,15 +12,17 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
+using osu.Framework.Input.Bindings;
 using osu.Framework.MathUtils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Input.Bindings;
 using OpenTK;
 using OpenTK.Graphics;
 
 namespace osu.Game.Overlays.Volume
 {
-    public class VolumeMeter : Container
+    public class VolumeMeter : Container, IKeyBindingHandler<GlobalAction>
     {
         private CircularProgress volumeCircle;
         private CircularProgress volumeCircleGlow;
@@ -224,27 +226,59 @@ namespace osu.Game.Overlays.Volume
 
         private const float adjust_step = 0.05f;
 
-        public void Increase(double amount = 1, bool isPrecise = false) => adjust(amount, isPrecise);
-        public void Decrease(double amount = 1, bool isPrecise = false) => adjust(-amount, isPrecise);
+        public void Increase() => adjust(1);
+        public void Decrease() => adjust(-1);
+
+        private void adjust(int direction)
+        {
+            float amount = adjust_step * direction;
+
+            // handle the case where the OnPressed action was actually a mouse wheel.
+            // this allows for precise wheel handling.
+            var state = GetContainingInputManager().CurrentState;
+            if (state.Mouse?.ScrollDelta.Y != 0)
+            {
+                OnScroll(state);
+                return;
+            }
+
+            Volume += amount;
+        }
+
+        public bool OnPressed(GlobalAction action)
+        {
+            if (!IsHovered) return false;
+
+            switch (action)
+            {
+                case GlobalAction.DecreaseVolume:
+                    Decrease();
+                    return true;
+                case GlobalAction.IncreaseVolume:
+                    Increase();
+                    return true;
+            }
+
+            return false;
+        }
 
         // because volume precision is set to 0.01, this local is required to keep track of more precise adjustments and only apply when possible.
-        private double adjustAccumulator;
-
-        private void adjust(double delta, bool isPrecise)
-        {
-            adjustAccumulator += delta * adjust_step * (isPrecise ? 0.1 : 1);
-            if (Math.Abs(adjustAccumulator) < Bindable.Precision)
-                return;
-            Volume += adjustAccumulator;
-            adjustAccumulator = 0;
-        }
+        private double scrollAmount;
 
         protected override bool OnScroll(InputState state)
         {
-            adjust(state.Mouse.ScrollDelta.Y, state.Mouse.HasPreciseScroll);
+            scrollAmount += adjust_step * state.Mouse.ScrollDelta.Y * (state.Mouse.HasPreciseScroll ? 0.1f : 1);
+
+            if (Math.Abs(scrollAmount) < Bindable.Precision)
+                return true;
+
+            Volume += scrollAmount;
+            scrollAmount = 0;
             return true;
         }
 
+        public bool OnReleased(GlobalAction action) => false;
+
         private const float transition_length = 500;
 
         protected override bool OnHover(InputState state)

osu.Game/Overlays/VolumeOverlay.cs

@@ -93,7 +93,7 @@ namespace osu.Game.Overlays
             muteButton.Current.ValueChanged += _ => Show();
         }
 
-        public bool Adjust(GlobalAction action, float amount = 1, bool isPrecise = false)
+        public bool Adjust(GlobalAction action)
         {
             if (!IsLoaded) return false;
 
@@ -103,13 +103,13 @@ namespace osu.Game.Overlays
                     if (State == Visibility.Hidden)
                         Show();
                     else
-                        volumeMeterMaster.Decrease(amount, isPrecise);
+                        volumeMeterMaster.Decrease();
                     return true;
                 case GlobalAction.IncreaseVolume:
                     if (State == Visibility.Hidden)
                         Show();
                     else
-                        volumeMeterMaster.Increase(amount, isPrecise);
+                        volumeMeterMaster.Increase();
                     return true;
                 case GlobalAction.ToggleMute:
                     Show();

osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs

@@ -33,7 +33,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
         protected virtual IEnumerable<SampleInfo> GetSamples() => HitObject.Samples;
 
         private readonly Lazy<List<DrawableHitObject>> nestedHitObjects = new Lazy<List<DrawableHitObject>>();
-        public IEnumerable<DrawableHitObject> NestedHitObjects => nestedHitObjects.IsValueCreated ? nestedHitObjects.Value : Enumerable.Empty<DrawableHitObject>();
+        public bool HasNestedHitObjects => nestedHitObjects.IsValueCreated;
+        public IReadOnlyList<DrawableHitObject> NestedHitObjects => nestedHitObjects.Value;
 
         public event Action<DrawableHitObject, Judgement> OnJudgement;
         public event Action<DrawableHitObject, Judgement> OnJudgementRemoved;
@@ -49,12 +50,12 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <summary>
         /// Whether this <see cref="DrawableHitObject"/> and all of its nested <see cref="DrawableHitObject"/>s have been hit.
         /// </summary>
-        public bool IsHit => Judgements.Any(j => j.Final && j.IsHit) && NestedHitObjects.All(n => n.IsHit);
+        public bool IsHit => Judgements.Any(j => j.Final && j.IsHit) && (!HasNestedHitObjects || NestedHitObjects.All(n => n.IsHit));
 
         /// <summary>
         /// Whether this <see cref="DrawableHitObject"/> and all of its nested <see cref="DrawableHitObject"/>s have been judged.
         /// </summary>
-        public bool AllJudged => (!ProvidesJudgement || judgementFinalized) && NestedHitObjects.All(h => h.AllJudged);
+        public bool AllJudged => (!ProvidesJudgement || judgementFinalized) && (!HasNestedHitObjects || NestedHitObjects.All(h => h.AllJudged));
 
         /// <summary>
         /// Whether this <see cref="DrawableHitObject"/> can be judged.
@@ -89,12 +90,13 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 if (HitObject.SampleControlPoint == null)
                     throw new ArgumentNullException(nameof(HitObject.SampleControlPoint), $"{nameof(HitObject)}s must always have an attached {nameof(HitObject.SampleControlPoint)}."
                                                                                           + $" This is an indication that {nameof(HitObject.ApplyDefaults)} has not been invoked on {this}.");
-
-                samples = samples.Select(s => HitObject.SampleControlPoint.ApplyTo(s)).ToArray();
-                foreach (var s in samples)
-                    s.Namespace = SampleNamespace;
-
-                AddInternal(Samples = new SkinnableSound(samples));
+                AddInternal(Samples = new SkinnableSound(samples.Select(s => new SampleInfo
+                {
+                    Bank = s.Bank ?? HitObject.SampleControlPoint.SampleBank,
+                    Name = s.Name,
+                    Volume = s.Volume > 0 ? s.Volume : HitObject.SampleControlPoint.SampleVolume,
+                    Namespace = SampleNamespace
+                }).ToArray()));
             }
         }
 
@@ -204,8 +206,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (AllJudged)
                 return false;
 
-            foreach (var d in NestedHitObjects)
-                judgementOccurred |= d.UpdateJudgement(userTriggered);
+            if (HasNestedHitObjects)
+                foreach (var d in NestedHitObjects)
+                    judgementOccurred |= d.UpdateJudgement(userTriggered);
 
             if (!ProvidesJudgement || judgementFinalized || judgementOccurred)
                 return judgementOccurred;

osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs

@@ -6,7 +6,6 @@ using osu.Game.Rulesets.Objects.Types;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Audio;
 using System.Linq;
@@ -197,6 +196,9 @@ namespace osu.Game.Rulesets.Objects.Legacy
             var bank = (LegacyBeatmapDecoder.LegacySampleBank)Convert.ToInt32(split[0]);
             var addbank = (LegacyBeatmapDecoder.LegacySampleBank)Convert.ToInt32(split[1]);
 
+            // Let's not implement this for now, because this doesn't fit nicely into the bank structure
+            //string sampleFile = split2.Length > 4 ? split2[4] : string.Empty;
+
             string stringBank = bank.ToString().ToLower();
             if (stringBank == @"none")
                 stringBank = null;
@@ -209,8 +211,6 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
             if (split.Length > 3)
                 bankInfo.Volume = int.Parse(split[3]);
-
-            bankInfo.Filename = split.Length > 4 ? split[4] : null;
         }
 
         /// <summary>
@@ -252,10 +252,6 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
         private List<SampleInfo> convertSoundType(LegacySoundType type, SampleBankInfo bankInfo)
         {
-            // Todo: This should return the normal SampleInfos if the specified sample file isn't found, but that's a pretty edge-case scenario
-            if (!string.IsNullOrEmpty(bankInfo.Filename))
-                return new List<SampleInfo> { new FileSampleInfo { Filename = bankInfo.Filename } };
-
             var soundTypes = new List<SampleInfo>
             {
                 new SampleInfo
@@ -301,24 +297,14 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
         private class SampleBankInfo
         {
-            public string Filename;
-
             public string Normal;
             public string Add;
             public int Volume;
 
-            public SampleBankInfo Clone() => (SampleBankInfo)MemberwiseClone();
-        }
-
-        private class FileSampleInfo : SampleInfo
-        {
-            public string Filename;
-
-            public override IEnumerable<string> LookupNames => new[]
+            public SampleBankInfo Clone()
             {
-                Filename,
-                Path.ChangeExtension(Filename, null)
-            };
+                return (SampleBankInfo)MemberwiseClone();
+            }
         }
 
         [Flags]

osu.Game/Rulesets/UI/Scrolling/Visualisers/OverlappingSpeedChangeVisualiser.cs

@@ -47,10 +47,13 @@ namespace osu.Game.Rulesets.UI.Scrolling.Visualisers
                     }
                 }
 
-                ComputeInitialStates(obj.NestedHitObjects, direction, timeRange, length);
+                if (obj.HasNestedHitObjects)
+                {
+                    ComputeInitialStates(obj.NestedHitObjects, direction, timeRange, length);
 
-                // Nested hitobjects don't need to scroll, but they do need accurate positions
-                UpdatePositions(obj.NestedHitObjects, direction, obj.HitObject.StartTime, timeRange, length);
+                    // Nested hitobjects don't need to scroll, but they do need accurate positions
+                    UpdatePositions(obj.NestedHitObjects, direction, obj.HitObject.StartTime, timeRange, length);
+                }
             }
         }
 

osu.Game/Rulesets/UI/Scrolling/Visualisers/SequentialSpeedChangeVisualiser.cs

@@ -48,10 +48,13 @@ namespace osu.Game.Rulesets.UI.Scrolling.Visualisers
                     }
                 }
 
-                ComputeInitialStates(obj.NestedHitObjects, direction, timeRange, length);
+                if (obj.HasNestedHitObjects)
+                {
+                    ComputeInitialStates(obj.NestedHitObjects, direction, timeRange, length);
 
-                // Nested hitobjects don't need to scroll, but they do need accurate positions
-                UpdatePositions(obj.NestedHitObjects, direction, obj.HitObject.StartTime, timeRange, length);
+                    // Nested hitobjects don't need to scroll, but they do need accurate positions
+                    UpdatePositions(obj.NestedHitObjects, direction, obj.HitObject.StartTime, timeRange, length);
+                }
             }
         }
 

osu.Game/Screens/Menu/Button.cs

@@ -35,6 +35,12 @@ namespace osu.Game.Screens.Menu
         private readonly Box boxHoverLayer;
         private readonly SpriteIcon icon;
         private readonly string sampleName;
+
+        /// <summary>
+        /// The menu state for which we are visible for.
+        /// </summary>
+        public ButtonSystemState? VisibleState;
+
         private readonly Action clickAction;
         private readonly Key triggerKey;
         private SampleChannel sampleClick;
@@ -51,7 +57,7 @@ namespace osu.Game.Screens.Menu
             AutoSizeAxes = Axes.Both;
             Alpha = 0;
 
-            Vector2 boxSize = new Vector2(ButtonSystem.BUTTON_WIDTH + Math.Abs(extraWidth), ButtonSystem.BUTTON_AREA_HEIGHT);
+            Vector2 boxSize = new Vector2(ButtonSystem.BUTTON_WIDTH + Math.Abs(extraWidth), ButtonArea.BUTTON_AREA_HEIGHT);
 
             Children = new Drawable[]
             {
@@ -260,6 +266,7 @@ namespace osu.Game.Screens.Menu
                                 this.FadeOut(800);
                                 break;
                         }
+
                         break;
                     case ButtonState.Expanded:
                         const int expand_duration = 500;
@@ -276,6 +283,33 @@ namespace osu.Game.Screens.Menu
                 StateChanged?.Invoke(State);
             }
         }
+
+        public ButtonSystemState ButtonSystemState
+        {
+            set
+            {
+                ContractStyle = 0;
+
+                switch (value)
+                {
+                    case ButtonSystemState.Initial:
+                        State = ButtonState.Contracted;
+                        break;
+                    case ButtonSystemState.EnteringMode:
+                        ContractStyle = 1;
+                        State = ButtonState.Contracted;
+                        break;
+                    default:
+                        if (!VisibleState.HasValue || value == VisibleState)
+                            State = ButtonState.Expanded;
+                        else if (value < VisibleState)
+                            State = ButtonState.Contracted;
+                        else
+                            State = ButtonState.Exploded;
+                        break;
+                }
+            }
+        }
     }
 
     public enum ButtonState

osu.Game/Screens/Menu/ButtonSystem.cs

@@ -10,9 +10,9 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Logging;
 using osu.Framework.Threading;
 using osu.Game.Graphics;
 using osu.Game.Input.Bindings;
@@ -23,9 +23,9 @@ using OpenTK.Input;
 
 namespace osu.Game.Screens.Menu
 {
-    public class ButtonSystem : Container, IStateful<MenuState>, IKeyBindingHandler<GlobalAction>
+    public class ButtonSystem : Container, IStateful<ButtonSystemState>, IKeyBindingHandler<GlobalAction>
     {
-        public event Action<MenuState> StateChanged;
+        public event Action<ButtonSystemState> StateChanged;
 
         public Action OnEdit;
         public Action OnExit;
@@ -34,12 +34,6 @@ namespace osu.Game.Screens.Menu
         public Action OnSettings;
         public Action OnMulti;
         public Action OnChart;
-        public Action OnTest;
-
-        private readonly FlowContainerWithOrigin buttonFlow;
-
-        //todo: make these non-internal somehow.
-        public const float BUTTON_AREA_HEIGHT = 100;
 
         public const float BUTTON_WIDTH = 140f;
         public const float WEDGE_WIDTH = 20;
@@ -55,18 +49,16 @@ namespace osu.Game.Screens.Menu
                 this.logo.Action = onOsuLogo;
 
                 // osuLogo.SizeForFlow relies on loading to be complete.
-                buttonFlow.Position = new Vector2(WEDGE_WIDTH * 2 - (BUTTON_WIDTH + this.logo.SizeForFlow / 4), 0);
+                buttonArea.Flow.Position = new Vector2(WEDGE_WIDTH * 2 - (BUTTON_WIDTH + this.logo.SizeForFlow / 4), 0);
 
                 updateLogoState();
             }
         }
 
         private readonly Drawable iconFacade;
-        private readonly Container buttonArea;
-        private readonly Box buttonAreaBackground;
+        private readonly ButtonArea buttonArea;
 
         private readonly Button backButton;
-        private readonly Button settingsButton;
 
         private readonly List<Button> buttonsTopLevel = new List<Button>();
         private readonly List<Button> buttonsPlay = new List<Button>();
@@ -77,57 +69,39 @@ namespace osu.Game.Screens.Menu
         {
             RelativeSizeAxes = Axes.Both;
 
-            Children = new Drawable[]
+            Child = buttonArea = new ButtonArea();
+
+            buttonArea.AddRange(new[]
             {
-                buttonArea = new Container
+                new Button(@"settings", string.Empty, FontAwesome.fa_gear, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O)
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.X,
-                    Size = new Vector2(1, BUTTON_AREA_HEIGHT),
-                    Alpha = 0,
-                    Children = new Drawable[]
-                    {
-                        buttonAreaBackground = new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Size = new Vector2(2, 1),
-                            Colour = OsuColour.Gray(50),
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                        },
-                        buttonFlow = new FlowContainerWithOrigin
-                        {
-                            Direction = FillDirection.Horizontal,
-                            Spacing = new Vector2(-WEDGE_WIDTH, 0),
-                            Anchor = Anchor.Centre,
-                            AutoSizeAxes = Axes.Both,
-                            Children = new[]
-                            {
-                                settingsButton = new Button(@"settings", string.Empty, FontAwesome.fa_gear, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O),
-                                backButton = new Button(@"back", string.Empty, FontAwesome.fa_osu_left_o, new Color4(51, 58, 94, 255), onBack, -WEDGE_WIDTH),
-                                iconFacade = new Container //need a container to make the osu! icon flow properly.
-                                {
-                                    Size = new Vector2(0, BUTTON_AREA_HEIGHT)
-                                }
-                            },
-                            CentreTarget = iconFacade
-                        }
-                    }
+                    VisibleState = ButtonSystemState.TopLevel,
                 },
-            };
+                backButton = new Button(@"back", @"button-back-select", FontAwesome.fa_osu_left_o, new Color4(51, 58, 94, 255), () => State = ButtonSystemState.TopLevel, -WEDGE_WIDTH)
+                {
+                    VisibleState = ButtonSystemState.Play,
+                },
+                iconFacade = new Container //need a container to make the osu! icon flow properly.
+                {
+                    Size = new Vector2(0, ButtonArea.BUTTON_AREA_HEIGHT)
+                }
+            });
+
+            buttonArea.Flow.CentreTarget = iconFacade;
 
             buttonsPlay.Add(new Button(@"solo", @"button-solo-select", FontAwesome.fa_user, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
             buttonsPlay.Add(new Button(@"multi", @"button-generic-select", FontAwesome.fa_users, new Color4(94, 63, 186, 255), () => OnMulti?.Invoke(), 0, Key.M));
             buttonsPlay.Add(new Button(@"chart", @"button-generic-select", FontAwesome.fa_osu_charts, new Color4(80, 53, 160, 255), () => OnChart?.Invoke()));
+            buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
-            buttonsTopLevel.Add(new Button(@"play", @"button-play-select", FontAwesome.fa_osu_logo, new Color4(102, 68, 204, 255), onPlay, WEDGE_WIDTH, Key.P));
+            buttonsTopLevel.Add(new Button(@"play", @"button-play-select", FontAwesome.fa_osu_logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
             buttonsTopLevel.Add(new Button(@"osu!editor", @"button-generic-select", FontAwesome.fa_osu_edit_o, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
             buttonsTopLevel.Add(new Button(@"osu!direct", @"button-direct-select", FontAwesome.fa_osu_chevron_down_o, new Color4(165, 204, 0, 255), () => OnDirect?.Invoke(), 0, Key.D));
-            buttonsTopLevel.Add(new Button(@"exit", string.Empty, FontAwesome.fa_osu_cross_o, new Color4(238, 51, 153, 255), onExit, 0, Key.Q));
+            buttonsTopLevel.Add(new Button(@"exit", string.Empty, FontAwesome.fa_osu_cross_o, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));
+            buttonsTopLevel.ForEach(b => b.VisibleState = ButtonSystemState.TopLevel);
 
-            buttonFlow.AddRange(buttonsPlay);
-            buttonFlow.AddRange(buttonsTopLevel);
+            buttonArea.AddRange(buttonsPlay);
+            buttonArea.AddRange(buttonsTopLevel);
         }
 
         private OsuGame game;
@@ -164,14 +138,17 @@ namespace osu.Game.Screens.Menu
             }
         }
 
+        public bool OnReleased(GlobalAction action) => false;
+
         private bool goBack()
         {
             switch (State)
             {
-                case MenuState.TopLevel:
-                    State = MenuState.Initial;
+                case ButtonSystemState.TopLevel:
+                    State = ButtonSystemState.Initial;
+                    sampleBack?.Play();
                     return true;
-                case MenuState.Play:
+                case ButtonSystemState.Play:
                     backButton.TriggerOnClick();
                     return true;
                 default:
@@ -179,48 +156,30 @@ namespace osu.Game.Screens.Menu
             }
         }
 
-        public bool OnReleased(GlobalAction action) => false;
-
-        private void onPlay()
-        {
-            State = MenuState.Play;
-        }
-
-        private void onExit()
-        {
-            OnExit?.Invoke();
-        }
-
-        private void onBack()
-        {
-            sampleBack?.Play();
-            State = MenuState.TopLevel;
-        }
-
         private bool onOsuLogo()
         {
             switch (state)
             {
                 default:
                     return true;
-                case MenuState.Initial:
-                    State = MenuState.TopLevel;
+                case ButtonSystemState.Initial:
+                    State = ButtonSystemState.TopLevel;
                     return true;
-                case MenuState.TopLevel:
+                case ButtonSystemState.TopLevel:
                     buttonsTopLevel.First().TriggerOnClick();
                     return false;
-                case MenuState.Play:
+                case ButtonSystemState.Play:
                     buttonsPlay.First().TriggerOnClick();
                     return false;
             }
         }
 
-        private MenuState state;
+        private ButtonSystemState state = ButtonSystemState.Initial;
 
-        public override bool HandleKeyboardInput => state != MenuState.Exit;
-        public override bool HandleMouseInput => state != MenuState.Exit;
+        public override bool HandleKeyboardInput => state != ButtonSystemState.Exit;
+        public override bool HandleMouseInput => state != ButtonSystemState.Exit;
 
-        public MenuState State
+        public ButtonSystemState State
         {
             get { return state; }
 
@@ -228,71 +187,19 @@ namespace osu.Game.Screens.Menu
             {
                 if (state == value) return;
 
-                MenuState lastState = state;
+                ButtonSystemState lastState = state;
                 state = value;
 
-                //todo: figure a more elegant way of doing this.
-                buttonsTopLevel.ForEach(b => b.ContractStyle = 0);
-                buttonsPlay.ForEach(b => b.ContractStyle = 0);
-                backButton.ContractStyle = 0;
-                settingsButton.ContractStyle = 0;
-
                 updateLogoState(lastState);
 
-                using (buttonArea.BeginDelayedSequence(lastState == MenuState.Initial ? 150 : 0, true))
+                Logger.Log($"{nameof(ButtonSystem)}'s state changed from {lastState} to {state}");
+
+                using (buttonArea.BeginDelayedSequence(lastState == ButtonSystemState.Initial ? 150 : 0, true))
                 {
-                    switch (state)
-                    {
-                        case MenuState.Exit:
-                        case MenuState.Initial:
-                            buttonAreaBackground.ScaleTo(Vector2.One, 500, Easing.Out);
-                            buttonArea.FadeOut(300);
+                    buttonArea.ButtonSystemState = state;
 
-                            foreach (Button b in buttonsTopLevel)
-                                b.State = ButtonState.Contracted;
-
-                            foreach (Button b in buttonsPlay)
-                                b.State = ButtonState.Contracted;
-
-                            if (state != MenuState.Exit && lastState == MenuState.TopLevel)
-                                sampleBack?.Play();
-                            break;
-                        case MenuState.TopLevel:
-                            buttonAreaBackground.ScaleTo(Vector2.One, 200, Easing.Out);
-
-                            buttonArea.FadeIn(300);
-
-                            foreach (Button b in buttonsTopLevel)
-                                b.State = ButtonState.Expanded;
-
-                            foreach (Button b in buttonsPlay)
-                                b.State = ButtonState.Contracted;
-                            break;
-                        case MenuState.Play:
-                            foreach (Button b in buttonsTopLevel)
-                                b.State = ButtonState.Exploded;
-
-                            foreach (Button b in buttonsPlay)
-                                b.State = ButtonState.Expanded;
-                            break;
-                        case MenuState.EnteringMode:
-                            buttonAreaBackground.ScaleTo(new Vector2(2, 0), 300, Easing.InSine);
-
-                            buttonsTopLevel.ForEach(b => b.ContractStyle = 1);
-                            buttonsPlay.ForEach(b => b.ContractStyle = 1);
-                            backButton.ContractStyle = 1;
-                            settingsButton.ContractStyle = 1;
-
-                            foreach (Button b in buttonsTopLevel)
-                                b.State = ButtonState.Contracted;
-
-                            foreach (Button b in buttonsPlay)
-                                b.State = ButtonState.Contracted;
-                            break;
-                    }
-
-                    backButton.State = state == MenuState.Play ? ButtonState.Expanded : ButtonState.Contracted;
-                    settingsButton.State = state == MenuState.TopLevel ? ButtonState.Expanded : ButtonState.Contracted;
+                    foreach (var b in buttonArea.Children.OfType<Button>())
+                        b.ButtonSystemState = state;
                 }
 
                 StateChanged?.Invoke(State);
@@ -301,14 +208,14 @@ namespace osu.Game.Screens.Menu
 
         private ScheduledDelegate logoDelayedAction;
 
-        private void updateLogoState(MenuState lastState = MenuState.Initial)
+        private void updateLogoState(ButtonSystemState lastState = ButtonSystemState.Initial)
         {
             if (logo == null) return;
 
             switch (state)
             {
-                case MenuState.Exit:
-                case MenuState.Initial:
+                case ButtonSystemState.Exit:
+                case ButtonSystemState.Initial:
                     logoDelayedAction?.Cancel();
                     logoDelayedAction = Scheduler.AddDelayed(() =>
                         {
@@ -316,7 +223,7 @@ namespace osu.Game.Screens.Menu
 
                             if (game != null)
                             {
-                                game.OverlayActivationMode.Value = state == MenuState.Exit ? OverlayActivation.Disabled : OverlayActivation.All;
+                                game.OverlayActivationMode.Value = state == ButtonSystemState.Exit ? OverlayActivation.Disabled : OverlayActivation.All;
                                 game.Toolbar.Hide();
                             }
 
@@ -327,22 +234,22 @@ namespace osu.Game.Screens.Menu
                             logo.ScaleTo(1, 800, Easing.OutExpo);
                         }, buttonArea.Alpha * 150);
                     break;
-                case MenuState.TopLevel:
-                case MenuState.Play:
+                case ButtonSystemState.TopLevel:
+                case ButtonSystemState.Play:
                     switch (lastState)
                     {
-                        case MenuState.TopLevel: // coming from toplevel to play
+                        case ButtonSystemState.TopLevel: // coming from toplevel to play
                             break;
-                        case MenuState.Initial:
+                        case ButtonSystemState.Initial:
                             logo.ClearTransforms(targetMember: nameof(Position));
                             logo.RelativePositionAxes = Axes.None;
 
                             bool impact = logo.Scale.X > 0.6f;
 
-                            if (lastState == MenuState.Initial)
+                            if (lastState == ButtonSystemState.Initial)
                                 logo.ScaleTo(0.5f, 200, Easing.In);
 
-                            logo.MoveTo(logoTrackingPosition, lastState == MenuState.EnteringMode ? 0 : 200, Easing.In);
+                            logo.MoveTo(logoTrackingPosition, lastState == ButtonSystemState.EnteringMode ? 0 : 200, Easing.In);
 
                             logoDelayedAction?.Cancel();
                             logoDelayedAction = Scheduler.AddDelayed(() =>
@@ -368,7 +275,7 @@ namespace osu.Game.Screens.Menu
                     }
 
                     break;
-                case MenuState.EnteringMode:
+                case ButtonSystemState.EnteringMode:
                     logoTracking = true;
                     break;
             }
@@ -387,7 +294,7 @@ namespace osu.Game.Screens.Menu
 
             if (logo != null)
             {
-                if (logoTracking)
+                if (logoTracking && iconFacade.IsLoaded)
                     logo.Position = logoTrackingPosition;
 
                 iconFacade.Width = logo.SizeForFlow * 0.5f;
@@ -395,12 +302,12 @@ namespace osu.Game.Screens.Menu
         }
     }
 
-    public enum MenuState
+    public enum ButtonSystemState
     {
+        Exit,
         Initial,
         TopLevel,
         Play,
         EnteringMode,
-        Exit,
     }
 }

osu.Game/Screens/Menu/MainMenu.cs

@@ -24,9 +24,9 @@ namespace osu.Game.Screens.Menu
     {
         private readonly ButtonSystem buttons;
 
-        protected override bool HideOverlaysOnEnter => buttons.State == MenuState.Initial;
+        protected override bool HideOverlaysOnEnter => buttons.State == ButtonSystemState.Initial;
 
-        protected override bool AllowBackButton => buttons.State != MenuState.Initial;
+        protected override bool AllowBackButton => buttons.State != ButtonSystemState.Initial;
 
         private readonly BackgroundScreenDefault background;
         private Screen songSelect;
@@ -123,7 +123,7 @@ namespace osu.Game.Screens.Menu
 
             if (resuming)
             {
-                buttons.State = MenuState.TopLevel;
+                buttons.State = ButtonSystemState.TopLevel;
 
                 const float length = 300;
 
@@ -155,7 +155,7 @@ namespace osu.Game.Screens.Menu
 
             const float length = 400;
 
-            buttons.State = MenuState.EnteringMode;
+            buttons.State = ButtonSystemState.EnteringMode;
 
             Content.FadeOut(length, Easing.InSine);
             Content.MoveTo(new Vector2(-800, 0), length, Easing.InSine);
@@ -175,7 +175,7 @@ namespace osu.Game.Screens.Menu
 
         protected override bool OnExiting(Screen next)
         {
-            buttons.State = MenuState.Exit;
+            buttons.State = ButtonSystemState.Exit;
             Content.FadeOut(3000);
             return base.OnExiting(next);
         }

osu.Game/Screens/Select/FooterButton.cs

@@ -55,8 +55,6 @@ namespace osu.Game.Screens.Select
         private readonly Box box;
         private readonly Box light;
 
-        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => box.ReceiveMouseInputAt(screenSpacePos);
-
         public FooterButton()
         {
             Children = new Drawable[]

osu.Game/Skinning/SkinnableSound.cs

@@ -44,17 +44,19 @@ namespace osu.Game.Skinning
 
         private SampleChannel loadChannel(SampleInfo info, Func<string, SampleChannel> getSampleFunction)
         {
-            foreach (var lookup in info.LookupNames)
-            {
-                var ch = getSampleFunction($"Gameplay/{lookup}");
-                if (ch == null)
-                    continue;
+            SampleChannel ch = null;
 
+            if (info.Namespace != null)
+                ch = getSampleFunction($"Gameplay/{info.Namespace}/{info.Bank}-{info.Name}");
+
+            // try without namespace as a fallback.
+            if (ch == null)
+                ch = getSampleFunction($"Gameplay/{info.Bank}-{info.Name}");
+
+            if (ch != null)
                 ch.Volume.Value = info.Volume / 100.0;
-                return ch;
-            }
 
-            return null;
+            return ch;
         }
     }
 }

osu.Game/osu.Game.csproj

@@ -18,7 +18,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2018.705.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2018.629.0" />
     <PackageReference Include="SharpCompress" Version="0.17.1" />
     <PackageReference Include="NUnit" Version="3.10.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />