Merge branch 'master' into replay-rewinding

osu-framework

@@ -1 +1 @@
-Subproject commit ff1e04024d16c0a6cabec7792573b0d019bd1bba
+Subproject commit 68e0072674c4bbc4e608120f51cd1d7e91e9500c

osu.Game.Tests/Visual/TestCaseIntroSequence.cs

@@ -0,0 +1,52 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using OpenTK.Graphics;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Timing;
+using osu.Game.Screens.Menu;
+
+namespace osu.Game.Tests.Visual
+{
+    public class TestCaseIntroSequence : OsuTestCase
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(OsuLogo),
+        };
+
+        public TestCaseIntroSequence()
+        {
+            OsuLogo logo;
+
+            var rateAdjustClock = new StopwatchClock(true);
+            var framedClock = new FramedClock(rateAdjustClock);
+            framedClock.ProcessFrame();
+
+            Add(new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Clock = framedClock,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Black,
+                    },
+                    logo = new OsuLogo
+                    {
+                        Anchor = Anchor.Centre,
+                    }
+                }
+            });
+
+            AddStep(@"Restart", logo.PlayIntro);
+            AddSliderStep("Playback speed", 0.0, 2.0, 1, v => rateAdjustClock.Rate = v);
+        }
+    }
+}

osu.Game.Tests/Visual/TestCaseOsuGame.cs

@@ -0,0 +1,39 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Timing;
+using osu.Game.Screens;
+using osu.Game.Screens.Menu;
+using OpenTK.Graphics;
+
+namespace osu.Game.Tests.Visual
+{
+    public class TestCaseOsuGame : OsuTestCase
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(OsuLogo),
+        };
+
+        public TestCaseOsuGame()
+        {
+            var rateAdjustClock = new StopwatchClock(true);
+            var framedClock = new FramedClock(rateAdjustClock);
+            framedClock.ProcessFrame();
+
+            Add(new Box
+            {
+                RelativeSizeAxes = Axes.Both,
+                Colour = Color4.Black,
+            });
+
+            Add(new Loader());
+
+            AddSliderStep("Playback speed", 0.0, 2.0, 1, v => rateAdjustClock.Rate = v);
+        }
+    }
+}

osu.Game.Tests/osu.Game.Tests.csproj

@@ -110,6 +110,7 @@
     <Compile Include="Visual\TestCaseGamefield.cs" />
     <Compile Include="Visual\TestCaseGraph.cs" />
     <Compile Include="Visual\TestCaseIconButton.cs" />
+    <Compile Include="Visual\TestCaseIntroSequence.cs" />
     <Compile Include="Visual\TestCaseKeyConfiguration.cs" />
     <Compile Include="Visual\TestCaseKeyCounter.cs" />
     <Compile Include="Visual\TestCaseLeaderboard.cs" />
@@ -121,6 +122,7 @@
     <Compile Include="Visual\TestCaseNotificationOverlay.cs" />
     <Compile Include="Visual\TestCaseOnScreenDisplay.cs" />
     <Compile Include="Visual\TestCaseAllPlayers.cs" />
+    <Compile Include="Visual\TestCaseOsuGame.cs" />
     <Compile Include="Visual\TestCasePlaySongSelect.cs" />
     <Compile Include="Visual\TestCaseReplay.cs" />
     <Compile Include="Visual\TestCaseReplaySettingsOverlay.cs" />

osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Lists;
@@ -85,6 +86,9 @@ namespace osu.Game.Beatmaps.ControlPoints
         private T binarySearch<T>(SortedList<T> list, double time, T prePoint = null)
             where T : ControlPoint, new()
         {
+            if (list == null)
+                throw new ArgumentNullException(nameof(list));
+
             if (list.Count == 0)
                 return new T();
 

osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
 
@@ -12,6 +13,9 @@ namespace osu.Game.Beatmaps.Drawables
 
         public BeatmapBackgroundSprite(WorkingBeatmap working)
         {
+             if (working == null)
+                 throw new ArgumentNullException(nameof(working));
+
             this.working = working;
         }
 

osu.Game/Beatmaps/Drawables/BeatmapGroup.cs

@@ -72,6 +72,11 @@ namespace osu.Game.Beatmaps.Drawables
 
         public BeatmapGroup(BeatmapSetInfo beatmapSet, BeatmapManager manager)
         {
+            if (beatmapSet == null)
+                throw new ArgumentNullException(nameof(beatmapSet));
+            if (manager == null)
+                throw new ArgumentNullException(nameof(manager));
+
             BeatmapSet = beatmapSet;
             WorkingBeatmap beatmap = manager.GetWorkingBeatmap(BeatmapSet.Beatmaps.FirstOrDefault());
 

osu.Game/Beatmaps/Drawables/BeatmapPanel.cs

@@ -73,6 +73,9 @@ namespace osu.Game.Beatmaps.Drawables
 
         public BeatmapPanel(BeatmapInfo beatmap)
         {
+            if (beatmap == null)
+                throw new ArgumentNullException(nameof(beatmap));
+
             Beatmap = beatmap;
             Height *= 0.60f;
 

osu.Game/Beatmaps/Drawables/BeatmapSetCover.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
@@ -12,6 +13,9 @@ namespace osu.Game.Beatmaps.Drawables
         private readonly BeatmapSetInfo set;
         public BeatmapSetCover(BeatmapSetInfo set)
         {
+            if (set == null)
+                throw new ArgumentNullException(nameof(set));
+
             this.set = set;
         }
 

osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs

@@ -36,6 +36,9 @@ namespace osu.Game.Beatmaps.Drawables
 
         public BeatmapSetHeader(WorkingBeatmap beatmap)
         {
+            if (beatmap == null)
+                throw new ArgumentNullException(nameof(beatmap));
+
             this.beatmap = beatmap;
 
             Children = new Drawable[]
@@ -88,6 +91,9 @@ namespace osu.Game.Beatmaps.Drawables
         [BackgroundDependencyLoader]
         private void load(LocalisationEngine localisation)
         {
+            if (localisation == null)
+                throw new ArgumentNullException(nameof(localisation));
+
             title.Current = localisation.GetUnicodePreference(beatmap.Metadata.TitleUnicode, beatmap.Metadata.Title);
             artist.Current = localisation.GetUnicodePreference(beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist);
         }
@@ -154,6 +160,9 @@ namespace osu.Game.Beatmaps.Drawables
 
         public void AddDifficultyIcons(IEnumerable<BeatmapPanel> panels)
         {
+            if (panels == null)
+                throw new ArgumentNullException(nameof(panels));
+
             foreach (var p in panels)
                 difficultyIcons.Add(new DifficultyIcon(p.Beatmap));
         }

osu.Game/Beatmaps/Drawables/DifficultyColouredContainer.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
@@ -23,6 +24,9 @@ namespace osu.Game.Beatmaps.Drawables
         [BackgroundDependencyLoader]
         private void load(OsuColour palette)
         {
+            if (palette == null)
+                throw new ArgumentNullException(nameof(palette));
+
             this.palette = palette;
             AccentColour = getColour(beatmap);
         }
@@ -39,6 +43,9 @@ namespace osu.Game.Beatmaps.Drawables
 
         private DifficultyRating getDifficultyRating(BeatmapInfo beatmap)
         {
+            if (beatmap == null)
+                throw new ArgumentNullException(nameof(beatmap));
+
             var rating = beatmap.StarDifficulty;
 
             if (rating < 1.5) return DifficultyRating.Easy;

osu.Game/Beatmaps/Drawables/DifficultyIcon.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
@@ -15,6 +16,9 @@ namespace osu.Game.Beatmaps.Drawables
 
         public DifficultyIcon(BeatmapInfo beatmap) : base(beatmap)
         {
+            if (beatmap == null)
+                throw new ArgumentNullException(nameof(beatmap));
+
             this.beatmap = beatmap;
             Size = new Vector2(20);
         }

osu.Game/Beatmaps/Formats/BeatmapDecoder.cs

@@ -18,6 +18,9 @@ namespace osu.Game.Beatmaps.Formats
 
         public static BeatmapDecoder GetDecoder(StreamReader stream)
         {
+            if (stream == null)
+                throw new ArgumentNullException(nameof(stream));
+
             string line;
             do { line = stream.ReadLine()?.Trim(); }
             while (line != null && line.Length == 0);

osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs

@@ -70,6 +70,11 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleGeneral(Beatmap beatmap, string line)
         {
+            if (beatmap == null)
+                throw new ArgumentNullException(nameof(beatmap));
+            if (line == null)
+                throw new ArgumentNullException(nameof(line));
+
             var pair = splitKeyVal(line, ':');
 
             var metadata = beatmap.BeatmapInfo.Metadata;
@@ -129,6 +134,11 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleEditor(Beatmap beatmap, string line)
         {
+            if (beatmap == null)
+                throw new ArgumentNullException(nameof(beatmap));
+            if (line == null)
+                throw new ArgumentNullException(nameof(line));
+
             var pair = splitKeyVal(line, ':');
 
             switch (pair.Key)
@@ -153,6 +163,11 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleMetadata(Beatmap beatmap, string line)
         {
+            if (beatmap == null)
+                throw new ArgumentNullException(nameof(beatmap));
+            if (line == null)
+                throw new ArgumentNullException(nameof(line));
+
             var pair = splitKeyVal(line, ':');
 
             var metadata = beatmap.BeatmapInfo.Metadata;
@@ -194,6 +209,11 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleDifficulty(Beatmap beatmap, string line)
         {
+            if (beatmap == null)
+                throw new ArgumentNullException(nameof(beatmap));
+            if (line == null)
+                throw new ArgumentNullException(nameof(line));
+
             var pair = splitKeyVal(line, ':');
 
             var difficulty = beatmap.BeatmapInfo.BaseDifficulty;
@@ -226,6 +246,9 @@ namespace osu.Game.Beatmaps.Formats
         /// <param name="line">The line which may contains variables.</param>
         private void decodeVariables(ref string line)
         {
+            if (line == null)
+                throw new ArgumentNullException(nameof(line));
+
             while (line.IndexOf('$') >= 0)
             {
                 string origLine = line;
@@ -244,6 +267,11 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleEvents(Beatmap beatmap, string line, ref StoryboardSprite storyboardSprite, ref CommandTimelineGroup timelineGroup)
         {
+            if (line == null)
+                throw new ArgumentNullException(nameof(line));
+            if (beatmap == null)
+                throw new ArgumentNullException(nameof(beatmap));
+
             var depth = 0;
             while (line.StartsWith(" ") || line.StartsWith("_"))
             {
@@ -469,6 +497,11 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleTimingPoints(Beatmap beatmap, string line)
         {
+            if (beatmap == null)
+                throw new ArgumentNullException(nameof(beatmap));
+            if (line == null)
+                throw new ArgumentNullException(nameof(line));
+
             string[] split = line.Split(',');
 
             double time = double.Parse(split[0].Trim(), NumberFormatInfo.InvariantInfo);
@@ -555,6 +588,11 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleColours(Beatmap beatmap, string line, ref bool hasCustomColours)
         {
+            if (beatmap == null)
+                throw new ArgumentNullException(nameof(beatmap));
+            if (line == null)
+                throw new ArgumentNullException(nameof(line));
+
             var pair = splitKeyVal(line, ':');
 
             string[] split = pair.Value.Split(',');
@@ -587,6 +625,9 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleVariables(string line)
         {
+            if (line == null)
+                throw new ArgumentNullException(nameof(line));
+
             var pair = splitKeyVal(line, '=');
             variables[pair.Key] = pair.Value;
         }
@@ -603,6 +644,11 @@ namespace osu.Game.Beatmaps.Formats
 
         protected override void ParseFile(StreamReader stream, Beatmap beatmap)
         {
+            if (beatmap == null)
+                throw new ArgumentNullException(nameof(beatmap));
+            if (stream == null)
+                throw new ArgumentNullException(nameof(stream));
+
             beatmap.BeatmapInfo.BeatmapVersion = beatmapVersion;
 
             Section section = Section.None;
@@ -679,6 +725,9 @@ namespace osu.Game.Beatmaps.Formats
 
         private KeyValuePair<string, string> splitKeyVal(string line, char separator)
         {
+            if (line == null)
+                throw new ArgumentNullException(nameof(line));
+
             var split = line.Trim().Split(new[] { separator }, 2);
 
             return new KeyValuePair<string, string>

osu.Game/Configuration/OsuConfigManager.cs

@@ -16,12 +16,12 @@ namespace osu.Game.Configuration
             Set(OsuSetting.Ruleset, 0, 0, int.MaxValue);
             Set(OsuSetting.BeatmapDetailTab, BeatmapDetailTab.Details);
 
-            Set(OsuSetting.DisplayStarsMinimum, 0.0, 0, 10);
+            Set(OsuSetting.DisplayStarsMinimum, 0.0, 0, 10, 0.1);
-            Set(OsuSetting.DisplayStarsMaximum, 10.0, 0, 10);
+            Set(OsuSetting.DisplayStarsMaximum, 10.0, 0, 10, 0.1);
 
             Set(OsuSetting.SelectionRandomType, SelectionRandomType.RandomPermutation);
 
-            Set(OsuSetting.ChatDisplayHeight, ChatOverlay.DEFAULT_HEIGHT, 0.2, 1);
+            Set(OsuSetting.ChatDisplayHeight, ChatOverlay.DEFAULT_HEIGHT, 0.2, 1, 0.01);
 
             // Online settings
             Set(OsuSetting.Username, string.Empty);
@@ -41,11 +41,11 @@ namespace osu.Game.Configuration
             Set(OsuSetting.MenuVoice, true);
             Set(OsuSetting.MenuMusic, true);
 
-            Set(OsuSetting.AudioOffset, 0, -500.0, 500.0);
+            Set(OsuSetting.AudioOffset, 0, -500.0, 500.0, 1);
 
             // Input
-            Set(OsuSetting.MenuCursorSize, 1.0, 0.5f, 2);
+            Set(OsuSetting.MenuCursorSize, 1.0, 0.5f, 2, 0.01);
-            Set(OsuSetting.GameplayCursorSize, 1.0, 0.5f, 2);
+            Set(OsuSetting.GameplayCursorSize, 1.0, 0.5f, 2, 0.01);
             Set(OsuSetting.AutoCursorSize, false);
 
             Set(OsuSetting.MouseDisableButtons, false);
@@ -63,13 +63,13 @@ namespace osu.Game.Configuration
             Set(OsuSetting.SnakingOutSliders, true);
 
             // Gameplay
-            Set(OsuSetting.DimLevel, 0.3, 0, 1);
+            Set(OsuSetting.DimLevel, 0.3, 0, 1, 0.01);
 
             Set(OsuSetting.ShowInterface, true);
             Set(OsuSetting.KeyOverlay, false);
 
             Set(OsuSetting.FloatingComments, false);
-            Set(OsuSetting.PlaybackSpeed, 1.0, 0.5f, 2);
+            Set(OsuSetting.PlaybackSpeed, 1.0, 0.5f, 2, 0.01);
 
             // Update
             Set(OsuSetting.ReleaseStream, ReleaseStream.Lazer);

osu.Game/Overlays/Profile/RankChart.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using OpenTK;
 using osu.Framework.Allocation;
@@ -33,6 +32,9 @@ namespace osu.Game.Overlays.Profile
         {
             this.user = user;
 
+            int[] userRanks = user.RankHistory?.Data ?? new[] { user.Statistics.Rank };
+            ranks = userRanks.SkipWhile(x => x == 0).ToArray();
+
             Padding = new MarginPadding { Vertical = padding };
             Children = new Drawable[]
             {
@@ -58,19 +60,21 @@ namespace osu.Game.Overlays.Profile
                     Font = @"Exo2.0-RegularItalic",
                     TextSize = secondary_textsize
                 },
-                graph = new RankChartLineGraph
+            };
+
+            if (ranks.Length > 0)
+            {
+                Add(graph = new RankChartLineGraph
                 {
                     Anchor = Anchor.BottomCentre,
                     Origin = Anchor.BottomCentre,
                     RelativeSizeAxes = Axes.X,
                     Y = -secondary_textsize,
-                    DefaultValueCount = 90,
+                    DefaultValueCount = ranks.Length,
-                    BallRelease = updateRankTexts,
+                });
-                    BallMove = showHistoryRankTexts
-                }
-            };
 
-            ranks = user.RankHistory?.Data ?? new[] { user.Statistics.Rank };
+                graph.OnBallMove += showHistoryRankTexts;
+            }
         }
 
         private void updateRankTexts()
@@ -82,7 +86,8 @@ namespace osu.Game.Overlays.Profile
 
         private void showHistoryRankTexts(int dayIndex)
         {
-            rankText.Text = ranks[dayIndex] > 0 ? $"#{ranks[dayIndex]:#,0}" : "no rank";
+            rankText.Text = $"#{ranks[dayIndex]:#,0}";
+            dayIndex++;
             relativeText.Text = dayIndex == ranks.Length ? "Now" : $"{ranks.Length - dayIndex} days ago";
             //plural should be handled in a general way
         }
@@ -90,14 +95,15 @@ namespace osu.Game.Overlays.Profile
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            graph.Colour = colours.Yellow;
+            if (graph != null)
-
-            if (user.Statistics.Rank > 0)
             {
+                graph.Colour = colours.Yellow;
                 // use logarithmic coordinates
                 graph.Values = ranks.Select(x => -(float)Math.Log(x));
-                graph.ResetBall();
+                graph.SetStaticBallPosition();
             }
+
+            updateRankTexts();
         }
 
         public override bool Invalidate(Invalidation invalidation = Invalidation.All, Drawable source = null, bool shallPropagate = true)
@@ -110,67 +116,78 @@ namespace osu.Game.Overlays.Profile
             return base.Invalidate(invalidation, source, shallPropagate);
         }
 
+        protected override bool OnHover(InputState state)
+        {
+            graph?.UpdateBallPosition(state.Mouse.Position.X);
+            graph?.ShowBall();
+            return base.OnHover(state);
+        }
+
+        protected override bool OnMouseMove(InputState state)
+        {
+            graph?.UpdateBallPosition(state.Mouse.Position.X);
+            return base.OnMouseMove(state);
+        }
+
+        protected override void OnHoverLost(InputState state)
+        {
+            if (graph != null)
+            {
+                graph.HideBall();
+                updateRankTexts();
+            }
+            base.OnHoverLost(state);
+        }
+
         private class RankChartLineGraph : LineGraph
         {
-            private readonly CircularContainer ball;
+            private const double fade_duration = 200;
-            private bool ballShown;
 
-            private const double transform_duration = 100;
+            private readonly CircularContainer staticBall;
+            private readonly CircularContainer movingBall;
 
-            public Action<int> BallMove;
+            public Action<int> OnBallMove;
-            public Action BallRelease;
 
             public RankChartLineGraph()
             {
-                Add(ball = new CircularContainer
+                Add(staticBall = new CircularContainer
                 {
+                    Origin = Anchor.Centre,
                     Size = new Vector2(8),
                     Masking = true,
-                    Origin = Anchor.Centre,
-                    Alpha = 0,
                     RelativePositionAxes = Axes.Both,
-                    Children = new Drawable[]
+                    Child = new Box { RelativeSizeAxes = Axes.Both }
-                    {
+                });
-                        new Box { RelativeSizeAxes = Axes.Both }
+                Add(movingBall = new CircularContainer
-                    }
+                {
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(8),
+                    Alpha = 0,
+                    Masking = true,
+                    RelativePositionAxes = Axes.Both,
+                    Child = new Box { RelativeSizeAxes = Axes.Both }
                 });
             }
 
-            public void ResetBall()
+            public void SetStaticBallPosition() => staticBall.Position = new Vector2(1, GetYPosition(Values.Last()));
+
+            public void UpdateBallPosition(float mouseXPosition)
             {
-                ball.MoveTo(new Vector2(1, GetYPosition(Values.Last())), ballShown ? transform_duration : 0, Easing.OutQuint);
+                int index = calculateIndex(mouseXPosition);
-                ball.Show();
+                movingBall.Position = calculateBallPosition(index);
-                BallRelease();
+                OnBallMove.Invoke(index);
-                ballShown = true;
             }
 
-            protected override bool OnMouseMove(InputState state)
+            public void ShowBall() => movingBall.FadeIn(fade_duration);
-            {
-                if (ballShown)
-                {
-                    var values = (IList<float>)Values;
-                    var position = ToLocalSpace(state.Mouse.NativeState.Position);
-                    int count = Math.Max(values.Count, DefaultValueCount);
-                    int index = (int)Math.Round(position.X / DrawWidth * (count - 1));
-                    if (index >= count - values.Count)
-                    {
-                        int i = index + values.Count - count;
-                        float y = GetYPosition(values[i]);
-                        if (Math.Abs(y * DrawHeight - position.Y) <= 8f)
-                        {
-                            ball.MoveTo(new Vector2(index / (float)(count - 1), y), transform_duration, Easing.OutQuint);
-                            BallMove(i);
-                        }
-                    }
-                }
-                return base.OnMouseMove(state);
-            }
 
-            protected override void OnHoverLost(InputState state)
+            public void HideBall() => movingBall.FadeOut(fade_duration);
+
+            private int calculateIndex(float mouseXPosition) => (int)Math.Round(mouseXPosition / DrawWidth * (DefaultValueCount - 1));
+
+            private Vector2 calculateBallPosition(int index)
             {
-                if (ballShown)
+                float y = GetYPosition(Values.ElementAt(index));
-                    ResetBall();
+                return new Vector2(index / (float)(DefaultValueCount - 1), y);
-                base.OnHoverLost(state);
             }
         }
     }

osu.Game/Overlays/Settings/SettingsItem.cs

@@ -80,7 +80,7 @@ namespace osu.Game.Overlays.Settings
                 controlWithCurrent?.Current.BindTo(bindable);
                 if (ShowsDefaultIndicator)
                 {
-                    restoreDefaultValueButton.Bindable.BindTo(bindable);
+                    restoreDefaultValueButton.Bindable = bindable.GetBoundCopy();
                     restoreDefaultValueButton.Bindable.TriggerChange();
                 }
             }
@@ -134,7 +134,17 @@ namespace osu.Game.Overlays.Settings
 
         private class RestoreDefaultValueButton<T> : Box, IHasTooltip
         {
-            internal readonly Bindable<T> Bindable = new Bindable<T>();
+            private Bindable<T> bindable;
+            internal Bindable<T> Bindable
+            {
+                get { return bindable; }
+                set
+                {
+                    bindable = value;
+                    bindable.ValueChanged += newValue => UpdateState();
+                    bindable.DisabledChanged += disabled => UpdateState();
+                }
+            }
 
             private Color4 buttonColour;
 
@@ -142,9 +152,6 @@ namespace osu.Game.Overlays.Settings
 
             public RestoreDefaultValueButton()
             {
-                Bindable.ValueChanged += value => UpdateState();
-                Bindable.DisabledChanged += disabled => UpdateState();
-
                 RelativeSizeAxes = Axes.Y;
                 Width = SettingsOverlay.CONTENT_MARGINS;
                 Alpha = 0f;
@@ -160,8 +167,8 @@ namespace osu.Game.Overlays.Settings
 
             protected override bool OnClick(InputState state)
             {
-                if (!Bindable.Disabled)
+                if (bindable != null && !bindable.Disabled)
-                    Bindable.SetDefault();
+                    bindable.SetDefault();
                 return true;
             }
 
@@ -186,8 +193,10 @@ namespace osu.Game.Overlays.Settings
 
             internal void UpdateState()
             {
-                var colour = Bindable.Disabled ? Color4.Gray : buttonColour;
+                if (bindable == null)
-                this.FadeTo(Bindable.IsDefault ? 0f : hovering && !Bindable.Disabled ? 1f : 0.5f, 200, Easing.OutQuint);
+                    return;
+                var colour = bindable.Disabled ? Color4.Gray : buttonColour;
+                this.FadeTo(bindable.IsDefault ? 0f : hovering && !bindable.Disabled ? 1f : 0.5f, 200, Easing.OutQuint);
                 this.FadeColour(ColourInfo.GradientHorizontal(colour.Opacity(0.8f), colour.Opacity(0)), 200, Easing.OutQuint);
             }
         }

osu.Game/Screens/Loader.cs

@@ -2,12 +2,17 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Game.Screens.Menu;
+using OpenTK;
+using osu.Framework.Screens;
 
 namespace osu.Game.Screens
 {
-    internal class Loader : OsuScreen
+    public class Loader : OsuScreen
     {
+        private bool showDisclaimer;
+
         public override bool ShowOverlays => false;
 
         public Loader()
@@ -15,13 +20,44 @@ namespace osu.Game.Screens
             ValidForResume = false;
         }
 
-        [BackgroundDependencyLoader]
+        protected override void LogoArriving(OsuLogo logo, bool resuming)
-        private void load(OsuGame game)
         {
-            if (game.IsDeployedBuild)
+            base.LogoArriving(logo, resuming);
+
+            logo.RelativePositionAxes = Axes.None;
+            logo.Triangles = false;
+            logo.Origin = Anchor.BottomRight;
+            logo.Anchor = Anchor.BottomRight;
+            logo.Position = new Vector2(-40);
+            logo.Scale = new Vector2(0.2f);
+
+            logo.FadeInFromZero(5000, Easing.OutQuint);
+        }
+
+        protected override void OnEntering(Screen last)
+        {
+            base.OnEntering(last);
+
+            if (showDisclaimer)
                 LoadComponentAsync(new Disclaimer(), d => Push(d));
             else
                 LoadComponentAsync(new Intro(), d => Push(d));
         }
+
+        protected override void LogoSuspending(OsuLogo logo)
+        {
+            base.LogoSuspending(logo);
+            logo.FadeOut(100).OnComplete(l =>
+            {
+                l.Anchor = Anchor.TopLeft;
+                l.Origin = Anchor.Centre;
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuGameBase game)
+        {
+            showDisclaimer = game.IsDeployedBuild;
+        }
     }
 }

osu.Game/Screens/Menu/ButtonSystem.cs

@@ -39,12 +39,25 @@ namespace osu.Game.Screens.Menu
 
         //todo: make these non-internal somehow.
         internal const float BUTTON_AREA_HEIGHT = 100;
+
         internal const float BUTTON_WIDTH = 140f;
         internal const float WEDGE_WIDTH = 20;
 
-        public const int EXIT_DELAY = 3000;
+        private OsuLogo logo;
+
+        public void SetOsuLogo(OsuLogo logo)
+        {
+            this.logo = logo;
+
+            if (this.logo != null)
+            {
+                this.logo.Action = onOsuLogo;
+
+                // osuLogo.SizeForFlow relies on loading to be complete.
+                buttonFlow.Position = new Vector2(WEDGE_WIDTH * 2 - (BUTTON_WIDTH + this.logo.SizeForFlow / 4), 0);
+            }
+        }
 
-        private readonly OsuLogo osuLogo;
         private readonly Drawable iconFacade;
         private readonly Container buttonArea;
         private readonly Box buttonAreaBackground;
@@ -99,12 +112,6 @@ namespace osu.Game.Screens.Menu
                         }
                     }
                 },
-                osuLogo = new OsuLogo
-                {
-                    Action = onOsuLogo,
-                    Origin = Anchor.Centre,
-                    Anchor = Anchor.Centre,
-                }
             };
 
             buttonsPlay.Add(new Button(@"solo", @"select-6", FontAwesome.fa_user, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
@@ -127,14 +134,6 @@ namespace osu.Game.Screens.Menu
             sampleBack = audio.Sample.Get(@"Menu/select-4");
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            // osuLogo.SizeForFlow relies on loading to be complete.
-            buttonFlow.Position = new Vector2(WEDGE_WIDTH * 2 - (BUTTON_WIDTH + osuLogo.SizeForFlow / 4), 0);
-        }
-
         protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
         {
             if (args.Repeat) return false;
@@ -142,7 +141,7 @@ namespace osu.Game.Screens.Menu
             switch (args.Key)
             {
                 case Key.Space:
-                    osuLogo.TriggerOnClick(state);
+                    logo?.TriggerOnClick(state);
                     return true;
                 case Key.Escape:
                     switch (State)
@@ -215,24 +214,31 @@ namespace osu.Game.Screens.Menu
                 backButton.ContractStyle = 0;
                 settingsButton.ContractStyle = 0;
 
-                bool fromInitial = lastState == MenuState.Initial;
-
                 if (state == MenuState.TopLevel)
                     buttonArea.FinishTransforms(true);
 
-                using (buttonArea.BeginDelayedSequence(fromInitial ? 150 : 0, true))
+                using (buttonArea.BeginDelayedSequence(lastState == MenuState.Initial ? 150 : 0, true))
                 {
                     switch (state)
                     {
                         case MenuState.Exit:
                         case MenuState.Initial:
+                            trackingPosition = false;
+
                             buttonAreaBackground.ScaleTo(Vector2.One, 500, Easing.Out);
                             buttonArea.FadeOut(300);
 
-                            osuLogo.Delay(150)
+                            logo?.Delay(150)
-                                .Schedule(() => toolbar?.Hide())
+                                .Schedule(() =>
-                                .ScaleTo(1, 800, Easing.OutExpo)
+                                {
-                                .MoveTo(Vector2.Zero, 800, Easing.OutExpo);
+                                    toolbar?.Hide();
+
+                                    logo.ClearTransforms(targetMember: nameof(Position));
+                                    logo.RelativePositionAxes = Axes.Both;
+
+                                    logo.MoveTo(new Vector2(0.5f), 800, Easing.OutExpo);
+                                    logo.ScaleTo(1, 800, Easing.OutExpo);
+                                });
 
                             foreach (Button b in buttonsTopLevel)
                                 b.State = ButtonState.Contracted;
@@ -240,27 +246,38 @@ namespace osu.Game.Screens.Menu
                             foreach (Button b in buttonsPlay)
                                 b.State = ButtonState.Contracted;
 
-                            if (state == MenuState.Exit)
+                            if (state != MenuState.Exit && lastState == MenuState.TopLevel)
-                            {
-                                osuLogo.RotateTo(20, EXIT_DELAY * 1.5f);
-                                osuLogo.FadeOut(EXIT_DELAY);
-                            }
-                            else if (lastState == MenuState.TopLevel)
                                 sampleBack?.Play();
                             break;
                         case MenuState.TopLevel:
                             buttonAreaBackground.ScaleTo(Vector2.One, 200, Easing.Out);
 
-                            var sequence = osuLogo
+                            logo.ClearTransforms(targetMember: nameof(Position));
-                                .ScaleTo(0.5f, 200, Easing.In)
+                            logo.RelativePositionAxes = Axes.None;
-                                .MoveTo(buttonFlow.DrawPosition, 200, Easing.In);
 
-                            if (fromInitial && osuLogo.Scale.X > 0.5f)
+                            trackingPosition = true;
-                                sequence.OnComplete(o =>
+
-                                {
+                            switch (lastState)
-                                    o.Impact();
+                            {
-                                    toolbar?.Show();
+                                case MenuState.Initial:
-                                });
+                                    logo.ScaleTo(0.5f, 200, Easing.In);
+
+                                    trackingPosition = false;
+
+                                    logo
+                                        .MoveTo(iconTrackingPosition, lastState == MenuState.EnteringMode ? 0 : 200, Easing.In)
+                                        .OnComplete(o =>
+                                        {
+                                            trackingPosition = true;
+
+                                            o.Impact();
+                                            toolbar?.Show();
+                                        });
+                                    break;
+                                default:
+                                    logo.ScaleTo(0.5f, 200, Easing.OutQuint);
+                                    break;
+                            }
 
                             buttonArea.FadeIn(300);
 
@@ -280,6 +297,8 @@ namespace osu.Game.Screens.Menu
                         case MenuState.EnteringMode:
                             buttonAreaBackground.ScaleTo(new Vector2(2, 0), 300, Easing.InSine);
 
+                            trackingPosition = true;
+
                             buttonsTopLevel.ForEach(b => b.ContractStyle = 1);
                             buttonsPlay.ForEach(b => b.ContractStyle = 1);
                             backButton.ContractStyle = 1;
@@ -301,15 +320,24 @@ namespace osu.Game.Screens.Menu
             }
         }
 
+        private Vector2 iconTrackingPosition => logo.Parent.ToLocalSpace(iconFacade.ScreenSpaceDrawQuad.Centre);
+
+        private bool trackingPosition;
+
         protected override void Update()
         {
             //if (OsuGame.IdleTime > 6000 && State != MenuState.Exit)
             //    State = MenuState.Initial;
 
-            osuLogo.Interactive = Alpha > 0.2f;
-
-            iconFacade.Width = osuLogo.SizeForFlow * 0.5f;
             base.Update();
+
+            if (logo != null)
+            {
+                if (trackingPosition)
+                    logo.Position = iconTrackingPosition;
+
+                iconFacade.Width = logo.SizeForFlow * 0.5f;
+            }
         }
     }
 

osu.Game/Screens/Menu/Intro.cs

@@ -14,13 +14,14 @@ using osu.Game.Beatmaps.IO;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osu.Game.Screens.Backgrounds;
+using OpenTK;
 using OpenTK.Graphics;
 
 namespace osu.Game.Screens.Menu
 {
     public class Intro : OsuScreen
     {
-        private readonly OsuLogo logo;
+        private readonly IntroSequence introSequence;
 
         private const string menu_music_beatmap_hash = "3c8b1fcc9434dbb29e2fb613d3b9eada9d7bb6c125ceb32396c3b53437280c83";
 
@@ -39,32 +40,10 @@ namespace osu.Game.Screens.Menu
 
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenEmpty();
 
-        public Intro()
-        {
-            Children = new Drawable[]
-            {
-                new ParallaxContainer
-                {
-                    ParallaxAmount = 0.01f,
-                    Children = new Drawable[]
-                    {
-                        logo = new OsuLogo
-                        {
-                            Alpha = 0,
-                            Triangles = false,
-                            Blending = BlendingMode.Additive,
-                            Interactive = false,
-                            Colour = Color4.DarkGray,
-                            Ripple = false
-                        }
-                    }
-                }
-            };
-        }
-
         private Bindable<bool> menuVoice;
         private Bindable<bool> menuMusic;
         private Track track;
+        private readonly ParallaxContainer parallax;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, OsuConfigManager config, BeatmapManager beatmaps, Framework.Game game)
@@ -99,7 +78,9 @@ namespace osu.Game.Screens.Menu
 
             welcome = audio.Sample.Get(@"welcome");
             seeya = audio.Sample.Get(@"seeya");
-            beatmaps.Delete(setInfo);
+
+            if (setInfo.Protected)
+                beatmaps.Delete(setInfo);
         }
 
         protected override void OnEntering(Screen last)
@@ -121,14 +102,48 @@ namespace osu.Game.Screens.Menu
                 {
                     DidLoadMenu = true;
                     Push(mainMenu);
-                }, 2300);
+                }, delay_step_one);
-            }, 600);
+            }, delay_step_two);
+        }
 
-            logo.ScaleTo(0.4f);
+        private const double delay_step_one = 2300;
-            logo.FadeOut();
+        private const double delay_step_two = 600;
 
-            logo.ScaleTo(1, 4400, Easing.OutQuint);
+        public const int EXIT_DELAY = 3000;
-            logo.FadeIn(20000, Easing.OutQuint);
+
+        protected override void LogoArriving(OsuLogo logo, bool resuming)
+        {
+            base.LogoArriving(logo, resuming);
+
+            logo.RelativePositionAxes = Axes.Both;
+            logo.Colour = Color4.White;
+            logo.Ripple = false;
+
+            const int quick_appear = 350;
+
+            int initialMovementTime = logo.Alpha > 0.2f ? quick_appear : 0;
+
+            logo.MoveTo(new Vector2(0.5f), initialMovementTime, Easing.OutQuint);
+
+            if (!resuming)
+            {
+                logo.Triangles = true;
+
+                logo.ScaleTo(1);
+                logo.FadeIn();
+                logo.PlayIntro();
+            }
+            else
+            {
+                logo.Triangles = false;
+
+                logo
+                    .ScaleTo(1, initialMovementTime, Easing.OutQuint)
+                    .FadeIn(quick_appear, Easing.OutQuint)
+                    .Then()
+                    .RotateTo(20, EXIT_DELAY * 1.5f)
+                    .FadeOut(EXIT_DELAY);
+            }
         }
 
         protected override void OnSuspending(Screen next)
@@ -148,7 +163,7 @@ namespace osu.Game.Screens.Menu
             if (!(last is MainMenu))
                 Content.FadeIn(300);
 
-            double fadeOutTime = 2000;
+            double fadeOutTime = EXIT_DELAY;
             //we also handle the exit transition.
             if (menuVoice)
                 seeya.Play();

osu.Game/Screens/Menu/IntroSequence.cs

@@ -0,0 +1,297 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Linq;
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Screens.Menu
+{
+    public class IntroSequence : Container
+    {
+        private const float logo_size = 460; //todo: this should probably be 480
+
+        private OsuSpriteText welcomeText;
+
+        private Container<Box> lines;
+
+        private Box lineTopLeft;
+        private Box lineBottomLeft;
+        private Box lineTopRight;
+        private Box lineBottomRight;
+
+        private Ring smallRing;
+        private Ring mediumRing;
+        private Ring bigRing;
+
+        private Box backgroundFill;
+        private Box foregroundFill;
+
+        private CircularContainer pinkCircle;
+        private CircularContainer blueCircle;
+        private CircularContainer yellowCircle;
+        private CircularContainer purpleCircle;
+
+        public IntroSequence()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            const int line_offset = 80;
+            const int circle_offset = 250;
+
+            Children = new Drawable[]
+            {
+                lines = new Container<Box>
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    AutoSizeAxes = Axes.Both,
+                    Children = new []
+                    {
+                        lineTopLeft = new Box
+                        {
+                            Origin = Anchor.CentreLeft,
+                            Anchor = Anchor.Centre,
+                            Position = new Vector2(-line_offset, -line_offset),
+                            Rotation = 45,
+                            Colour = Color4.White.Opacity(180),
+                        },
+                        lineTopRight = new Box
+                        {
+                            Origin = Anchor.CentreRight,
+                            Anchor = Anchor.Centre,
+                            Position = new Vector2(line_offset, -line_offset),
+                            Rotation = -45,
+                            Colour = Color4.White.Opacity(80),
+                        },
+                        lineBottomLeft = new Box
+                        {
+                            Origin = Anchor.CentreLeft,
+                            Anchor = Anchor.Centre,
+                            Position = new Vector2(-line_offset, line_offset),
+                            Rotation = -45,
+                            Colour = Color4.White.Opacity(230),
+                        },
+                        lineBottomRight = new Box
+                        {
+                            Origin = Anchor.CentreRight,
+                            Anchor = Anchor.Centre,
+                            Position = new Vector2(line_offset, line_offset),
+                            Rotation = 45,
+                            Colour = Color4.White.Opacity(130),
+                        },
+                    }
+                },
+                bigRing = new Ring(OsuColour.FromHex(@"B6C5E9"), 0.85f),
+                mediumRing = new Ring(Color4.White.Opacity(130), 0.7f),
+                smallRing = new Ring(Color4.White, 0.6f),
+                welcomeText = new OsuSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Text = "welcome",
+                    Padding = new MarginPadding { Bottom = 10 },
+                    Font = @"Exo2.0-Light",
+                    Alpha = 0,
+                    TextSize = 42,
+                    Spacing = new Vector2(5),
+                },
+                new CircularContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(logo_size),
+                    Masking = true,
+                    Children = new Drawable[]
+                    {
+                        backgroundFill = new Box
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            RelativeSizeAxes = Axes.Both,
+                            Height = 0,
+                            Colour = OsuColour.FromHex(@"C6D8FF").Opacity(160),
+                        },
+                        foregroundFill = new Box
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Size = Vector2.Zero,
+                            RelativeSizeAxes = Axes.Both,
+                            Width = 0,
+                            Colour = Color4.White,
+                        },
+                    }
+                },
+                purpleCircle = new Circle
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.TopCentre,
+                    Position = new Vector2(0, circle_offset),
+                    Colour = OsuColour.FromHex(@"AA92FF"),
+                },
+                blueCircle = new Circle
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.CentreRight,
+                    Position = new Vector2(-circle_offset, 0),
+                    Colour = OsuColour.FromHex(@"8FE5FE"),
+                },
+                yellowCircle = new Circle
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.BottomCentre,
+                    Position = new Vector2(0, -circle_offset),
+                    Colour = OsuColour.FromHex(@"FFD64C"),
+                },
+                pinkCircle = new Circle
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.CentreLeft,
+                    Position = new Vector2(circle_offset, 0),
+                    Colour = OsuColour.FromHex(@"e967a1"),
+                },
+            };
+
+            foreach (var line in lines)
+            {
+                line.Size = new Vector2(105, 1.5f);
+                line.Alpha = 0;
+            }
+
+            Scale = new Vector2(0.5f);
+        }
+
+        public void Start(double length)
+        {
+            if (Children.Any())
+            {
+                // restart if we were already run previously.
+                FinishTransforms(true);
+                load();
+            }
+
+            smallRing.ResizeTo(logo_size * 0.086f, 400, Easing.InOutQuint);
+
+            mediumRing.ResizeTo(130, 340, Easing.OutQuad);
+            mediumRing.Foreground.ResizeTo(1, 880, Easing.Out);
+
+            Func<double> remainingTime = () => length - TransformDelay;
+
+            using (BeginDelayedSequence(250, true))
+            {
+                welcomeText.FadeIn(700);
+                welcomeText.TransformSpacingTo(new Vector2(20, 0), remainingTime(), Easing.Out);
+
+                const int line_duration = 700;
+                const int line_resize = 150;
+
+                foreach (var line in lines)
+                {
+                    line.FadeIn(40).ResizeWidthTo(0, line_duration - line_resize, Easing.OutQuint);
+                }
+
+                const int line_end_offset = 120;
+
+                smallRing.Foreground.ResizeTo(1, line_duration, Easing.OutQuint);
+
+                lineTopLeft.MoveTo(new Vector2(-line_end_offset, -line_end_offset), line_duration, Easing.OutQuint);
+                lineTopRight.MoveTo(new Vector2(line_end_offset, -line_end_offset), line_duration, Easing.OutQuint);
+                lineBottomLeft.MoveTo(new Vector2(-line_end_offset, line_end_offset), line_duration, Easing.OutQuint);
+                lineBottomRight.MoveTo(new Vector2(line_end_offset, line_end_offset), line_duration, Easing.OutQuint);
+
+                using (BeginDelayedSequence(length * 0.56, true))
+                {
+                    bigRing.ResizeTo(logo_size, 500, Easing.InOutQuint);
+                    bigRing.Foreground.Delay(250).ResizeTo(1, 850, Easing.OutQuint);
+
+                    using (BeginDelayedSequence(250, true))
+                    {
+                        backgroundFill.ResizeHeightTo(1, remainingTime(), Easing.InOutQuart);
+                        backgroundFill.RotateTo(-90, remainingTime(), Easing.InOutQuart);
+
+                        using (BeginDelayedSequence(50, true))
+                        {
+                            foregroundFill.ResizeWidthTo(1, remainingTime(), Easing.InOutQuart);
+                            foregroundFill.RotateTo(-90, remainingTime(), Easing.InOutQuart);
+                        }
+
+                        this.ScaleTo(1, remainingTime(), Easing.InOutCubic);
+
+                        const float circle_size = logo_size * 0.9f;
+
+                        const int rotation_delay = 110;
+                        const int appear_delay = 80;
+
+                        purpleCircle.MoveToY(circle_size / 2, remainingTime(), Easing.InOutQuart);
+                        purpleCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.InOutQuart);
+                        purpleCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuart);
+
+                        using (BeginDelayedSequence(appear_delay, true))
+                        {
+                            yellowCircle.MoveToY(-circle_size / 2, remainingTime(), Easing.InOutQuart);
+                            yellowCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.InOutQuart);
+                            yellowCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuart);
+
+                            using (BeginDelayedSequence(appear_delay, true))
+                            {
+                                blueCircle.MoveToX(-circle_size / 2, remainingTime(), Easing.InOutQuart);
+                                blueCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.InOutQuart);
+                                blueCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuart);
+
+                                using (BeginDelayedSequence(appear_delay, true))
+                                {
+                                    pinkCircle.MoveToX(circle_size / 2, remainingTime(), Easing.InOutQuart);
+                                    pinkCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.InOutQuart);
+                                    pinkCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuart);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        private class Ring : Container<Circle>
+        {
+            public readonly Circle Foreground;
+
+            public Ring(Color4 ringColour, float foregroundSize)
+            {
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+                Children = new[]
+                {
+                    new Circle
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        Scale = new Vector2(0.98f),
+                        Colour = ringColour,
+                    },
+                    Foreground = new Circle
+                    {
+                        Size = new Vector2(foregroundSize),
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Black,
+                    }
+                };
+            }
+        }
+    }
+}

osu.Game/Screens/Menu/LogoVisualisation.cs

@@ -19,7 +19,7 @@ using osu.Framework.Allocation;
 
 namespace osu.Game.Screens.Menu
 {
-    internal class LogoVisualisation : Drawable, IHasAccentColour
+    public class LogoVisualisation : Drawable, IHasAccentColour
     {
         private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
 

osu.Game/Screens/Menu/MainMenu.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using OpenTK;
+using OpenTK.Graphics;
 using OpenTK.Input;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -58,13 +59,16 @@ namespace osu.Game.Screens.Menu
             };
         }
 
-        [BackgroundDependencyLoader]
+        [BackgroundDependencyLoader(true)]
-        private void load(OsuGame game)
+        private void load(OsuGame game = null)
         {
             LoadComponentAsync(background);
 
-            buttons.OnSettings = game.ToggleSettings;
+            if (game != null)
-            buttons.OnDirect = game.ToggleDirect;
+            {
+                buttons.OnSettings = game.ToggleSettings;
+                buttons.OnDirect = game.ToggleDirect;
+            }
 
             preloadSongSelect();
         }
@@ -102,6 +106,29 @@ namespace osu.Game.Screens.Menu
             Beatmap.ValueChanged += beatmap_ValueChanged;
         }
 
+        protected override void LogoArriving(OsuLogo logo, bool resuming)
+        {
+            base.LogoArriving(logo, resuming);
+
+            buttons.SetOsuLogo(logo);
+
+            logo.Triangles = true;
+            logo.Ripple = false;
+
+            logo.FadeColour(Color4.White, 100, Easing.OutQuint);
+            logo.FadeIn(100, Easing.OutQuint);
+
+            if (resuming)
+                buttons.State = MenuState.TopLevel;
+        }
+
+        protected override void LogoSuspending(OsuLogo logo)
+        {
+            logo.FadeOut(300, Easing.InSine)
+                .ScaleTo(0.2f, 300, Easing.InSine)
+                .OnComplete(l => buttons.SetOsuLogo(null));
+        }
+
         private void beatmap_ValueChanged(WorkingBeatmap newValue)
         {
             if (!IsCurrentScreen)
@@ -135,8 +162,6 @@ namespace osu.Game.Screens.Menu
 
             const float length = 300;
 
-            buttons.State = MenuState.TopLevel;
-
             Content.FadeIn(length, Easing.OutQuint);
             Content.MoveTo(new Vector2(0, 0), length, Easing.OutQuint);
 

osu.Game/Screens/Menu/OsuLogo.cs

@@ -29,6 +29,8 @@ namespace osu.Game.Screens.Menu
     {
         public readonly Color4 OsuPink = OsuColour.FromHex(@"e967a1");
 
+        private const double transition_length = 300;
+
         private readonly Sprite logo;
         private readonly CircularContainer logoContainer;
         private readonly Container logoBounceContainer;
@@ -37,6 +39,8 @@ namespace osu.Game.Screens.Menu
         private readonly Container logoHoverContainer;
         private readonly LogoVisualisation visualizer;
 
+        private readonly IntroSequence intro;
+
         private SampleChannel sampleClick;
         private SampleChannel sampleBeat;
 
@@ -54,7 +58,7 @@ namespace osu.Game.Screens.Menu
 
         public bool Triangles
         {
-            set { colourAndTriangles.Alpha = value ? 1 : 0; }
+            set { colourAndTriangles.FadeTo(value ? 1 : 0, transition_length, Easing.OutQuint); }
         }
 
         public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => logoContainer.ReceiveMouseInputAt(screenSpacePos);
@@ -62,10 +66,9 @@ namespace osu.Game.Screens.Menu
         public bool Ripple
         {
             get { return rippleContainer.Alpha > 0; }
-            set { rippleContainer.Alpha = value ? 1 : 0; }
+            set { rippleContainer.FadeTo(value ? 1 : 0, transition_length, Easing.OutQuint); }
         }
 
-        public bool Interactive = true;
         private readonly Box flashLayer;
 
         private readonly Container impactContainer;
@@ -76,17 +79,23 @@ namespace osu.Game.Screens.Menu
 
         public OsuLogo()
         {
+            // Required to make Schedule calls run in OsuScreen even when we are not visible.
+            AlwaysPresent = true;
+
             EarlyActivationMilliseconds = early_activation;
 
             Size = new Vector2(default_size);
 
-            Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
             AutoSizeAxes = Axes.Both;
 
             Children = new Drawable[]
             {
+                intro = new IntroSequence
+                {
+                    RelativeSizeAxes = Axes.Both,
+                },
                 logoHoverContainer = new Container
                 {
                     AutoSizeAxes = Axes.Both,
@@ -266,6 +275,17 @@ namespace osu.Game.Screens.Menu
             }
         }
 
+        public void PlayIntro()
+        {
+            const double length = 3150;
+            const double fade = 200;
+
+            logoHoverContainer.FadeOut().Delay(length).FadeIn(fade);
+            intro.Show();
+            intro.Start(length);
+            intro.Delay(length + fade).FadeOut();
+        }
+
         protected override void Update()
         {
             base.Update();
@@ -290,9 +310,11 @@ namespace osu.Game.Screens.Menu
             }
         }
 
+        private bool interactive => Action != null && Alpha > 0.2f;
+
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
         {
-            if (!Interactive) return false;
+            if (!interactive) return false;
 
             logoBounceContainer.ScaleTo(0.9f, 1000, Easing.Out);
             return true;
@@ -306,7 +328,7 @@ namespace osu.Game.Screens.Menu
 
         protected override bool OnClick(InputState state)
         {
-            if (!Interactive) return false;
+            if (!interactive) return false;
 
             sampleClick.Play();
 
@@ -320,7 +342,7 @@ namespace osu.Game.Screens.Menu
 
         protected override bool OnHover(InputState state)
         {
-            if (!Interactive) return false;
+            if (!interactive) return false;
 
             logoHoverContainer.ScaleTo(1.1f, 500, Easing.OutElastic);
             return true;

osu.Game/Screens/OsuScreen.cs

@@ -10,7 +10,9 @@ using osu.Game.Graphics.Containers;
 using OpenTK;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Audio;
+using osu.Framework.Graphics;
 using osu.Game.Rulesets;
+using osu.Game.Screens.Menu;
 
 namespace osu.Game.Screens
 {
@@ -30,6 +32,8 @@ namespace osu.Game.Screens
 
         public virtual bool HasLocalCursorDisplayed => false;
 
+        private OsuLogo logo;
+
         /// <summary>
         /// Whether the beatmap or ruleset should be allowed to be changed by the user or game.
         /// Used to mark exclusive areas where this is strongly prohibited, like gameplay.
@@ -72,9 +76,16 @@ namespace osu.Game.Screens
         protected override void OnResuming(Screen last)
         {
             base.OnResuming(last);
+            logo.DelayUntilTransformsFinished().Schedule(() => LogoArriving(logo, true));
             sampleExit?.Play();
         }
 
+        protected override void OnSuspending(Screen next)
+        {
+            base.OnSuspending(next);
+            onSuspendingLogo();
+        }
+
         protected override void OnEntering(Screen last)
         {
             OsuScreen lastOsu = last as OsuScreen;
@@ -106,11 +117,19 @@ namespace osu.Game.Screens
                 });
             }
 
+            if ((logo = lastOsu?.logo) == null)
+                AddInternal(logo = new OsuLogo());
+
             base.OnEntering(last);
+
+            logo.DelayUntilTransformsFinished().Schedule(() => LogoArriving(logo, false));
         }
 
         protected override bool OnExiting(Screen next)
         {
+            if (ValidForResume && logo != null)
+                onExitingLogo();
+
             OsuScreen nextOsu = next as OsuScreen;
 
             if (Background != null && !Background.Equals(nextOsu?.Background))
@@ -128,5 +147,40 @@ namespace osu.Game.Screens
             Beatmap.UnbindAll();
             return false;
         }
+
+        /// <summary>
+        /// Fired when this screen was entered or resumed and the logo state is required to be adjusted.
+        /// </summary>
+        protected virtual void LogoArriving(OsuLogo logo, bool resuming)
+        {
+            logo.Action = null;
+            logo.FadeOut(300, Easing.OutQuint);
+        }
+
+        private void onExitingLogo()
+        {
+            logo.ClearTransforms();
+            LogoExiting(logo);
+        }
+
+        /// <summary>
+        /// Fired when this screen was exited to add any outwards transition to the logo.
+        /// </summary>
+        protected virtual void LogoExiting(OsuLogo logo)
+        {
+        }
+
+        private void onSuspendingLogo()
+        {
+            logo.ClearTransforms();
+            LogoSuspending(logo);
+        }
+
+        /// <summary>
+        /// Fired when this screen was suspended to add any outwards transition to the logo.
+        /// </summary>
+        protected virtual void LogoSuspending(OsuLogo logo)
+        {
+        }
     }
 }

osu.Game/Screens/Play/PlayerLoader.cs

@@ -10,9 +10,9 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Screens.Backgrounds;
-using osu.Game.Screens.Menu;
 using OpenTK;
 using osu.Framework.Localisation;
+using osu.Game.Screens.Menu;
 
 namespace osu.Game.Screens.Play
 {
@@ -20,7 +20,6 @@ namespace osu.Game.Screens.Play
     {
         private Player player;
 
-        private readonly OsuLogo logo;
         private BeatmapMetadataDisplay info;
 
         private bool showOverlays = true;
@@ -39,15 +38,6 @@ namespace osu.Game.Screens.Play
                 showOverlays = false;
                 ValidForResume = true;
             };
-
-            Children = new Drawable[]
-            {
-                logo = new OsuLogo
-                {
-                    Scale = new Vector2(0.15f),
-                    Interactive = false,
-                },
-            };
         }
 
         [BackgroundDependencyLoader]
@@ -101,11 +91,24 @@ namespace osu.Game.Screens.Play
 
             contentIn();
 
-            logo.Delay(500).MoveToOffset(new Vector2(0, -180), 500, Easing.InOutExpo);
             info.Delay(750).FadeIn(500);
             this.Delay(2150).Schedule(pushWhenLoaded);
         }
 
+        protected override void LogoArriving(OsuLogo logo, bool resuming)
+        {
+            base.LogoArriving(logo, resuming);
+
+            logo.ClearTransforms(targetMember: nameof(Position));
+            logo.RelativePositionAxes = Axes.Both;
+
+            logo.ScaleTo(new Vector2(0.15f), 300, Easing.In);
+            logo.MoveTo(new Vector2(0.5f), 300, Easing.In);
+            logo.FadeIn(350);
+
+            logo.Delay(resuming ? 0 : 500).MoveToOffset(new Vector2(0, -0.24f), 500, Easing.InOutExpo);
+        }
+
         private void pushWhenLoaded()
         {
             if (player.LoadState != LoadState.Ready)

osu.Game/Screens/Select/BeatmapCarousel.cs

@@ -186,13 +186,18 @@ namespace osu.Game.Screens.Select
 
         public Action<BeatmapInfo> HideDifficultyRequested;
 
+        private void selectNullBeatmap()
+        {
+            selectedGroup = null;
+            selectedPanel = null;
+            SelectionChanged?.Invoke(null);
+        }
+
         public void SelectNext(int direction = 1, bool skipDifficulties = true)
         {
             if (groups.All(g => g.State == BeatmapGroupState.Hidden))
             {
-                selectedGroup = null;
+                selectNullBeatmap();
-                selectedPanel = null;
-                SelectionChanged?.Invoke(null);
                 return;
             }
 
@@ -383,6 +388,14 @@ namespace osu.Game.Screens.Select
             if (group == null)
                 return;
 
+            if (selectedGroup == group)
+            {
+                if (getVisibleGroups().Count() == 1)
+                    selectNullBeatmap();
+                else
+                    SelectNext();
+            }
+
             groups.Remove(group);
             panels.Remove(group.Header);
             foreach (var p in group.BeatmapPanels)
@@ -391,9 +404,6 @@ namespace osu.Game.Screens.Select
             scrollableContent.Remove(group.Header);
             scrollableContent.RemoveRange(group.BeatmapPanels);
 
-            if (selectedGroup == group)
-                SelectNext();
-
             computeYPositions();
         }
 

osu.Game/Screens/Select/Footer.cs

@@ -13,7 +13,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Screens.Menu;
 
 namespace osu.Game.Screens.Select
 {
@@ -31,12 +30,9 @@ namespace osu.Game.Screens.Select
         private const float padding = 80;
 
         public Action OnBack;
-        public Action OnStart;
 
         private readonly FillFlowContainer<FooterButton> buttons;
 
-        public OsuLogo StartButton;
-
         /// <param name="text">Text on the button.</param>
         /// <param name="colour">Colour of the button.</param>
         /// <param name="hotkey">Hotkey of the button.</param>
@@ -106,13 +102,6 @@ namespace osu.Game.Screens.Select
                     Height = 3,
                     Position = new Vector2(0, -3),
                 },
-                StartButton = new OsuLogo
-                {
-                    Anchor = Anchor.BottomRight,
-                    Scale = new Vector2(0.4f),
-                    Position = new Vector2(-70, -25),
-                    Action = () => OnStart?.Invoke()
-                },
                 new BackButton
                 {
                     Anchor = Anchor.BottomLeft,
@@ -143,8 +132,6 @@ namespace osu.Game.Screens.Select
             updateModeLight();
         }
 
-        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => base.ReceiveMouseInputAt(screenSpacePos) || StartButton.ReceiveMouseInputAt(screenSpacePos);
-
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true;
 
         protected override bool OnClick(InputState state) => true;

osu.Game/Screens/Select/SongSelect.cs

@@ -20,6 +20,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Overlays;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
+using osu.Game.Screens.Menu;
 using osu.Game.Screens.Select.Options;
 
 namespace osu.Game.Screens.Select
@@ -153,7 +154,6 @@ namespace osu.Game.Screens.Select
                 Add(Footer = new Footer
                 {
                     OnBack = Exit,
-                    OnStart = () => carouselRaisedStart(),
                 });
 
                 FooterPanels.Add(BeatmapOptions = new BeatmapOptionsOverlay());
@@ -309,6 +309,41 @@ namespace osu.Game.Screens.Select
             FilterControl.Activate();
         }
 
+        private const double logo_transition = 250;
+
+        protected override void LogoArriving(OsuLogo logo, bool resuming)
+        {
+            base.LogoArriving(logo, resuming);
+
+            logo.ClearTransforms();
+            logo.RelativePositionAxes = Axes.Both;
+
+            Vector2 position = new Vector2(0.95f, 0.96f);
+
+            if (logo.Alpha > 0.8f)
+            {
+                logo.MoveTo(position, 500, Easing.OutQuint);
+            }
+            else
+            {
+                logo.Hide();
+                logo.ScaleTo(0.2f);
+                logo.MoveTo(position);
+            }
+
+            logo.FadeIn(logo_transition, Easing.OutQuint);
+            logo.ScaleTo(0.4f, logo_transition, Easing.OutQuint);
+
+            logo.Action = () => carouselRaisedStart();
+        }
+
+        protected override void LogoExiting(OsuLogo logo)
+        {
+            base.LogoExiting(logo);
+            logo.ScaleTo(0.2f, logo_transition, Easing.OutQuint);
+            logo.FadeOut(logo_transition, Easing.OutQuint);
+        }
+
         private void beatmap_ValueChanged(WorkingBeatmap beatmap)
         {
             if (!IsCurrentScreen) return;
@@ -350,6 +385,7 @@ namespace osu.Game.Screens.Select
             Content.FadeOut(100);
 
             FilterControl.Deactivate();
+
             return base.OnExiting(next);
         }
 

osu.Game/Users/Avatar.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -25,6 +26,9 @@ namespace osu.Game.Users
         [BackgroundDependencyLoader]
         private void load(TextureStore textures)
         {
+            if (textures == null)
+                throw new ArgumentNullException(nameof(textures));
+
             Texture texture = null;
             if (user != null && user.Id > 1) texture = textures.Get($@"https://a.ppy.sh/{user.Id}");
             if (texture == null) texture = textures.Get(@"Online/avatar-guest");

osu.Game/Users/Country.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System;
 using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -45,6 +46,9 @@ namespace osu.Game.Users
         [BackgroundDependencyLoader]
         private void load(TextureStore ts)
         {
+            if (ts == null)
+                throw new ArgumentNullException(nameof(ts));
+
             textures = ts;
             sprite.Texture = textures.Get($@"Flags/{flagName}");
         }

osu.Game/Users/UserCoverBackground.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
@@ -19,6 +20,9 @@ namespace osu.Game.Users
         [BackgroundDependencyLoader]
         private void load(TextureStore textures)
         {
+            if (textures == null)
+                throw new ArgumentNullException(nameof(textures));
+
             if (!string.IsNullOrEmpty(user.CoverUrl))
                 Texture = textures.Get(user.CoverUrl);
         }

osu.Game/Users/UserPanel.cs

@@ -38,6 +38,9 @@ namespace osu.Game.Users
 
         public UserPanel(User user)
         {
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
+
             this.user = user;
 
             Height = height - status_height;
@@ -173,6 +176,9 @@ namespace osu.Game.Users
         [BackgroundDependencyLoader(permitNulls: true)]
         private void load(OsuColour colours, UserProfileOverlay profile)
         {
+            if (colours == null)
+                throw new ArgumentNullException(nameof(colours));
+
             Status.ValueChanged += displayStatus;
             Status.ValueChanged += status => statusBg.FadeColour(status?.GetAppropriateColour(colours) ?? colours.Gray5, 500, Easing.OutQuint);
 

osu.Game/osu.Game.csproj

@@ -655,6 +655,7 @@
     <Compile Include="Screens\Menu\Disclaimer.cs" />
     <Compile Include="Screens\Menu\FlowContainerWithOrigin.cs" />
     <Compile Include="Screens\Menu\Intro.cs" />
+    <Compile Include="Screens\Menu\IntroSequence.cs" />
     <Compile Include="Screens\Menu\LogoVisualisation.cs" />
     <Compile Include="Screens\Menu\MainMenu.cs" />
     <Compile Include="Screens\Menu\MenuSideFlashes.cs" />