Merge branch 'master' into hud_visibility

osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs

@@ -56,13 +56,17 @@ namespace osu.Game.Modes.Objects.Drawables
             Sample?.Play();
         }
 
-        protected override void LoadComplete()
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            base.LoadComplete();
-
             //we may be setting a custom judgement in test cases or what not.
             if (Judgement == null)
                 Judgement = CreateJudgement();
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
 
             //force application of the state that was set before we loaded.
             UpdateState(State);

osu.Game/Modes/UI/HitRenderer.cs

@@ -42,6 +42,16 @@ namespace osu.Game.Modes.UI
         /// </summary>
         protected readonly KeyConversionInputManager KeyConversionInputManager;
 
+        /// <summary>
+        /// Whether we are currently providing the local user a gameplay cursor.
+        /// </summary>
+        public virtual bool ProvidingUserCursor => false;
+
+        /// <summary>
+        /// Whether we have a replay loaded currently.
+        /// </summary>
+        public bool HasReplayLoaded => InputManager.ReplayInputHandler != null;
+
         /// <summary>
         /// Whether all the HitObjects have been judged.
         /// </summary>
@@ -157,6 +167,8 @@ namespace osu.Game.Modes.UI
     {
         public event Action<TJudgement> OnJudgement;
 
+        public sealed override bool ProvidingUserCursor => !HasReplayLoaded && Playfield.ProvidingUserCursor;
+
         protected override Container<Drawable> Content => content;
         protected override bool AllObjectsJudged => Playfield.HitObjects.Children.All(h => h.Judgement.Result != HitResult.None);
 

osu.Game/Modes/UI/Playfield.cs

@@ -22,6 +22,11 @@ namespace osu.Game.Modes.UI
 
         internal Container<Drawable> ScaledContent;
 
+        /// <summary>
+        /// Whether we are currently providing the local user a gameplay cursor.
+        /// </summary>
+        public virtual bool ProvidingUserCursor => false;
+
         protected override Container<Drawable> Content => content;
         private readonly Container<Drawable> content;