Merge branch 'master' into watch-replays-4

osu.Game/Screens/Edit/Editor.cs

@@ -24,11 +24,13 @@ using osu.Game.Screens.Edit.Design;
 using osuTK.Input;
 using System.Collections.Generic;
 using osu.Framework;
+using osu.Framework.Input.Bindings;
+using osu.Game.Input.Bindings;
 using osu.Game.Users;
 
 namespace osu.Game.Screens.Edit
 {
-    public class Editor : OsuScreen
+    public class Editor : OsuScreen, IKeyBindingHandler<GlobalAction>
     {
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenCustom(@"Backgrounds/bg4");
 
@@ -206,6 +208,20 @@ namespace osu.Game.Screens.Edit
             return true;
         }
 
+        public bool OnPressed(GlobalAction action)
+        {
+            if (action == GlobalAction.Back)
+            {
+                // as we don't want to display the back button, manual handling of exit action is required.
+                this.Exit();
+                return true;
+            }
+
+            return false;
+        }
+
+        public bool OnReleased(GlobalAction action) => action == GlobalAction.Back;
+
         public override void OnResuming(IScreen last)
         {
             Beatmap.Value.Track?.Stop();

osu.Game/Screens/Play/ComboEffects.cs

@@ -0,0 +1,42 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Audio;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Skinning;
+
+namespace osu.Game.Screens.Play
+{
+    public class ComboEffects : CompositeDrawable
+    {
+        private readonly ScoreProcessor processor;
+
+        private SkinnableSound comboBreakSample;
+
+        public ComboEffects(ScoreProcessor processor)
+        {
+            this.processor = processor;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = comboBreakSample = new SkinnableSound(new SampleInfo("combobreak"));
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            processor.Combo.BindValueChanged(onComboChange, true);
+        }
+
+        private void onComboChange(ValueChangedEvent<int> combo)
+        {
+            if (combo.NewValue == 0 && combo.OldValue > 20)
+                comboBreakSample?.Play();
+        }
+    }
+}

osu.Game/Screens/Play/Player.cs

@@ -127,7 +127,11 @@ namespace osu.Game.Screens.Play
                     Child = new LocalSkinOverrideContainer(working.Skin)
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Child = DrawableRuleset
+                        Children = new Drawable[]
+                        {
+                            DrawableRuleset,
+                            new ComboEffects(ScoreProcessor)
+                        }
                     }
                 },
                 new BreakOverlay(working.Beatmap.BeatmapInfo.LetterboxInBreaks, ScoreProcessor)

osu.Game/Screens/Select/BeatmapCarousel.cs

@@ -11,7 +11,6 @@ using osu.Game.Configuration;
 using osuTK.Input;
 using osu.Framework.MathUtils;
 using System.Diagnostics;
-using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
@@ -64,35 +63,29 @@ namespace osu.Game.Screens.Select
         public IEnumerable<BeatmapSetInfo> BeatmapSets
         {
             get => beatmapSets.Select(g => g.BeatmapSet);
-            set => loadBeatmapSets(() => value);
+            set => loadBeatmapSets(value);
         }
 
-        public void LoadBeatmapSetsFromManager(BeatmapManager manager) => loadBeatmapSets(manager.GetAllUsableBeatmapSetsEnumerable);
-
-        private void loadBeatmapSets(Func<IEnumerable<BeatmapSetInfo>> beatmapSets)
+        private void loadBeatmapSets(IEnumerable<BeatmapSetInfo> beatmapSets)
         {
             CarouselRoot newRoot = new CarouselRoot(this);
 
-            Task.Run(() =>
-            {
-                beatmapSets().Select(createCarouselSet).Where(g => g != null).ForEach(newRoot.AddChild);
-                newRoot.Filter(activeCriteria);
+            beatmapSets.Select(createCarouselSet).Where(g => g != null).ForEach(newRoot.AddChild);
+            newRoot.Filter(activeCriteria);
 
-                // preload drawables as the ctor overhead is quite high currently.
-                var _ = newRoot.Drawables;
-            }).ContinueWith(_ => Schedule(() =>
-            {
-                root = newRoot;
-                scrollableContent.Clear(false);
-                itemsCache.Invalidate();
-                scrollPositionCache.Invalidate();
+            // preload drawables as the ctor overhead is quite high currently.
+            var _ = newRoot.Drawables;
 
-                Schedule(() =>
-                {
-                    BeatmapSetsChanged?.Invoke();
-                    BeatmapSetsLoaded = true;
-                });
-            }));
+            root = newRoot;
+            scrollableContent.Clear(false);
+            itemsCache.Invalidate();
+            scrollPositionCache.Invalidate();
+
+            Schedule(() =>
+            {
+                BeatmapSetsChanged?.Invoke();
+                BeatmapSetsLoaded = true;
+            });
         }
 
         private readonly List<float> yPositions = new List<float>();
@@ -125,13 +118,15 @@ namespace osu.Game.Screens.Select
         }
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(OsuConfigManager config)
+        private void load(OsuConfigManager config, BeatmapManager beatmaps)
         {
             config.BindWith(OsuSetting.RandomSelectAlgorithm, RandomAlgorithm);
             config.BindWith(OsuSetting.SongSelectRightMouseScroll, RightClickScrollingEnabled);
 
             RightClickScrollingEnabled.ValueChanged += enabled => RightMouseScrollbar = enabled.NewValue;
             RightClickScrollingEnabled.TriggerChange();
+
+            loadBeatmapSets(beatmaps.GetAllUsableBeatmapSetsEnumerable());
         }
 
         public void RemoveBeatmapSet(BeatmapSetInfo beatmapSet)

osu.Game/Screens/Select/SongSelect.cs

@@ -244,8 +244,6 @@ namespace osu.Game.Screens.Select
             sampleChangeBeatmap = audio.Samples.Get(@"SongSelect/select-expand");
             SampleConfirm = audio.Samples.Get(@"SongSelect/confirm-selection");
 
-            Carousel.LoadBeatmapSetsFromManager(this.beatmaps);
-
             if (dialogOverlay != null)
             {
                 Schedule(() =>