Merge branch 'master' into fix-always-skipping

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

@@ -62,8 +62,17 @@ namespace osu.Game.Tests.Visual
             }
 
             if (localStorage.IsValueCreated)
+            {
+                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();