Merge branch 'master' into fix-replay-parse-culture

osu.Desktop/OsuGameDesktop.cs

@@ -14,6 +14,7 @@ using osuTK.Input;
 using Microsoft.Win32;
 using osu.Desktop.Updater;
 using osu.Framework;
+using osu.Framework.Logging;
 using osu.Framework.Platform.Windows;
 using osu.Framework.Screens;
 using osu.Game.Screens.Menu;
@@ -35,12 +36,15 @@ namespace osu.Desktop
         {
             try
             {
-                return new StableStorage();
+                if (Host is DesktopGameHost desktopHost)
+                    return new StableStorage(desktopHost);
             }
-            catch
+            catch (Exception e)
             {
-                return null;
+                Logger.Error(e, "Error while searching for stable install");
             }
+
+            return null;
         }
 
         protected override void LoadComplete()
@@ -139,8 +143,8 @@ namespace osu.Desktop
                 return null;
             }
 
-            public StableStorage()
+            public StableStorage(DesktopGameHost host)
-                : base(string.Empty, null)
+                : base(string.Empty, host)
             {
             }
         }

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

@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         protected override Playfield CreatePlayfield() => new CatchPlayfield(Beatmap.BeatmapInfo.BaseDifficulty, CreateDrawableRepresentation);
 
-        protected override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new CatchPlayfieldAdjustmentContainer();
+        public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new CatchPlayfieldAdjustmentContainer();
 
         protected override PassThroughInputManager CreateInputManager() => new CatchInputManager(Ruleset.RulesetInfo);
 

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

@@ -88,7 +88,7 @@ namespace osu.Game.Rulesets.Mania.UI
         /// <returns>The column which intersects with <paramref name="screenSpacePosition"/>.</returns>
         public Column GetColumnByPosition(Vector2 screenSpacePosition) => Playfield.GetColumnByPosition(screenSpacePosition);
 
-        protected override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new ManiaPlayfieldAdjustmentContainer();
+        public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new ManiaPlayfieldAdjustmentContainer();
 
         protected override Playfield CreatePlayfield() => new ManiaPlayfield(Beatmap.Stages);
 

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

@@ -15,7 +15,9 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
         }
 
-        protected override Playfield CreatePlayfield() => new OsuPlayfieldNoCursor { Size = Vector2.One　};
+        protected override Playfield CreatePlayfield() => new OsuPlayfieldNoCursor();
+
+        public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new OsuPlayfieldAdjustmentContainer { Size = Vector2.One };
 
         private class OsuPlayfieldNoCursor : OsuPlayfield
         {

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

@@ -2,8 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
@@ -13,7 +11,6 @@ using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Edit.Compose.Components;
 
@@ -38,8 +35,6 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         public override SelectionHandler CreateSelectionHandler() => new OsuSelectionHandler();
 
-        protected override Container CreateLayerContainer() => new OsuPlayfieldAdjustmentContainer { RelativeSizeAxes = Axes.Both };
-
         public override SelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject)
         {
             switch (hitObject)

osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs

@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Osu.Replays
         {
         }
 
-        protected override bool IsImportant(OsuReplayFrame frame) => frame?.Actions.Any() ?? false;
+        protected override bool IsImportant(OsuReplayFrame frame) => frame.Actions.Any();
 
         protected Vector2? Position
         {

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

@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected override PassThroughInputManager CreateInputManager() => new OsuInputManager(Ruleset.RulesetInfo);
 
-        protected override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new OsuPlayfieldAdjustmentContainer();
+        public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new OsuPlayfieldAdjustmentContainer();
 
         public override DrawableHitObject<OsuHitObject> CreateDrawableRepresentation(OsuHitObject h)
         {

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

@@ -81,7 +81,7 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public override ScoreProcessor CreateScoreProcessor() => new TaikoScoreProcessor(this);
 
-        protected override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new TaikoPlayfieldAdjustmentContainer();
+        public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new TaikoPlayfieldAdjustmentContainer();
 
         protected override PassThroughInputManager CreateInputManager() => new TaikoInputManager(Ruleset.RulesetInfo);
 

osu.Game.Tests/NonVisual/FramedReplayinputHandlerTest.cs

@@ -278,7 +278,7 @@ namespace osu.Game.Tests.NonVisual
 
             protected override double AllowedImportantTimeSpan => 1000;
 
-            protected override bool IsImportant(TestReplayFrame frame) => frame?.IsImportant ?? false;
+            protected override bool IsImportant(TestReplayFrame frame) => frame.IsImportant;
         }
     }
 }

osu.Game/Configuration/OsuConfigManager.cs

@@ -55,7 +55,7 @@ namespace osu.Game.Configuration
 
             // Input
             Set(OsuSetting.MenuCursorSize, 1.0, 0.5f, 2, 0.01);
-            Set(OsuSetting.GameplayCursorSize, 1.0, 0.5f, 2, 0.01);
+            Set(OsuSetting.GameplayCursorSize, 1.0, 0.1f, 2, 0.01);
             Set(OsuSetting.AutoCursorSize, false);
 
             Set(OsuSetting.MouseDisableButtons, false);

osu.Game/Overlays/Direct/FilterControl.cs

@@ -116,5 +116,6 @@ namespace osu.Game.Overlays.Direct
         Ranked,
         Rating,
         Plays,
+        Favourites,
     }
 }

osu.Game/Rulesets/Edit/DrawableEditRuleset.cs

@@ -18,6 +18,8 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public abstract Playfield Playfield { get; }
 
+        public abstract PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer();
+
         internal DrawableEditRuleset()
         {
             RelativeSizeAxes = Axes.Both;
@@ -43,6 +45,8 @@ namespace osu.Game.Rulesets.Edit
     {
         public override Playfield Playfield => drawableRuleset.Playfield;
 
+        public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => drawableRuleset.CreatePlayfieldAdjustmentContainer();
+
         private Ruleset ruleset => drawableRuleset.Ruleset;
         private Beatmap<TObject> beatmap => drawableRuleset.Beatmap;
 

osu.Game/Rulesets/Edit/HitObjectComposer.cs

@@ -63,10 +63,10 @@ namespace osu.Game.Rulesets.Edit
                 return;
             }
 
-            var layerBelowRuleset = CreateLayerContainer();
+            var layerBelowRuleset = DrawableRuleset.CreatePlayfieldAdjustmentContainer();
             layerBelowRuleset.Child = new EditorPlayfieldBorder { RelativeSizeAxes = Axes.Both };
 
-            var layerAboveRuleset = CreateLayerContainer();
+            var layerAboveRuleset = DrawableRuleset.CreatePlayfieldAdjustmentContainer();
             layerAboveRuleset.Child = blueprintContainer = new BlueprintContainer();
 
             layerContainers.Add(layerBelowRuleset);
@@ -174,11 +174,6 @@ namespace osu.Game.Rulesets.Edit
         /// Creates a <see cref="SelectionHandler"/> which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
         /// </summary>
         public virtual SelectionHandler CreateSelectionHandler() => new SelectionHandler();
-
-        /// <summary>
-        /// Creates a <see cref="ScalableContainer"/> which provides a layer above or below the <see cref="Playfield"/>.
-        /// </summary>
-        protected virtual Container CreateLayerContainer() => new Container { RelativeSizeAxes = Axes.Both };
     }
 
     public abstract class HitObjectComposer<TObject> : HitObjectComposer

osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using JetBrains.Annotations;
 using osu.Framework.Input.StateChanges;
 using osu.Game.Input.Handlers;
 using osu.Game.Replays;
@@ -87,14 +88,24 @@ namespace osu.Game.Rulesets.Replays
 
         protected bool HasFrames => Frames.Count > 0;
 
-        private bool inImportantSection =>
+        private bool inImportantSection
-            HasFrames && FrameAccuratePlayback &&
+        {
-            //a button is in a pressed state
+            get
-            IsImportant(currentDirection > 0 ? CurrentFrame : NextFrame) &&
+            {
-            //the next frame is within an allowable time span
+                if (!HasFrames || !FrameAccuratePlayback)
-            Math.Abs(CurrentTime - NextFrame?.Time ?? 0) <= AllowedImportantTimeSpan;
+                    return false;
 
-        protected virtual bool IsImportant(TFrame frame) => false;
+                var frame = currentDirection > 0 ? CurrentFrame : NextFrame;
+
+                if (frame == null)
+                    return false;
+
+                return IsImportant(frame) && //a button is in a pressed state
+                       Math.Abs(CurrentTime - NextFrame?.Time ?? 0) <= AllowedImportantTimeSpan; //the next frame is within an allowable time span
+            }
+        }
+
+        protected virtual bool IsImportant([NotNull] TFrame frame) => false;
 
         /// <summary>
         /// Update the current frame based on an incoming time value.

osu.Game/Rulesets/UI/DrawableRuleset.cs

@@ -133,7 +133,7 @@ namespace osu.Game.Rulesets.UI
             return dependencies;
         }
 
-        protected virtual PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new PlayfieldAdjustmentContainer();
+        public virtual PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new PlayfieldAdjustmentContainer();
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)