Merge branch 'master' into applicable-to-hud

2025-08-03 14:46:38 +09:00 · 2019-07-02 05:24:56 +03:00
parent 7c1fc075e0 115dcc3147
commit 744e651a37
57 changed files with 616 additions and 298 deletions
--- a/osu.Game/Screens/Play/Player.cs
+++ b/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)