Merge upstream master into external-deploy

Author: peppy

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "osu-framework"]
-	path = osu-framework
-	url = https://github.com/ppy/osu-framework
 [submodule "osu-resources"]
 	path = osu-resources
-	url = https://github.com/ppy/osu-resources
+	url = https://github.com/ppy/osu-resources

osu-framework

@@ -3,7 +3,6 @@
 
 using System.Diagnostics;
 using osu.Framework.Allocation;
-using osu.Framework.Development;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -14,6 +13,7 @@
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
+using osu.Game.Utils;
 using OpenTK;
 using OpenTK.Graphics;
 

osu.Desktop/Overlays/VersionManager.cs

@@ -20,7 +20,6 @@
     <StartupObject>osu.Desktop.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup Label="Project References">
-    <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj" />
     <ProjectReference Include="..\osu.Game\osu.Game.csproj" />
     <ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj" />
     <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj" />

osu.Desktop/osu.Desktop.csproj

@@ -7,33 +7,34 @@
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModHidden : ModHidden, IApplicableToDrawableHitObjects
+    public class OsuModHidden : ModHidden
     {
         public override string Description => @"Play with no approach circles and fading circles/sliders.";
         public override double ScoreMultiplier => 1.06;
-
         private const double fade_in_duration_multiplier = 0.4;
         private const double fade_out_duration_multiplier = 0.3;
 
-        public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
+        public override void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
         {
+            void adjustFadeIn(OsuHitObject h) => h.TimeFadein = h.TimePreempt * fade_in_duration_multiplier;
+
             foreach (var d in drawables.OfType<DrawableOsuHitObject>())
             {
-                d.ApplyCustomUpdateState += ApplyHiddenState;
-
-                d.HitObject.TimeFadein = d.HitObject.TimePreempt * fade_in_duration_multiplier;
+                adjustFadeIn(d.HitObject);
                 foreach (var h in d.HitObject.NestedHitObjects.OfType<OsuHitObject>())
-                    h.TimeFadein = h.TimePreempt * fade_in_duration_multiplier;
+                    adjustFadeIn(h);
             }
+
+            base.ApplyToDrawableHitObjects(drawables);
         }
 
-        protected void ApplyHiddenState(DrawableHitObject drawable, ArmedState state)
+        protected override void ApplyHiddenState(DrawableHitObject drawable, ArmedState state)
         {
             if (!(drawable is DrawableOsuHitObject d))
                 return;

osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs

@@ -264,7 +264,8 @@ public void TestImportWhenFileOpen()
 
         private string createTemporaryBeatmap()
         {
-            var temp = new FileInfo(osz_path).CopyTo(Path.GetTempFileName(), true).FullName;
+            var temp = Path.GetTempFileName() + ".osz";
+            File.Copy(osz_path, temp, true);
             Assert.IsTrue(File.Exists(temp));
             return temp;
         }
@@ -344,12 +345,12 @@ private void ensureLoaded(OsuGameBase osu, int timeout = 60000)
 
         private void waitForOrAssert(Func<bool> result, string failureMessage, int timeout = 60000)
         {
-            Action waitAction = () =>
+            Task task = Task.Run(() =>
             {
                 while (!result()) Thread.Sleep(200);
-            };
+            });
 
-            Assert.IsTrue(waitAction.BeginInvoke(null, null).AsyncWaitHandle.WaitOne(timeout), failureMessage);
+            Assert.IsTrue(task.Wait(timeout), failureMessage);
         }
     }
 }

osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs

@@ -82,6 +82,8 @@ protected override void InitialiseDefaults()
 
             Set(OsuSetting.SpeedChangeVisualisation, SpeedChangeVisualisationMethod.Sequential);
 
+            Set(OsuSetting.IncreaseFirstObjectVisibility, true);
+
             // Update
             Set(OsuSetting.ReleaseStream, ReleaseStream.Lazer);
 
@@ -144,6 +146,7 @@ public enum OsuSetting
         ScreenshotCaptureMenuCursor,
         SongSelectRightMouseScroll,
         BeatmapSkins,
-        BeatmapHitsounds
+        BeatmapHitsounds,
+        IncreaseFirstObjectVisibility
     }
 }

osu.Game/Configuration/OsuConfigManager.cs

@@ -8,6 +8,7 @@
 using osu.Framework.Input;
 using OpenTK;
 using osu.Framework.Configuration;
+using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.Containers
 {
@@ -16,13 +17,13 @@ public class OsuFocusedOverlayContainer : FocusedOverlayContainer
         private SampleChannel samplePopIn;
         private SampleChannel samplePopOut;
 
-        private readonly BindableBool allowOpeningOverlays = new BindableBool(true);
+        protected readonly Bindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All);
 
         [BackgroundDependencyLoader(true)]
         private void load(OsuGame osuGame, AudioManager audio)
         {
             if (osuGame != null)
-                allowOpeningOverlays.BindTo(osuGame.AllowOpeningOverlays);
+                OverlayActivationMode.BindTo(osuGame.OverlayActivationMode);
 
             samplePopIn = audio.Sample.Get(@"UI/overlay-pop-in");
             samplePopOut = audio.Sample.Get(@"UI/overlay-pop-out");
@@ -52,20 +53,18 @@ protected override bool OnClick(InputState state)
 
         private void onStateChanged(Visibility visibility)
         {
-            if (allowOpeningOverlays)
+            switch (visibility)
             {
-                switch (visibility)
-                {
-                    case Visibility.Visible:
+                case Visibility.Visible:
+                    if (OverlayActivationMode != OverlayActivation.Disabled)
                         samplePopIn?.Play();
-                        break;
-                    case Visibility.Hidden:
-                        samplePopOut?.Play();
-                        break;
-                }
+                    else
+                        State = Visibility.Hidden;
+                    break;
+                case Visibility.Hidden:
+                    samplePopOut?.Play();
+                    break;
             }
-            else
-                State = Visibility.Hidden;
         }
     }
 }

osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs

@@ -77,8 +77,7 @@ private Intro intro
 
         public float ToolbarOffset => Toolbar.Position.Y + Toolbar.DrawHeight;
 
-        public readonly BindableBool HideOverlaysOnEnter = new BindableBool();
-        public readonly BindableBool AllowOpeningOverlays = new BindableBool(true);
+        public readonly Bindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>();
 
         private OsuScreen screenStack;
 
@@ -94,6 +93,8 @@ private Intro intro
 
         private SettingsOverlay settings;
 
+        private readonly List<OverlayContainer> overlays = new List<OverlayContainer>();
+
         // todo: move this to SongSelect once Screen has the ability to unsuspend.
         public readonly Bindable<IEnumerable<Mod>> SelectedMods = new Bindable<IEnumerable<Mod>>(new List<Mod>());
 
@@ -106,6 +107,17 @@ public OsuGame(string[] args = null)
 
         public void ToggleDirect() => direct.ToggleVisibility();
 
+        /// <summary>
+        /// Close all game-wide overlays.
+        /// </summary>
+        /// <param name="toolbar">Whether the toolbar should also be hidden.</param>
+        public void CloseAllOverlays(bool toolbar = true)
+        {
+            foreach (var o in overlays)
+                o.State = Visibility.Hidden;
+            if (toolbar) Toolbar.State = Visibility.Hidden;
+        }
+
         private DependencyContainer dependencies;
 
         protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent) =>
@@ -251,7 +263,7 @@ protected override void LoadComplete()
                 Depth = -5,
                 OnHome = delegate
                 {
-                    hideAllOverlays();
+                    CloseAllOverlays(false);
                     intro?.ChildScreen?.MakeCurrent();
                 },
             }, overlayContent.Add);
@@ -308,6 +320,8 @@ protected override void LoadComplete()
 
             // ensure only one of these overlays are open at once.
             var singleDisplayOverlays = new OverlayContainer[] { chat, social, direct };
+            overlays.AddRange(singleDisplayOverlays);
+
             foreach (var overlay in singleDisplayOverlays)
             {
                 overlay.StateChanged += state =>
@@ -323,6 +337,8 @@ protected override void LoadComplete()
             }
 
             var singleDisplaySideOverlays = new OverlayContainer[] { settings, notifications };
+            overlays.AddRange(singleDisplaySideOverlays);
+
             foreach (var overlay in singleDisplaySideOverlays)
             {
                 overlay.StateChanged += state =>
@@ -339,6 +355,8 @@ protected override void LoadComplete()
 
             // eventually informational overlays should be displayed in a stack, but for now let's only allow one to stay open at a time.
             var informationalOverlays = new OverlayContainer[] { beatmapSetOverlay, userProfile };
+            overlays.AddRange(informationalOverlays);
+
             foreach (var overlay in informationalOverlays)
             {
                 overlay.StateChanged += state =>
@@ -353,6 +371,11 @@ protected override void LoadComplete()
                 };
             }
 
+            OverlayActivationMode.ValueChanged += v =>
+            {
+                if (v != OverlayActivation.All) CloseAllOverlays();
+            };
+
             void updateScreenOffset()
             {
                 float offset = 0;
@@ -367,21 +390,6 @@ void updateScreenOffset()
 
             settings.StateChanged += _ => updateScreenOffset();
             notifications.StateChanged += _ => updateScreenOffset();
-
-            notifications.Enabled.BindTo(AllowOpeningOverlays);
-
-            HideOverlaysOnEnter.ValueChanged += hide =>
-            {
-                //central game screen change logic.
-                if (hide)
-                {
-                    hideAllOverlays();
-                    musicController.State = Visibility.Hidden;
-                    Toolbar.State = Visibility.Hidden;
-                }
-                else
-                    Toolbar.State = Visibility.Visible;
-            };
         }
 
         private void forwardLoggedErrorsToNotifications()
@@ -498,16 +506,6 @@ protected override void OnActivated()
         private OsuScreen currentScreen;
         private FrameworkConfigManager frameworkConfig;
 
-        private void hideAllOverlays()
-        {
-            settings.State = Visibility.Hidden;
-            chat.State = Visibility.Hidden;
-            direct.State = Visibility.Hidden;
-            social.State = Visibility.Hidden;
-            userProfile.State = Visibility.Hidden;
-            notifications.State = Visibility.Hidden;
-        }
-
         protected override bool OnExiting()
         {
             if (screenStack.ChildScreen == null) return false;

osu.Game/OsuGame.cs

@@ -10,7 +10,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Configuration;
-using osu.Framework.Development;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.IO.Stores;
@@ -31,6 +30,7 @@
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
+using DebugUtils = osu.Game.Utils.DebugUtils;
 
 namespace osu.Game
 {
@@ -59,8 +59,6 @@ public class OsuGameBase : Framework.Game, ICanAcceptFiles
 
         protected MenuCursorContainer MenuCursorContainer;
 
-        protected override string MainResourceFile => @"osu.Game.Resources.dll";
-
         private Container content;
 
         protected override Container<Drawable> Content => content;
@@ -100,6 +98,8 @@ protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnl
         [BackgroundDependencyLoader]
         private void load()
         {
+            Resources.AddStore(new DllResourceStore(@"osu.Game.Resources.dll"));
+
             dependencies.Cache(contextFactory = new DatabaseContextFactory(Host));
 
             dependencies.Cache(new LargeTextureStore(new RawTextureLoaderStore(new NamespacedResourceStore<byte[]>(Resources, @"Textures"))));