Merge remote-tracking branch 'origin/open-downloaded-beatmas' into release

Fix hitobjects not properly expiring if scrolling in the editor

README.md

@@ -26,7 +26,7 @@ Build and run
 - Using Visual Studio 2017, Rider or Visual Studio Code (configurations are included)
 - From command line using `dotnet run --project osu.Desktop --framework netcoreapp2.1`
 
-The above methods should automatically do so, but if you run into issues building you may need to restore nuget packages (commonly via `dotnet restore`).
+If you run into issues building you may need to restore nuget packages (commonly via `dotnet restore`). Visual Studio Code users must run `Restore` task from debug tab before attempt to build.
 
 # Contributing
 

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

@@ -52,6 +52,9 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             void runAfterLoaded(Action action)
             {
+                if (lastPlateableFruit == null)
+                    return;
+
                 // this is required to make this run after the last caught fruit runs UpdateState at least once.
                 // TODO: find a better alternative
                 if (lastPlateableFruit.IsLoaded)

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

@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             return new ScrollingTestContainer(direction)
             {
                 AutoSizeAxes = Axes.Both,
-                Child = new NoteContainer(direction, $"note, scrolling {direction.ToString().ToLower()}")
+                Child = new NoteContainer(direction, $"note, scrolling {direction.ToString().ToLowerInvariant()}")
                 {
                     Child = new DrawableNote(note) { AccentColour = Color4.OrangeRed }
                 }
@@ -77,7 +77,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             return new ScrollingTestContainer(direction)
             {
                 AutoSizeAxes = Axes.Both,
-                Child = new NoteContainer(direction, $"hold note, scrolling {direction.ToString().ToLower()}")
+                Child = new NoteContainer(direction, $"hold note, scrolling {direction.ToString().ToLowerInvariant()}")
                 {
                     Child = new DrawableHoldNote(note)
                     {

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

@@ -138,7 +138,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
         internal void OnJudgement(DrawableHitObject judgedObject, Judgement judgement)
         {
-            if (!judgement.IsHit || !judgedObject.DisplayJudgement)
+            if (!judgement.IsHit || !judgedObject.DisplayJudgement || !DisplayJudgements)
                 return;
 
             explosionContainer.Add(new HitExplosion(judgedObject)

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

@@ -8,7 +8,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Configuration;
@@ -74,10 +73,5 @@ namespace osu.Game.Rulesets.Mania.UI
         {
             maniaConfig.BindWith(ManiaSetting.ScrollTime, VisibleTimeRange);
         }
-
-        internal void OnJudgement(DrawableHitObject judgedObject, Judgement judgement)
-        {
-            getStageByColumn(((ManiaHitObject)judgedObject.HitObject).Column).OnJudgement(judgedObject, judgement);
-        }
     }
 }

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

@@ -163,7 +163,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
         internal void OnJudgement(DrawableHitObject judgedObject, Judgement judgement)
         {
-            if (!judgedObject.DisplayJudgement)
+            if (!judgedObject.DisplayJudgement || !DisplayJudgements)
                 return;
 
             judgements.Clear();

osu.Game.Rulesets.Osu/Edit/OsuEditPlayfield.cs

@@ -1,12 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Game.Rulesets.Osu.UI;
-
-namespace osu.Game.Rulesets.Osu.Edit
-{
-    public class OsuEditPlayfield : OsuPlayfield
-    {
-        protected override bool DisplayJudgements => false;
-    }
-}

osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs

@@ -4,7 +4,6 @@
 using osu.Framework.Graphics.Cursor;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu.UI;
-using osu.Game.Rulesets.UI;
 using OpenTK;
 
 namespace osu.Game.Rulesets.Osu.Edit
@@ -16,8 +15,6 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
         }
 
-        protected override Playfield CreatePlayfield() => new OsuEditPlayfield();
-
         protected override Vector2 PlayfieldArea => Vector2.One;
 
         protected override CursorContainer CreateCursor() => null;

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

@@ -1,11 +1,13 @@
 // 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.ComponentModel;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Graphics;
 using System.Linq;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 using OpenTK.Graphics;
 
@@ -32,7 +34,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             {
                 UpdatePreemptState();
 
-                using (BeginDelayedSequence(HitObject.TimePreempt + (Judgements.FirstOrDefault()?.TimeOffset ?? 0), true))
+                var judgementOffset = Math.Min(HitObject.HitWindows.HalfWindowFor(HitResult.Miss), Judgements.FirstOrDefault()?.TimeOffset ?? 0);
+
+                using (BeginDelayedSequence(HitObject.TimePreempt + judgementOffset, true))
                     UpdateCurrentState(state);
             }
         }

osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs

@@ -20,8 +20,6 @@ namespace osu.Game.Rulesets.Osu.UI
         private readonly JudgementContainer<DrawableOsuJudgement> judgementLayer;
         private readonly ConnectionRenderer<OsuHitObject> connectionLayer;
 
-        protected virtual bool DisplayJudgements => true;
-
         public static readonly Vector2 BASE_SIZE = new Vector2(512, 384);
 
         public OsuPlayfield()

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

@@ -226,6 +226,9 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         internal void OnJudgement(DrawableHitObject judgedObject, Judgement judgement)
         {
+            if (!DisplayJudgements)
+                return;
+
             if (judgedObject.DisplayJudgement && judgementContainer.FirstOrDefault(j => j.JudgedObject == judgedObject) == null)
             {
                 judgementContainer.Add(new DrawableTaikoJudgement(judgement, judgedObject)

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

@@ -214,10 +214,10 @@ namespace osu.Game.Tests.Beatmaps.Formats
         }
 
         [Test]
-        public void TestDecodeCustomSamples()
+        public void TestDecodeControlPointCustomSampleBank()
         {
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
-            using (var resStream = Resource.OpenResource("custom-samples.osu"))
+            using (var resStream = Resource.OpenResource("controlpoint-custom-samplebank.osu"))
             using (var stream = new StreamReader(resStream))
             {
                 var hitObjects = decoder.Decode(stream).HitObjects;
@@ -228,25 +228,42 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.AreEqual("normal-hitnormal", getTestableSampleInfo(hitObjects[3]).LookupNames.First());
             }
 
-            SampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.SampleControlPoint.ApplyTo(new SampleInfo { Name = "hitnormal" });
+            SampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.SampleControlPoint.ApplyTo(hitObject.Samples[0]);
         }
 
         [Test]
-        public void TestDecodeCustomHitObjectSamples()
+        public void TestDecodeHitObjectCustomSampleBank()
         {
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
-            using (var resStream = Resource.OpenResource("custom-hitobject-samples.osu"))
+            using (var resStream = Resource.OpenResource("hitobject-custom-samplebank.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("normal-hitnormal2", getTestableSampleInfo(hitObjects[2]).LookupNames.First());
-                Assert.AreEqual("hit_1.wav", hitObjects[3].Samples[0].LookupNames.First());
+                Assert.AreEqual("normal-hitnormal", getTestableSampleInfo(hitObjects[0]).LookupNames.First());
+                Assert.AreEqual("normal-hitnormal2", getTestableSampleInfo(hitObjects[1]).LookupNames.First());
+                Assert.AreEqual("normal-hitnormal3", getTestableSampleInfo(hitObjects[2]).LookupNames.First());
             }
 
-            SampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.SampleControlPoint.ApplyTo(new SampleInfo { Name = "hitnormal" });
+            SampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.SampleControlPoint.ApplyTo(hitObject.Samples[0]);
+        }
+
+        [Test]
+        public void TestDecodeHitObjectFileSamples()
+        {
+            var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
+            using (var resStream = Resource.OpenResource("hitobject-file-samples.osu"))
+            using (var stream = new StreamReader(resStream))
+            {
+                var hitObjects = decoder.Decode(stream).HitObjects;
+
+                Assert.AreEqual("hit_1.wav", getTestableSampleInfo(hitObjects[0]).LookupNames.First());
+                Assert.AreEqual("hit_2.wav", getTestableSampleInfo(hitObjects[1]).LookupNames.First());
+                Assert.AreEqual("normal-hitnormal2", getTestableSampleInfo(hitObjects[2]).LookupNames.First());
+                Assert.AreEqual("hit_1.wav", getTestableSampleInfo(hitObjects[3]).LookupNames.First());
+            }
+
+            SampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.SampleControlPoint.ApplyTo(hitObject.Samples[0]);
         }
     }
 }

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

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

osu.Game.Tests/Visual/TestCaseLabelledTextBox.cs

@@ -0,0 +1,41 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Screens.Edit.Screens.Setup.Components.LabelledComponents;
+using System;
+using System.Collections.Generic;
+
+namespace osu.Game.Tests.Visual
+{
+    [TestFixture]
+    public class TestCaseLabelledTextBox : OsuTestCase
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(LabelledTextBox),
+        };
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.X,
+                Padding = new MarginPadding { Left = 150, Right = 150 },
+                Child = new LabelledTextBox
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    LabelText = "Testing text",
+                    PlaceholderText = "This is definitely working as intended",
+                }
+            };
+        }
+    }
+}

osu.Game.Tests/Visual/TestCasePlaySongSelect.cs

@@ -56,6 +56,12 @@ namespace osu.Game.Tests.Visual
 
         private TestSongSelect songSelect;
 
+        protected override void Dispose(bool isDisposing)
+        {
+            factory.ResetDatabase();
+            base.Dispose(isDisposing);
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -114,6 +120,7 @@ namespace osu.Game.Tests.Visual
         }
 
         [Test]
+        [Ignore("needs fixing")]
         public void ImportUnderDifferentRuleset()
         {
             changeRuleset(2);

osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs

@@ -40,7 +40,6 @@ namespace osu.Game.Beatmaps.ControlPoints
         {
             var newSampleInfo = sampleInfo.Clone();
             newSampleInfo.Bank = sampleInfo.Bank ?? SampleBank;
-            newSampleInfo.Name = sampleInfo.Name;
             newSampleInfo.Volume = sampleInfo.Volume > 0 ? sampleInfo.Volume : SampleVolume;
             return newSampleInfo;
         }

osu.Game/Beatmaps/Drawables/BeatmapSetOnlineStatusPill.cs

@@ -23,7 +23,7 @@ namespace osu.Game.Beatmaps.Drawables
                 if (value == status) return;
                 status = value;
 
-                statusText.Text = Enum.GetName(typeof(BeatmapSetOnlineStatus), Status)?.ToUpper();
+                statusText.Text = Enum.GetName(typeof(BeatmapSetOnlineStatus), Status)?.ToUpperInvariant();
             }
         }
 

osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs

@@ -312,7 +312,7 @@ namespace osu.Game.Beatmaps.Formats
                     omitFirstBarSignature = effectFlags.HasFlag(EffectFlags.OmitFirstBarLine);
                 }
 
-                string stringSampleSet = sampleSet.ToString().ToLower();
+                string stringSampleSet = sampleSet.ToString().ToLowerInvariant();
                 if (stringSampleSet == @"none")
                     stringSampleSet = @"normal";
 

osu.Game/Beatmaps/Formats/LegacyDecoder.cs

@@ -188,7 +188,7 @@ namespace osu.Game.Beatmaps.Formats
             {
                 var baseInfo = base.ApplyTo(sampleInfo);
 
-                if (CustomSampleBank > 1)
+                if (string.IsNullOrEmpty(baseInfo.Suffix) && CustomSampleBank > 1)
                     baseInfo.Suffix = CustomSampleBank.ToString();
 
                 return baseInfo;

osu.Game/Database/DatabaseContextFactory.cs

@@ -5,6 +5,7 @@ using System;
 using System.Linq;
 using System.Threading;
 using Microsoft.EntityFrameworkCore.Storage;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Platform;
 
 namespace osu.Game.Database
@@ -115,7 +116,11 @@ namespace osu.Game.Database
             }
         }
 
-        private void recycleThreadContexts() => threadContexts = new ThreadLocal<OsuDbContext>(CreateContext);
+        private void recycleThreadContexts()
+        {
+            threadContexts?.Values.ForEach(c => c.Dispose());
+            threadContexts = new ThreadLocal<OsuDbContext>(CreateContext, true);
+        }
 
         protected virtual OsuDbContext CreateContext() => new OsuDbContext(storage.GetDatabaseConnectionString(database_name))
         {
@@ -127,8 +132,6 @@ namespace osu.Game.Database
             lock (writeLock)
             {
                 recycleThreadContexts();
-                GC.Collect();
-                GC.WaitForPendingFinalizers();
                 storage.DeleteDatabase(database_name);
             }
         }

osu.Game/Graphics/ScreenshotManager.cs

@@ -134,7 +134,7 @@ namespace osu.Game.Graphics
         private string getFileName()
         {
             var dt = DateTime.Now;
-            var fileExt = screenshotFormat.ToString().ToLower();
+            var fileExt = screenshotFormat.ToString().ToLowerInvariant();
 
             var withoutIndex = $"osu_{dt:yyyy-MM-dd_HH-mm-ss}.{fileExt}";
             if (!storage.Exists(withoutIndex))

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

@@ -20,7 +20,7 @@ namespace osu.Game.Online.API.Requests
         }
 
         // ReSharper disable once ImpureMethodCallOnReadonlyValueField
-        protected override string Target => $@"users/{userId}/scores/{type.ToString().ToLower()}?offset={offset}";
+        protected override string Target => $@"users/{userId}/scores/{type.ToString().ToLowerInvariant()}?offset={offset}";
     }
 
     public enum ScoreType

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

@@ -23,7 +23,7 @@ namespace osu.Game.Online.API.Requests
             req.Method = HttpMethod.POST;
             req.AddParameter(@"target_type", message.TargetType.GetDescription());
             req.AddParameter(@"target_id", message.TargetId.ToString());
-            req.AddParameter(@"is_action", message.IsAction.ToString().ToLower());
+            req.AddParameter(@"is_action", message.IsAction.ToString().ToLowerInvariant());
             req.AddParameter(@"message", message.Content);
 
             return req;

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

@@ -29,7 +29,7 @@ namespace osu.Game.Online.API.Requests
         }
 
         // ReSharper disable once ImpureMethodCallOnReadonlyValueField
-        protected override string Target => $@"beatmapsets/search?q={query}&m={ruleset.ID ?? 0}&s={(int)searchCategory}&sort={sortCriteria.ToString().ToLower()}_{directionString}";
+        protected override string Target => $@"beatmapsets/search?q={query}&m={ruleset.ID ?? 0}&s={(int)searchCategory}&sort={sortCriteria.ToString().ToLowerInvariant()}_{directionString}";
     }
 
     public enum BeatmapSearchCategory

osu.Game/OsuGame.cs

@@ -586,10 +586,10 @@ namespace osu.Game
 
             // we only want to apply these restrictions when we are inside a screen stack.
             // the use case for not applying is in visual/unit tests.
-            bool applyRestrictions = !currentScreen?.AllowBeatmapRulesetChange ?? false;
+            bool applyBeatmapRulesetRestrictions = !currentScreen?.AllowBeatmapRulesetChange ?? false;
 
-            ruleset.Disabled = applyRestrictions;
-            Beatmap.Disabled = applyRestrictions;
+            ruleset.Disabled = applyBeatmapRulesetRestrictions;
+            Beatmap.Disabled = applyBeatmapRulesetRestrictions;
 
             mainContent.Padding = new MarginPadding { Top = ToolbarOffset };
 

osu.Game/OsuGameBase.cs

@@ -224,7 +224,7 @@ namespace osu.Game
                 // todo: we probably want a better (non-destructive) migrations/recovery process at a later point than this.
                 contextFactory.ResetDatabase();
 
-                Logger.Log("Database purged successfully.", LoggingTarget.Database, LogLevel.Important);
+                Logger.Log("Database purged successfully.", LoggingTarget.Database);
 
                 // only run once more, then hard bail.
                 using (var db = contextFactory.GetForWrite(false))

osu.Game/Overlays/Chat/ChannelSection.cs

@@ -30,7 +30,7 @@ namespace osu.Game.Overlays.Chat
         public string Header
         {
             get { return header.Text; }
-            set { header.Text = value.ToUpper(); }
+            set { header.Text = value.ToUpperInvariant(); }
         }
 
         public IEnumerable<Channel> Channels

osu.Game/Overlays/MedalSplash/DrawableMedal.cs

@@ -62,7 +62,7 @@ namespace osu.Game.Overlays.MedalSplash
                 {
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
-                    Text = "Medal Unlocked".ToUpper(),
+                    Text = "Medal Unlocked".ToUpperInvariant(),
                     TextSize = 24,
                     Font = @"Exo2.0-Light",
                     Alpha = 0f,

osu.Game/Overlays/MusicController.cs

@@ -183,7 +183,7 @@ namespace osu.Game.Overlays
                                     Anchor = Anchor.BottomCentre,
                                     Height = progress_height,
                                     FillColour = colours.Yellow,
-                                    OnSeek = progress => current?.Track.Seek(progress)
+                                    OnSeek = attemptSeek
                                 }
                             },
                         },
@@ -198,6 +198,12 @@ namespace osu.Game.Overlays
             playlist.StateChanged += s => playlistButton.FadeColour(s == Visibility.Visible ? colours.Yellow : Color4.White, 200, Easing.OutQuint);
         }
 
+        private void attemptSeek(double progress)
+        {
+            if (!beatmap.Disabled)
+                current?.Track.Seek(progress);
+        }
+
         private void playlistOrderChanged(BeatmapSetInfo beatmapSetInfo, int index)
         {
             beatmapSets.Remove(beatmapSetInfo);
@@ -219,6 +225,7 @@ namespace osu.Game.Overlays
             if (disabled)
                 playlist.Hide();
 
+            playButton.Enabled.Value = !disabled;
             prevButton.Enabled.Value = !disabled;
             nextButton.Enabled.Value = !disabled;
             playlistButton.Enabled.Value = !disabled;

osu.Game/Overlays/Notifications/NotificationSection.cs

@@ -55,7 +55,7 @@ namespace osu.Game.Overlays.Notifications
             set
             {
                 title = value;
-                if (titleText != null) titleText.Text = title.ToUpper();
+                if (titleText != null) titleText.Text = title.ToUpperInvariant();
             }
         }
 
@@ -101,7 +101,7 @@ namespace osu.Game.Overlays.Notifications
                             {
                                 titleText = new OsuSpriteText
                                 {
-                                    Text = title.ToUpper(),
+                                    Text = title.ToUpperInvariant(),
                                     Font = @"Exo2.0-Black",
                                 },
                                 countText = new OsuSpriteText
@@ -154,7 +154,7 @@ namespace osu.Game.Overlays.Notifications
             public string Text
             {
                 get { return text.Text; }
-                set { text.Text = value.ToUpper(); }
+                set { text.Text = value.ToUpperInvariant(); }
             }
         }
 

osu.Game/Overlays/OnScreenDisplay.cs

@@ -176,9 +176,9 @@ namespace osu.Game.Overlays
         {
             Schedule(() =>
             {
-                textLine1.Text = description.Name.ToUpper();
+                textLine1.Text = description.Name.ToUpperInvariant();
                 textLine2.Text = description.Value;
-                textLine3.Text = description.Shortcut.ToUpper();
+                textLine3.Text = description.Shortcut.ToUpperInvariant();
 
                 if (string.IsNullOrEmpty(textLine3.Text))
                     textLine3.Text = "NO KEY BOUND";

osu.Game/Overlays/Settings/SettingsSubsection.cs

@@ -51,7 +51,7 @@ namespace osu.Game.Overlays.Settings
             {
                 new OsuSpriteText
                 {
-                    Text = Header.ToUpper(),
+                    Text = Header.ToUpperInvariant(),
                     Margin = new MarginPadding { Bottom = 10, Left = SettingsOverlay.CONTENT_MARGINS, Right = SettingsOverlay.CONTENT_MARGINS },
                     Font = @"Exo2.0-Black",
                 },

osu.Game/Rulesets/Edit/HitObjectComposer.cs

@@ -110,6 +110,13 @@ namespace osu.Game.Rulesets.Edit
             toolboxCollection.Items[0].Select();
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            rulesetContainer.Playfield.DisplayJudgements.Value = false;
+        }
+
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();

osu.Game/Rulesets/Judgements/DrawableJudgement.cs

@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Judgements
 
             Child = new SkinnableDrawable($"Play/{Judgement.Result}", _ => JudgementText = new OsuSpriteText
             {
-                Text = Judgement.Result.GetDescription().ToUpper(),
+                Text = Judgement.Result.GetDescription().ToUpperInvariant(),
                 Font = @"Venera",
                 Colour = judgementColour(Judgement.Result),
                 Scale = new Vector2(0.85f, 1),

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

@@ -194,19 +194,22 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
             string[] split = str.Split(':');
 
-            var bank = (LegacyBeatmapDecoder.LegacySampleBank)Convert.ToInt32(split[0]);
-            var addbank = (LegacyBeatmapDecoder.LegacySampleBank)Convert.ToInt32(split[1]);
+            var bank = (LegacyBeatmapDecoder.LegacySampleBank)int.Parse(split[0]);
+            var addbank = (LegacyBeatmapDecoder.LegacySampleBank)int.Parse(split[1]);
 
-            string stringBank = bank.ToString().ToLower();
+            string stringBank = bank.ToString().ToLowerInvariant();
             if (stringBank == @"none")
                 stringBank = null;
-            string stringAddBank = addbank.ToString().ToLower();
+            string stringAddBank = addbank.ToString().ToLowerInvariant();
             if (stringAddBank == @"none")
                 stringAddBank = null;
 
             bankInfo.Normal = stringBank;
             bankInfo.Add = stringAddBank;
 
+            if (split.Length > 2)
+                bankInfo.CustomSampleBank = int.Parse(split[2]);
+
             if (split.Length > 3)
                 bankInfo.Volume = int.Parse(split[3]);
 
@@ -258,41 +261,45 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
             var soundTypes = new List<SampleInfo>
             {
-                new SampleInfo
+                new LegacySampleInfo
                 {
                     Bank = bankInfo.Normal,
                     Name = SampleInfo.HIT_NORMAL,
-                    Volume = bankInfo.Volume
+                    Volume = bankInfo.Volume,
+                    CustomSampleBank = bankInfo.CustomSampleBank
                 }
             };
 
             if (type.HasFlag(LegacySoundType.Finish))
             {
-                soundTypes.Add(new SampleInfo
+                soundTypes.Add(new LegacySampleInfo
                 {
                     Bank = bankInfo.Add,
                     Name = SampleInfo.HIT_FINISH,
-                    Volume = bankInfo.Volume
+                    Volume = bankInfo.Volume,
+                    CustomSampleBank = bankInfo.CustomSampleBank
                 });
             }
 
             if (type.HasFlag(LegacySoundType.Whistle))
             {
-                soundTypes.Add(new SampleInfo
+                soundTypes.Add(new LegacySampleInfo
                 {
                     Bank = bankInfo.Add,
                     Name = SampleInfo.HIT_WHISTLE,
-                    Volume = bankInfo.Volume
+                    Volume = bankInfo.Volume,
+                    CustomSampleBank = bankInfo.CustomSampleBank
                 });
             }
 
             if (type.HasFlag(LegacySoundType.Clap))
             {
-                soundTypes.Add(new SampleInfo
+                soundTypes.Add(new LegacySampleInfo
                 {
                     Bank = bankInfo.Add,
                     Name = SampleInfo.HIT_CLAP,
-                    Volume = bankInfo.Volume
+                    Volume = bankInfo.Volume,
+                    CustomSampleBank = bankInfo.CustomSampleBank
                 });
             }
 
@@ -307,9 +314,23 @@ namespace osu.Game.Rulesets.Objects.Legacy
             public string Add;
             public int Volume;
 
+            public int CustomSampleBank;
+
             public SampleBankInfo Clone() => (SampleBankInfo)MemberwiseClone();
         }
 
+        private class LegacySampleInfo : SampleInfo
+        {
+            public int CustomSampleBank
+            {
+                set
+                {
+                    if (value > 1)
+                        Suffix = value.ToString();
+                }
+            }
+        }
+
         private class FileSampleInfo : SampleInfo
         {
             public string Filename;

osu.Game/Rulesets/UI/Playfield.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 
 namespace osu.Game.Rulesets.UI
 {
@@ -21,6 +22,11 @@ namespace osu.Game.Rulesets.UI
         public IReadOnlyList<Playfield> NestedPlayfields => nestedPlayfields;
         private List<Playfield> nestedPlayfields;
 
+        /// <summary>
+        /// Whether judgements should be displayed by this and and all nested <see cref="Playfield"/>s.
+        /// </summary>
+        public readonly BindableBool DisplayJudgements = new BindableBool(true);
+
         /// <summary>
         /// A container for keeping track of DrawableHitObjects.
         /// </summary>
@@ -73,6 +79,8 @@ namespace osu.Game.Rulesets.UI
                 nestedPlayfields = new List<Playfield>();
 
             nestedPlayfields.Add(otherPlayfield);
+
+            otherPlayfield.DisplayJudgements.BindTo(DisplayJudgements);
         }
 
         /// <summary>

osu.Game/Screens/Edit/Screens/Setup/Components/LabelledComponents/LabelledTextBox.cs

@@ -0,0 +1,137 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using OpenTK.Graphics;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Screens.Edit.Screens.Setup.Components.LabelledComponents
+{
+    public class LabelledTextBox : CompositeDrawable
+    {
+        private const float label_container_width = 150;
+        private const float corner_radius = 15;
+        private const float default_height = 40;
+        private const float default_label_left_padding = 15;
+        private const float default_label_top_padding = 12;
+        private const float default_label_text_size = 16;
+
+        public event TextBox.OnCommitHandler OnCommit;
+
+        public bool ReadOnly
+        {
+            get => textBox.ReadOnly;
+            set => textBox.ReadOnly = value;
+        }
+
+        public string LabelText
+        {
+            get => label.Text;
+            set => label.Text = value;
+        }
+
+        public float LabelTextSize
+        {
+            get => label.TextSize;
+            set => label.TextSize = value;
+        }
+
+        public string PlaceholderText
+        {
+            get => textBox.PlaceholderText;
+            set => textBox.PlaceholderText = value;
+        }
+
+        public string Text
+        {
+            get => textBox.Text;
+            set => textBox.Text = value;
+        }
+
+        public Color4 LabelTextColour
+        {
+            get => label.Colour;
+            set => label.Colour = value;
+        }
+
+        public Color4 BackgroundColour
+        {
+            get => content.Colour;
+            set => content.Colour = value;
+        }
+
+        private readonly OsuTextBox textBox;
+        private readonly Container content;
+        private readonly OsuSpriteText label;
+
+        public LabelledTextBox()
+        {
+            RelativeSizeAxes = Axes.X;
+            Height = default_height;
+            CornerRadius = corner_radius;
+            Masking = true;
+
+            InternalChild = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                CornerRadius = corner_radius,
+                Masking = true,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = OsuColour.FromHex("1c2125"),
+                    },
+                    new GridContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = default_height,
+                        Content = new[]
+                        {
+                            new Drawable[]
+                            {
+                                label = new OsuSpriteText
+                                {
+                                    Anchor = Anchor.TopLeft,
+                                    Origin = Anchor.TopLeft,
+                                    Padding = new MarginPadding { Left = default_label_left_padding, Top = default_label_top_padding },
+                                    Colour = Color4.White,
+                                    TextSize = default_label_text_size,
+                                    Font = @"Exo2.0-Bold",
+                                },
+                                textBox = new OsuTextBox
+                                {
+                                    Anchor = Anchor.TopLeft,
+                                    Origin = Anchor.TopLeft,
+                                    RelativeSizeAxes = Axes.Both,
+                                    Height = 1,
+                                    CornerRadius = corner_radius,
+                                },
+                            },
+                        },
+                        ColumnDimensions = new[]
+                        {
+                            new Dimension(GridSizeMode.Absolute, label_container_width),
+                            new Dimension()
+                        }
+                    }
+                }
+            };
+
+            textBox.OnCommit += OnCommit;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            textBox.BorderColour = colours.Blue;
+        }
+    }
+}

osu.Game/Screens/Multi/Header.cs

@@ -86,7 +86,7 @@ namespace osu.Game.Screens.Multi
                 },
             };
 
-            breadcrumbs.Current.ValueChanged += s => screenType.Text = ((MultiplayerScreen)s).Type.ToLower();
+            breadcrumbs.Current.ValueChanged += s => screenType.Text = ((MultiplayerScreen)s).Type.ToLowerInvariant();
             breadcrumbs.Current.TriggerChange();
         }
 

osu.Game/Screens/Play/Break/BreakInfo.cs

@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Play.Break
                     {
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
-                        Text = "current progress".ToUpper(),
+                        Text = "current progress".ToUpperInvariant(),
                         TextSize = 15,
                         Font = "Exo2.0-Black",
                     },

osu.Game/Screens/Play/Player.cs

@@ -139,7 +139,7 @@ namespace osu.Game.Screens.Play
             adjustableClock = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
 
             adjustableClock.Seek(AllowLeadIn
-                ? Math.Min(RulesetContainer.GameplayStartTime, beatmap.HitObjects.First().StartTime - beatmap.BeatmapInfo.AudioLeadIn)
+                ? Math.Min(0, RulesetContainer.GameplayStartTime - beatmap.BeatmapInfo.AudioLeadIn)
                 : RulesetContainer.GameplayStartTime);
 
             adjustableClock.ProcessFrame();

osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs

@@ -94,7 +94,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
                                 {
                                     Origin = Anchor.CentreLeft,
                                     Anchor = Anchor.CentreLeft,
-                                    Text = Title.ToUpper(),
+                                    Text = Title.ToUpperInvariant(),
                                     TextSize = 17,
                                     Font = @"Exo2.0-Bold",
                                     Margin = new MarginPadding { Left = 10 },

osu.Game/Screens/Select/Carousel/CarouselGroup.cs

@@ -79,8 +79,13 @@ namespace osu.Game.Screens.Select.Carousel
         public override void Filter(FilterCriteria criteria)
         {
             base.Filter(criteria);
-            InternalChildren.Sort((x, y) => x.CompareTo(criteria, y));
-            InternalChildren.ForEach(c => c.Filter(criteria));
+
+            var children = new List<CarouselItem>(InternalChildren);
+
+            children.Sort((x, y) => x.CompareTo(criteria, y));
+            children.ForEach(c => c.Filter(criteria));
+
+            InternalChildren = children;
         }
 
         protected virtual void ChildItemStateChanged(CarouselItem item, CarouselItemState value)

osu.Game/Screens/Select/SongSelect.cs

@@ -12,9 +12,9 @@ using osu.Framework.Audio.Track;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Logging;
 using osu.Framework.Input.EventArgs;
 using osu.Framework.Input.States;
-using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;

osu.Game/Screens/Tournament/Drawings.cs

@@ -323,7 +323,7 @@ namespace osu.Game.Screens.Tournament
                             if (string.IsNullOrEmpty(line))
                                 continue;
 
-                            if (line.ToUpper().StartsWith("GROUP"))
+                            if (line.ToUpperInvariant().StartsWith("GROUP"))
                                 continue;
 
                             // ReSharper disable once AccessToModifiedClosure

osu.Game/Screens/Tournament/Group.cs

@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Tournament
 
                     Position = new Vector2(0, 7f),
 
-                    Text = $"GROUP {name.ToUpper()}",
+                    Text = $"GROUP {name.ToUpperInvariant()}",
                     TextSize = 8f,
                     Font = @"Exo2.0-Bold",
                     Colour = new Color4(255, 204, 34, 255),
@@ -161,7 +161,7 @@ namespace osu.Game.Screens.Tournament
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
 
-                                Text = team.Acronym.ToUpper(),
+                                Text = team.Acronym.ToUpperInvariant(),
                                 TextSize = 10f,
                                 Font = @"Exo2.0-Bold"
                             }

osu.Game/Tests/Visual/OsuTestCase.cs

@@ -62,7 +62,16 @@ namespace osu.Game.Tests.Visual
             }
 
             if (localStorage.IsValueCreated)
-                localStorage.Value.DeleteDirectory(".");
+            {
+                try
+                {
+                    localStorage.Value.DeleteDirectory(".");
+                }
+                catch
+                {
+                    // we don't really care if this fails; it will just leave folders lying around from test runs.
+                }
+            }
         }
 
         protected override ITestCaseTestRunner CreateRunner() => new OsuTestCaseTestRunner();

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.721.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2018.730.0" />
     <PackageReference Include="SharpCompress" Version="0.17.1" />
     <PackageReference Include="NUnit" Version="3.10.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />