Merge branch 'master' into details

osu-framework

@@ -1 +1 @@
-Subproject commit 1490f003273d7aab6589e489f6e4b02d204c9f27
+Subproject commit 4caf0c918edfd9d3be0358e2b2cfc4d40908e330

osu.Desktop.VisualTests/Tests/TestCasePlayer.cs

@@ -83,10 +83,7 @@ namespace osu.Desktop.VisualTests.Tests
                 Colour = Color4.Black,
             });
 
-            Add(new PlayerLoader(Player = CreatePlayer(beatmap))
+            Add(Player = CreatePlayer(beatmap));
-            {
-                Beatmap = beatmap
-            });
         }
 
         protected virtual Player CreatePlayer(WorkingBeatmap beatmap)

osu.Desktop/Overlays/VersionManager.cs

@@ -189,19 +189,24 @@ namespace osu.Desktop.Overlays
 
         private class UpdateProgressNotification : ProgressNotification
         {
+            private OsuGame game;
+
             protected override Notification CreateCompletionNotification() => new ProgressCompletionNotification()
             {
                 Text = @"Update ready to install. Click to restart!",
                 Activated = () =>
                 {
-                    UpdateManager.RestartApp();
+                    UpdateManager.RestartAppWhenExited();
+                    game.GracefullyExit();
                     return true;
                 }
             };
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load(OsuColour colours, OsuGame game)
             {
+                this.game = game;
+
                 IconContent.Add(new Drawable[]
                 {
                     new Box

osu.Game.Modes.Osu/Scoring/OsuScoreProcessor.cs

@@ -35,11 +35,9 @@ namespace osu.Game.Modes.Osu.Scoring
                 switch (judgement.Result)
                 {
                     case HitResult.Hit:
-                        Combo.Value++;
                         Health.Value += 0.1f;
                         break;
                     case HitResult.Miss:
-                        Combo.Value = 0;
                         Health.Value -= 0.2f;
                         break;
                 }

osu.Game/Database/BeatmapInfo.cs

@@ -46,6 +46,7 @@ namespace osu.Game.Database
 
         public string Path { get; set; }
 
+        [JsonProperty("file_md5")]
         public string Hash { get; set; }
 
         // General

osu.Game/Graphics/Cursor/MenuCursor.cs

@@ -80,14 +80,12 @@ namespace osu.Game.Graphics.Cursor
         protected override void PopIn()
         {
             ActiveCursor.FadeTo(1, 250, EasingTypes.OutQuint);
-            ActiveCursor.ScaleTo(1, 1000, EasingTypes.OutElastic);
+            ActiveCursor.ScaleTo(1, 400, EasingTypes.OutQuint);
         }
 
         protected override void PopOut()
         {
-            ActiveCursor.FadeTo(0, 1400, EasingTypes.OutQuint);
+            ActiveCursor.FadeTo(0, 900, EasingTypes.OutQuint);
-            ActiveCursor.ScaleTo(1.1f, 100, EasingTypes.Out);
-            ActiveCursor.Delay(100);
             ActiveCursor.ScaleTo(0, 500, EasingTypes.In);
         }
 

osu.Game/Graphics/IHasAccentColour.cs

@@ -28,7 +28,7 @@ namespace osu.Game.Graphics
         /// <param name="easing">The tween easing.</param>
         public static void FadeAccent(this IHasAccentColour accentedDrawable, Color4 newColour, double duration = 0, EasingTypes easing = EasingTypes.None)
         {
-            accentedDrawable.TransformTo(accentedDrawable.AccentColour, newColour, duration, easing, new TransformAccent());
+            accentedDrawable.TransformTo(() => accentedDrawable.AccentColour, newColour, duration, easing, new TransformAccent());
         }
     }
 }

osu.Game/Graphics/UserInterface/RollingCounter.cs

@@ -108,8 +108,6 @@ namespace osu.Game.Graphics.UserInterface
         {
             base.LoadComplete();
 
-            Flush(false, TransformType);
-
             DisplayedCountSpriteText.Text = FormatCount(Current);
             DisplayedCountSpriteText.Anchor = Anchor;
             DisplayedCountSpriteText.Origin = Origin;
@@ -205,8 +203,8 @@ namespace osu.Game.Graphics.UserInterface
                     ? GetProportionalDuration(currentValue, newValue)
                     : RollingDuration;
 
-            transform.StartTime = Time.Current;
+            transform.StartTime = TransformStartTime;
-            transform.EndTime = Time.Current + rollingTotalDuration;
+            transform.EndTime = TransformStartTime + rollingTotalDuration;
             transform.StartValue = currentValue;
             transform.EndValue = newValue;
             transform.Easing = RollingEasing;

osu.Game/Modes/Scoring/Score.cs

@@ -27,7 +27,24 @@ namespace osu.Game.Modes.Scoring
         public int Combo { get; set; }
         public Mod[] Mods { get; set; }
 
-        public User User { get; set; }
+        private User user;
+
+        public User User
+        {
+            get
+            {
+                return user ?? new User
+                {
+                    Username = LegacyUsername,
+                    Id = LegacyUserID
+                };
+            }
+
+            set
+            {
+                user = value;
+            }
+        }
 
         [JsonProperty(@"replay_data")]
         public Replay Replay;
@@ -38,10 +55,10 @@ namespace osu.Game.Modes.Scoring
         public long OnlineScoreID;
 
         [JsonProperty(@"username")]
-        public string Username;
+        public string LegacyUsername;
 
         [JsonProperty(@"user_id")]
-        public long UserID;
+        public long LegacyUserID;
 
         [JsonProperty(@"date")]
         public DateTime Date;

osu.Game/OsuGame.cs

@@ -307,6 +307,18 @@ namespace osu.Game
             return base.OnExiting();
         }
 
+        /// <summary>
+        /// Use to programatically exit the game as if the user was triggering via alt-f4.
+        /// Will keep persisting until an exit occurs (exit may be blocked multiple times).
+        /// </summary>
+        public void GracefullyExit()
+        {
+            if (!OnExiting())
+                Exit();
+            else
+                Scheduler.AddDelayed(GracefullyExit, 2000);
+        }
+
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();

osu.Game/Overlays/DragBar.cs

@@ -65,7 +65,7 @@ namespace osu.Game.Overlays
         private void updatePosition(float position)
         {
             position = MathHelper.Clamp(position, 0, 1);
-            fill.TransformTo(fill.Width, position, 200, EasingTypes.OutQuint, new TransformSeek());
+            fill.TransformTo(() => fill.Width, position, 200, EasingTypes.OutQuint, new TransformSeek());
         }
 
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)

osu.Game/Screens/Play/Player.cs

@@ -116,7 +116,12 @@ namespace osu.Game.Screens.Play
 
             scoreProcessor = HitRenderer.CreateScoreProcessor();
 
-            hudOverlay = new StandardHudOverlay();
+            hudOverlay = new StandardHudOverlay()
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre
+            };
+
             hudOverlay.KeyCounter.Add(ruleset.CreateGameplayKeys());
             hudOverlay.BindProcessor(scoreProcessor);
             hudOverlay.BindHitRenderer(HitRenderer);
@@ -160,7 +165,12 @@ namespace osu.Game.Screens.Play
                 },
                 new HotkeyRetryOverlay
                 {
-                    Action = Restart,
+                    Action = () => {
+                        //we want to hide the hitrenderer immediately (looks better).
+                        //we may be able to remove this once the mouse cursor trail is improved.
+                        HitRenderer?.Hide();
+                        Restart();
+                    },
                 }
             };
         }
@@ -304,8 +314,7 @@ namespace osu.Game.Screens.Play
 
         protected override void OnSuspending(Screen next)
         {
-            Content.FadeOut(350);
+            fadeOut();
-            Content.ScaleTo(0.7f, 750, EasingTypes.InQuint);
 
             base.OnSuspending(next);
         }
@@ -324,14 +333,22 @@ namespace osu.Game.Screens.Play
                 }
             }
 
-            HitRenderer?.FadeOut(60);
+            fadeOut();
-
-            FadeOut(250);
-            Content.ScaleTo(0.7f, 750, EasingTypes.InQuint);
-            Background?.FadeTo(1f, 200);
             return base.OnExiting(next);
         }
 
+        private void fadeOut()
+        {
+            const float fade_out_duration = 250;
+
+            HitRenderer?.FadeOut(fade_out_duration);
+            Content.FadeOut(fade_out_duration);
+
+            hudOverlay.ScaleTo(0.7f, fade_out_duration * 3, EasingTypes.In);
+
+            Background?.FadeTo(1f, fade_out_duration);
+        }
+
         private Bindable<bool> mouseWheelDisabled;
 
         protected override bool OnWheel(InputState state) => mouseWheelDisabled.Value && !IsPaused;

osu.Game/Screens/Select/BeatmapDetailArea.cs

@@ -1,13 +1,10 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Game.Beatmaps;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
 using osu.Game.Screens.Select.Leaderboards;
 
 namespace osu.Game.Screens.Select
@@ -20,8 +17,6 @@ namespace osu.Game.Screens.Select
         public readonly BeatmapDetails Details;
         public readonly Leaderboard Leaderboard;
 
-        private APIAccess api;
-
         private WorkingBeatmap beatmap;
         public WorkingBeatmap Beatmap
         {
@@ -32,8 +27,8 @@ namespace osu.Game.Screens.Select
             set
             {
                 beatmap = value;
-                Schedule(updateDetails);
+                Leaderboard.Beatmap = beatmap?.BeatmapInfo;
-                Schedule(updateScores);
+                Details.Beatmap = beatmap.Beatmap.BeatmapInfo;
             }
         }
 
@@ -56,7 +51,6 @@ namespace osu.Game.Screens.Select
                             default:
                                 Details.Hide();
                                 Leaderboard.Show();
-                                updateScores();
                                 break;
                         }
                     },
@@ -79,45 +73,9 @@ namespace osu.Game.Screens.Select
                 Leaderboard = new Leaderboard
                 {
                     RelativeSizeAxes = Axes.Both,
+
                 }
             });
         }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            updateScores();
-        }
-
-        [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(APIAccess api)
-        {
-            this.api = api;
-        }
-
-        private GetScoresRequest getScoresRequest;
-
-        private void updateScores()
-        {
-            if (!IsLoaded) return;
-
-            Leaderboard.Scores = null;
-            getScoresRequest?.Cancel();
-
-            if (api == null || beatmap?.BeatmapInfo == null || !Leaderboard.IsPresent) return;
-
-            getScoresRequest = new GetScoresRequest(beatmap.BeatmapInfo);
-            getScoresRequest.Success += r => Leaderboard.Scores = r.Scores;
-            api.Queue(getScoresRequest);
-        }
-
-        private void updateDetails()
-        {
-            if (!IsLoaded) return;
-
-            if (api == null || beatmap?.BeatmapInfo == null) return;
-
-            Details.Beatmap = beatmap.Beatmap.BeatmapInfo;
-        }
     }
 }

osu.Game/Screens/Select/Leaderboards/Leaderboard.cs

@@ -10,7 +10,11 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using System;
+using osu.Framework.Allocation;
+using osu.Game.Database;
 using osu.Game.Modes.Scoring;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
 
 namespace osu.Game.Screens.Select.Leaderboards
 {
@@ -26,6 +30,7 @@ namespace osu.Game.Screens.Select.Leaderboards
             set
             {
                 scores = value;
+                getScoresRequest?.Cancel();
 
                 int i = 150;
                 if (scores == null)
@@ -81,6 +86,41 @@ namespace osu.Game.Screens.Select.Leaderboards
             };
         }
 
+        private APIAccess api;
+
+        private BeatmapInfo beatmap;
+
+        public BeatmapInfo Beatmap
+        {
+            get { return beatmap; }
+            set
+            {
+                beatmap = value;
+                Schedule(updateScores);
+            }
+        }
+
+        [BackgroundDependencyLoader(permitNulls: true)]
+        private void load(APIAccess api)
+        {
+            this.api = api;
+        }
+
+        private GetScoresRequest getScoresRequest;
+        private void updateScores()
+        {
+            if (!IsLoaded) return;
+
+            Scores = null;
+            getScoresRequest?.Cancel();
+
+            if (api == null || Beatmap == null) return;
+
+            getScoresRequest = new GetScoresRequest(Beatmap);
+            getScoresRequest.Success += r => Scores = r.Scores;
+            api.Queue(getScoresRequest);
+        }
+
         protected override void Update()
         {
             base.Update();

osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs

@@ -142,7 +142,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                             Children = new Drawable[]
                             {
                                 avatar = new DelayedLoadWrapper(
-                                    new Avatar(Score.User ?? new User { Id = Score.UserID })
+                                    new Avatar(Score.User)
                                     {
                                         RelativeSizeAxes = Axes.Both,
                                         CornerRadius = corner_radius,
@@ -169,7 +169,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                     {
                                         nameLabel = new OsuSpriteText
                                         {
-                                            Text = Score.User?.Username ?? Score.Username,
+                                            Text = Score.User.Username,
                                             Font = @"Exo2.0-BoldItalic",
                                             TextSize = 23,
                                         },

osu.Game/Screens/Tournament/ScrollingTeamContainer.cs

@@ -298,7 +298,7 @@ namespace osu.Game.Screens.Tournament
         private void speedTo(float value, double duration = 0, EasingTypes easing = EasingTypes.None)
         {
             DelayReset();
-            TransformTo(speed, value, duration, easing, new TransformScrollSpeed());
+            TransformTo(() => speed, value, duration, easing, new TransformScrollSpeed());
         }
 
         private enum ScrollState