From bc4e0bfa8b2ceebeec41675692a18b861f4aeec1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Apr 2017 09:57:34 +0900
Subject: [PATCH 01/45] Make DragBar animate seeks.

---
 osu.Game/Overlays/DragBar.cs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/DragBar.cs b/osu.Game/Overlays/DragBar.cs
index a9cf735171..dc79b1f094 100644
--- a/osu.Game/Overlays/DragBar.cs
+++ b/osu.Game/Overlays/DragBar.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 
 namespace osu.Game.Overlays
@@ -48,7 +49,7 @@ namespace osu.Game.Overlays
         {
             if (isDragging || !IsEnabled) return;
 
-            fill.Width = position;
+            updatePosition(position);
         }
 
         private void seek(InputState state)
@@ -56,7 +57,12 @@ namespace osu.Game.Overlays
             if (!IsEnabled) return;
             float seekLocation = state.Mouse.Position.X / DrawWidth;
             SeekRequested?.Invoke(seekLocation);
-            fill.Width = seekLocation;
+            updatePosition(seekLocation);
+        }
+
+        private void updatePosition(float position)
+        {
+            fill.TransformTo(fill.Width, position, 100, EasingTypes.OutQuint, new TransformWidth());
         }
 
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
@@ -78,5 +84,14 @@ namespace osu.Game.Overlays
             isDragging = false;
             return true;
         }
+
+        private class TransformWidth : TransformFloat
+        {
+            public override void Apply(Drawable d)
+            {
+                base.Apply(d);
+                d.Width = CurrentValue;
+            }
+        }
     }
 }

From 7c9f30c2885df26f7c9fdec4cef7e546da43af84 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Apr 2017 11:02:37 +0900
Subject: [PATCH 02/45] MusicController regression fixes.

---
 osu.Game/Overlays/DragBar.cs         | 4 +++-
 osu.Game/Overlays/MusicController.cs | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/DragBar.cs b/osu.Game/Overlays/DragBar.cs
index dc79b1f094..251aed1ee4 100644
--- a/osu.Game/Overlays/DragBar.cs
+++ b/osu.Game/Overlays/DragBar.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
+using OpenTK;
 
 namespace osu.Game.Overlays
 {
@@ -17,7 +18,7 @@ namespace osu.Game.Overlays
         public Action<float> SeekRequested;
         private bool isDragging;
 
-        private bool enabled;
+        private bool enabled = true;
         public bool IsEnabled
         {
             get { return enabled; }
@@ -62,6 +63,7 @@ namespace osu.Game.Overlays
 
         private void updatePosition(float position)
         {
+            position = MathHelper.Clamp(position, 0, 1);
             fill.TransformTo(fill.Width, position, 100, EasingTypes.OutQuint, new TransformWidth());
         }
 
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 9f3eeb47a0..2fc6922dcf 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -237,7 +237,7 @@ namespace osu.Game.Overlays
 
             if (current?.TrackLoaded ?? false)
             {
-                progress.UpdatePosition((float)(current.Track.CurrentTime / current.Track.Length));
+                progress.UpdatePosition(current.Track.Length == 0 ? 0 : (float)(current.Track.CurrentTime / current.Track.Length));
                 playButton.Icon = current.Track.IsRunning ? FontAwesome.fa_pause_circle_o : FontAwesome.fa_play_circle_o;
 
                 if (current.Track.HasCompleted && !current.Track.Looping) next();

From fa28e7bdc30b0f41dc4f05b9bbfbce113b7b4df8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Apr 2017 13:04:57 +0900
Subject: [PATCH 03/45] Improve clickability and visuals of MusicController
 buttons.

---
 .../Tests/TestCaseMusicController.cs          |   4 +-
 osu.Game/Overlays/MusicController.cs          | 185 +++++++++++-------
 2 files changed, 121 insertions(+), 68 deletions(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs b/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs
index c0c17cd50e..5665bf859a 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs
@@ -30,7 +30,9 @@ namespace osu.Desktop.VisualTests.Tests
                 Anchor = Anchor.Centre
             };
             Add(mc);
-            AddToggleStep(@"Show", state => mc.State = state ? Visibility.Visible : Visibility.Hidden);
+
+            AddToggleStep(@"toggle visibility", state => mc.State = state ? Visibility.Visible : Visibility.Hidden);
+            AddStep(@"show", () => mc.State = Visibility.Visible);
         }
     }
 }
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 2fc6922dcf..fb319d46d5 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Overlays
     {
         private Drawable currentBackground;
         private DragBar progress;
-        private TextAwesome playButton;
+        private Button playButton;
         private SpriteText title, artist;
 
         private List<BeatmapSetInfo> playList;
@@ -46,6 +46,8 @@ namespace osu.Game.Overlays
 
         private Container dragContainer;
 
+        private const float bottom_black_area_height = 50;
+
         public MusicController()
         {
             Width = 400;
@@ -115,83 +117,46 @@ namespace osu.Game.Overlays
                             Text = @"Nothing to play",
                             Font = @"Exo2.0-BoldItalic"
                         },
-                        new ClickableContainer
+                        new FillFlowContainer<Button>
                         {
-                            AutoSizeAxes = Axes.Both,
-                            Origin = Anchor.Centre,
+                            AutoSizeAxes = Axes.X,
+                            Height = bottom_black_area_height,
+                            Direction = FillDirection.Horizontal,
+                            Origin = Anchor.BottomCentre,
                             Anchor = Anchor.BottomCentre,
-                            Position = new Vector2(0, -30),
-                            Action = () =>
+                            Children = new[]
                             {
-                                if (current?.Track == null) return;
-                                if (current.Track.IsRunning)
-                                    current.Track.Stop();
-                                else
-                                    current.Track.Start();
-                            },
-                            Children = new Drawable[]
-                            {
-                                playButton = new TextAwesome
+                                new Button
                                 {
-                                    TextSize = 30,
-                                    Icon = FontAwesome.fa_play_circle_o,
-                                    Origin = Anchor.Centre,
-                                    Anchor = Anchor.Centre
-                                }
-                            }
-                        },
-                        new ClickableContainer
-                        {
-                            AutoSizeAxes = Axes.Both,
-                            Origin = Anchor.Centre,
-                            Anchor = Anchor.BottomCentre,
-                            Position = new Vector2(-30, -30),
-                            Action = prev,
-                            Children = new Drawable[]
-                            {
-                                new TextAwesome
-                                {
-                                    TextSize = 15,
+                                    Action = prev,
                                     Icon = FontAwesome.fa_step_backward,
-                                    Origin = Anchor.Centre,
-                                    Anchor = Anchor.Centre
-                                }
-                            }
-                        },
-                        new ClickableContainer
-                        {
-                            AutoSizeAxes = Axes.Both,
-                            Origin = Anchor.Centre,
-                            Anchor = Anchor.BottomCentre,
-                            Position = new Vector2(30, -30),
-                            Action = next,
-                            Children = new Drawable[]
-                            {
-                                new TextAwesome
+                                },
+                                playButton = new Button
                                 {
-                                    TextSize = 15,
+                                    Scale = new Vector2(1.4f),
+                                    Action = () =>
+                                    {
+                                        if (current?.Track == null) return;
+                                        if (current.Track.IsRunning)
+                                            current.Track.Stop();
+                                        else
+                                            current.Track.Start();
+                                    },
+                                    Icon = FontAwesome.fa_play_circle_o,
+                                },
+                                new Button
+                                {
+                                    Action = next,
                                     Icon = FontAwesome.fa_step_forward,
-                                    Origin = Anchor.Centre,
-                                    Anchor = Anchor.Centre
-                                }
+                                },
                             }
                         },
-                        new ClickableContainer
+                        new Button
                         {
-                            AutoSizeAxes = Axes.Both,
                             Origin = Anchor.Centre,
                             Anchor = Anchor.BottomRight,
-                            Position = new Vector2(20, -30),
-                            Children = new Drawable[]
-                            {
-                                new TextAwesome
-                                {
-                                    TextSize = 15,
-                                    Icon = FontAwesome.fa_bars,
-                                    Origin = Anchor.Centre,
-                                    Anchor = Anchor.Centre
-                                }
-                            }
+                            Position = new Vector2(-bottom_black_area_height / 2),
+                            Icon = FontAwesome.fa_bars,
                         },
                         progress = new DragBar
                         {
@@ -416,7 +381,7 @@ namespace osu.Game.Overlays
                     new Box
                     {
                         RelativeSizeAxes = Axes.X,
-                        Height = 50,
+                        Height = bottom_black_area_height,
                         Origin = Anchor.BottomCentre,
                         Anchor = Anchor.BottomCentre,
                         Colour = Color4.Black.Opacity(0.5f)
@@ -430,5 +395,91 @@ namespace osu.Game.Overlays
                 sprite.Texture = beatmap?.Background ?? textures.Get(@"Backgrounds/bg4");
             }
         }
+
+        private class Button : ClickableContainer
+        {
+            private readonly TextAwesome icon;
+            private readonly Box hover;
+            private readonly Container content;
+
+            public FontAwesome Icon
+            {
+                get { return icon.Icon; }
+                set { icon.Icon = value; }
+            }
+
+            private const float button_size = 30;
+
+            public Button()
+            {
+                AutoSizeAxes = Axes.Both;
+
+                Origin = Anchor.Centre;
+                Anchor = Anchor.Centre;
+
+                Children = new Drawable[]
+                {
+                    content = new Container
+                    {
+                        Size = new Vector2(button_size),
+                        CornerRadius = 5,
+                        Masking = true,
+
+                        Origin = Anchor.Centre,
+                        Anchor = Anchor.Centre,
+                        EdgeEffect = new EdgeEffect
+                        {
+                            Colour = Color4.Black.Opacity(0.04f),
+                            Type = EdgeEffectType.Shadow,
+                            Radius = 5,
+                        },
+                        Children = new Drawable[]
+                        {
+                            hover = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Alpha = 0,
+                            },
+                            icon = new TextAwesome
+                            {
+                                TextSize = 18,
+                                Origin = Anchor.Centre,
+                                Anchor = Anchor.Centre
+                            }
+                        }
+                    }
+                };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                hover.Colour = colours.Yellow.Opacity(0.6f);
+            }
+
+            protected override bool OnHover(InputState state)
+            {
+                hover.FadeIn(500, EasingTypes.OutQuint);
+                return base.OnHover(state);
+            }
+
+            protected override void OnHoverLost(InputState state)
+            {
+                hover.FadeOut(500, EasingTypes.OutQuint);
+                base.OnHoverLost(state);
+            }
+
+            protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
+            {
+                content.ScaleTo(0.7f, 2000, EasingTypes.OutQuint);
+                return base.OnMouseDown(state, args);
+            }
+
+            protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
+            {
+                content.ScaleTo(1, 1000, EasingTypes.OutElastic);
+                return base.OnMouseUp(state, args);
+            }
+        }
     }
 }

From 361e187949321cbd8f9da01d333eb41b89c052bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Apr 2017 14:32:33 +0900
Subject: [PATCH 04/45] Temporarily disable button scaling.

---
 osu.Game/Overlays/MusicController.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index fb319d46d5..c91618f959 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -122,6 +122,7 @@ namespace osu.Game.Overlays
                             AutoSizeAxes = Axes.X,
                             Height = bottom_black_area_height,
                             Direction = FillDirection.Horizontal,
+                            Spacing = new Vector2(5),
                             Origin = Anchor.BottomCentre,
                             Anchor = Anchor.BottomCentre,
                             Children = new[]
@@ -133,7 +134,7 @@ namespace osu.Game.Overlays
                                 },
                                 playButton = new Button
                                 {
-                                    Scale = new Vector2(1.4f),
+                                    //Scale = new Vector2(1.4f),
                                     Action = () =>
                                     {
                                         if (current?.Track == null) return;
@@ -471,7 +472,7 @@ namespace osu.Game.Overlays
 
             protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
             {
-                content.ScaleTo(0.7f, 2000, EasingTypes.OutQuint);
+                content.ScaleTo(1, 2000, EasingTypes.OutQuint);
                 return base.OnMouseDown(state, args);
             }
 

From 7d2af9310bc8f0b1e99cf86b0a05d7413c381887 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Apr 2017 15:20:20 +0900
Subject: [PATCH 05/45] Expose DragBar's seeking property.

---
 osu.Game/Overlays/DragBar.cs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/DragBar.cs b/osu.Game/Overlays/DragBar.cs
index 251aed1ee4..90991bb195 100644
--- a/osu.Game/Overlays/DragBar.cs
+++ b/osu.Game/Overlays/DragBar.cs
@@ -16,7 +16,8 @@ namespace osu.Game.Overlays
         private readonly Box fill;
 
         public Action<float> SeekRequested;
-        private bool isDragging;
+
+        public bool IsSeeking { get; private set; }
 
         private bool enabled = true;
         public bool IsEnabled
@@ -48,7 +49,7 @@ namespace osu.Game.Overlays
 
         public void UpdatePosition(float position)
         {
-            if (isDragging || !IsEnabled) return;
+            if (IsSeeking || !IsEnabled) return;
 
             updatePosition(position);
         }
@@ -64,7 +65,7 @@ namespace osu.Game.Overlays
         private void updatePosition(float position)
         {
             position = MathHelper.Clamp(position, 0, 1);
-            fill.TransformTo(fill.Width, position, 100, EasingTypes.OutQuint, new TransformWidth());
+            fill.TransformTo(fill.Width, position, 200, EasingTypes.OutQuint, new TransformSeek());
         }
 
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
@@ -79,15 +80,15 @@ namespace osu.Game.Overlays
             return true;
         }
 
-        protected override bool OnDragStart(InputState state) => isDragging = true;
+        protected override bool OnDragStart(InputState state) => IsSeeking = true;
 
         protected override bool OnDragEnd(InputState state)
         {
-            isDragging = false;
+            IsSeeking = false;
             return true;
         }
 
-        private class TransformWidth : TransformFloat
+        private class TransformSeek : TransformFloat
         {
             public override void Apply(Drawable d)
             {

From 2c2a4169c6c09e130b0782b823bf16b98fa9f6e5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Apr 2017 15:28:18 +0900
Subject: [PATCH 06/45] Better structure for button layout.

---
 osu.Game/Overlays/MusicController.cs | 73 ++++++++++++++++------------
 1 file changed, 42 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index c91618f959..73b7695dab 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -46,6 +46,8 @@ namespace osu.Game.Overlays
 
         private Container dragContainer;
 
+        private const float progress_height = 10;
+
         private const float bottom_black_area_height = 50;
 
         public MusicController()
@@ -117,53 +119,62 @@ namespace osu.Game.Overlays
                             Text = @"Nothing to play",
                             Font = @"Exo2.0-BoldItalic"
                         },
-                        new FillFlowContainer<Button>
-                        {
-                            AutoSizeAxes = Axes.X,
+                        new Container {
+                            Padding = new MarginPadding { Bottom = progress_height },
                             Height = bottom_black_area_height,
-                            Direction = FillDirection.Horizontal,
-                            Spacing = new Vector2(5),
+                            RelativeSizeAxes = Axes.X,
                             Origin = Anchor.BottomCentre,
                             Anchor = Anchor.BottomCentre,
-                            Children = new[]
+                            Children = new Drawable[]
                             {
-                                new Button
+                                new FillFlowContainer<Button>
                                 {
-                                    Action = prev,
-                                    Icon = FontAwesome.fa_step_backward,
-                                },
-                                playButton = new Button
-                                {
-                                    //Scale = new Vector2(1.4f),
-                                    Action = () =>
+                                    AutoSizeAxes = Axes.Both,
+                                    Direction = FillDirection.Horizontal,
+                                    Spacing = new Vector2(5),
+                                    Origin = Anchor.Centre,
+                                    Anchor = Anchor.Centre,
+                                    Children = new[]
                                     {
-                                        if (current?.Track == null) return;
-                                        if (current.Track.IsRunning)
-                                            current.Track.Stop();
-                                        else
-                                            current.Track.Start();
-                                    },
-                                    Icon = FontAwesome.fa_play_circle_o,
+                                        new Button
+                                        {
+                                            Action = prev,
+                                            Icon = FontAwesome.fa_step_backward,
+                                        },
+                                        playButton = new Button
+                                        {
+                                            //Scale = new Vector2(1.3f),
+                                            Action = () =>
+                                            {
+                                                if (current?.Track == null) return;
+                                                if (current.Track.IsRunning)
+                                                    current.Track.Stop();
+                                                else
+                                                    current.Track.Start();
+                                            },
+                                            Icon = FontAwesome.fa_play_circle_o,
+                                        },
+                                        new Button
+                                        {
+                                            Action = next,
+                                            Icon = FontAwesome.fa_step_forward,
+                                        },
+                                    }
                                 },
                                 new Button
                                 {
-                                    Action = next,
-                                    Icon = FontAwesome.fa_step_forward,
+                                    Origin = Anchor.Centre,
+                                    Anchor = Anchor.CentreRight,
+                                    Position = new Vector2(-bottom_black_area_height / 2, 0),
+                                    Icon = FontAwesome.fa_bars,
                                 },
                             }
                         },
-                        new Button
-                        {
-                            Origin = Anchor.Centre,
-                            Anchor = Anchor.BottomRight,
-                            Position = new Vector2(-bottom_black_area_height / 2),
-                            Icon = FontAwesome.fa_bars,
-                        },
                         progress = new DragBar
                         {
                             Origin = Anchor.BottomCentre,
                             Anchor = Anchor.BottomCentre,
-                            Height = 10,
+                            Height = progress_height,
                             Colour = colours.Yellow,
                             SeekRequested = seek
                         }

From a9d938e7eda02cf5eae8d9e0aac9fe280196bcfb Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Fri, 7 Apr 2017 15:57:00 +0900
Subject: [PATCH 07/45] Fix brace style.

---
 osu.Game/Overlays/MusicController.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 73b7695dab..1a955edbe0 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -119,7 +119,8 @@ namespace osu.Game.Overlays
                             Text = @"Nothing to play",
                             Font = @"Exo2.0-BoldItalic"
                         },
-                        new Container {
+                        new Container
+                        {
                             Padding = new MarginPadding { Bottom = progress_height },
                             Height = bottom_black_area_height,
                             RelativeSizeAxes = Axes.X,

From 39175905e40fa501defec4584d3d556feb0c3174 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Apr 2017 16:55:41 +0900
Subject: [PATCH 08/45] Fix crashes on completing a taiko map (where a strong
 his is the last hit in the map).

---
 osu.Game/Screens/Play/Player.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index d645c0c1f3..ac03d0e2b8 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -20,6 +20,7 @@ using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Ranking;
 using System;
 using System.Linq;
+using osu.Framework.Threading;
 using osu.Game.Modes.Scoring;
 
 namespace osu.Game.Screens.Play
@@ -237,14 +238,16 @@ namespace osu.Game.Screens.Play
             });
         }
 
+        private ScheduledDelegate onCompletionEvent;
+
         private void onCompletion()
         {
             // Only show the completion screen if the player hasn't failed
-            if (scoreProcessor.HasFailed)
+            if (scoreProcessor.HasFailed || onCompletionEvent != null)
                 return;
 
             Delay(1000);
-            Schedule(delegate
+            onCompletionEvent = Schedule(delegate
             {
                 ValidForResume = false;
                 Push(new Results

From aa45515a7ce0f4470031ff20859df65795e580ab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Apr 2017 16:55:51 +0900
Subject: [PATCH 09/45] Add flash effect when hitting taiko hits.

---
 .../Objects/Drawables/DrawableHit.cs              | 15 +++++++++++++++
 .../Objects/Drawables/Pieces/CirclePiece.cs       |  6 +++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableHit.cs
index f325026be9..167fbebd7b 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableHit.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using osu.Framework.Graphics;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Taiko.Judgements;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
 using OpenTK.Input;
 
 namespace osu.Game.Modes.Taiko.Objects.Drawables
@@ -66,6 +67,10 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
         {
             Delay(HitObject.StartTime - Time.Current + Judgement.TimeOffset, true);
 
+            var circlePiece = MainPiece as CirclePiece;
+
+            circlePiece?.FlashBox.Flush();
+
             switch (State)
             {
                 case ArmedState.Idle:
@@ -77,6 +82,16 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
                 case ArmedState.Hit:
                     FadeOut(600);
 
+                    var flash = circlePiece?.FlashBox;
+                    if (flash != null)
+                    {
+                        flash.FadeTo(0.9f);
+                        flash.FadeOut(300);
+                    }
+
+
+                    FadeOut(800);
+
                     const float gravity_time = 300;
                     const float gravity_travel_height = 200;
 
diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
index 6ea1494ea7..f921511e22 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
@@ -64,6 +64,8 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
 
         private readonly Container background;
 
+        public Box FlashBox;
+
         public CirclePiece(bool isStrong = false)
         {
             AddInternal(new Drawable[]
@@ -104,11 +106,13 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
                     Masking = true,
                     Children = new[]
                     {
-                        new Box
+                        FlashBox = new Box
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                             RelativeSizeAxes = Axes.Both,
+                            Colour = Color4.White,
+                            BlendingMode = BlendingMode.Additive,
                             Alpha = 0,
                             AlwaysPresent = true
                         }

From 54d1afb6557489fa38862a66151023226443d6da Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Apr 2017 20:38:57 +0900
Subject: [PATCH 10/45] Fade in HitRenderer post entering animation.

---
 osu.Game/Screens/Play/Player.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index ac03d0e2b8..47945c0a1b 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -292,6 +292,10 @@ namespace osu.Game.Screens.Play
                 sourceClock.Start();
                 initializeSkipButton();
             });
+
+            //keep in mind this is using the interpolatedSourceClock so won't be run as early as we may expect.
+            HitRenderer.Alpha = 0;
+            HitRenderer.FadeIn(750, EasingTypes.OutQuint);
         }
 
         protected override void OnSuspending(Screen next)

From 0d4f45726582580b420d3bb4b0bdecf9faff693c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Apr 2017 20:46:35 +0900
Subject: [PATCH 11/45] Improve transitions when exiting play mode.

---
 osu.Game/Screens/Play/Player.cs | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 47945c0a1b..36ab1ab946 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -308,25 +308,24 @@ namespace osu.Game.Screens.Play
 
         protected override bool OnExiting(Screen next)
         {
-            if (pauseOverlay == null) return false;
-
-            if (HitRenderer.HasReplayLoaded)
-                return false;
-
-            if (pauseOverlay.State != Visibility.Visible && !canPause) return true;
-
-            if (!IsPaused && sourceClock.IsRunning) // For if the user presses escape quickly when entering the map
+            if (pauseOverlay != null && !HitRenderer.HasReplayLoaded)
             {
-                Pause();
-                return true;
-            }
-            else
-            {
-                FadeOut(250);
-                Content.ScaleTo(0.7f, 750, EasingTypes.InQuint);
-                Background?.FadeTo(1f, 200);
-                return base.OnExiting(next);
+                //pause screen override logic.
+                if (pauseOverlay?.State == Visibility.Hidden && !canPause) return true;
+
+                if (!IsPaused && sourceClock.IsRunning) // For if the user presses escape quickly when entering the map
+                {
+                    Pause();
+                    return true;
+                }
             }
+
+            HitRenderer?.FadeOut(60);
+
+            FadeOut(250);
+            Content.ScaleTo(0.7f, 750, EasingTypes.InQuint);
+            Background?.FadeTo(1f, 200);
+            return base.OnExiting(next);
         }
 
         private Bindable<bool> mouseWheelDisabled;

From 06a655af5d0187803a0048ddd28fa500f92fe8ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Apr 2017 20:51:37 +0900
Subject: [PATCH 12/45] Move initial position of KeyCounter upwards.

---
 osu.Game/Modes/UI/StandardHudOverlay.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Modes/UI/StandardHudOverlay.cs b/osu.Game/Modes/UI/StandardHudOverlay.cs
index f77191adf7..f07e421f00 100644
--- a/osu.Game/Modes/UI/StandardHudOverlay.cs
+++ b/osu.Game/Modes/UI/StandardHudOverlay.cs
@@ -40,6 +40,7 @@ namespace osu.Game.Modes.UI
             Anchor = Anchor.BottomRight,
             Origin = Anchor.BottomRight,
             Margin = new MarginPadding(10),
+            Y = - TwoLayerButton.SIZE_RETRACTED.Y,
         };
 
         protected override ScoreCounter CreateScoreCounter() => new ScoreCounter(6)

From ac073e22c9b5662a858f81a2a28a8f71b2cc71b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas94@gmx.net>
Date: Fri, 7 Apr 2017 17:00:34 +0200
Subject: [PATCH 13/45] Fix crash caused by multiple identical audio device
 names

The option dropdown for audio device selection lists all audio
device names. Dropdowns, however, may not have multiple identical
keys. This commit adds removal of duplicate audio device names from
the dropdown. BASS does not give us a simple mechanism to select
specific audio devices in such a case anyways. This functionality would
require OS-specific and involved code.
---
 .../Options/Sections/Audio/AudioDevicesOptions.cs         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs b/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
index 2818f5fbd7..df9be143c3 100644
--- a/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
@@ -39,7 +39,13 @@ namespace osu.Game.Overlays.Options.Sections.Audio
             if (deviceItems.All(kv => kv.Value != preferredDeviceName))
                 deviceItems.Add(new KeyValuePair<string, string>(preferredDeviceName, preferredDeviceName));
 
-            dropdown.Items = deviceItems;
+            // The option dropdown for audio device selection lists all audio
+            // device names. Dropdowns, however, may not have multiple identical
+            // keys. Thus, we remove duplicate audio device names from
+            // the dropdown. BASS does not give us a simple mechanism to select
+            // specific audio devices in such a case anyways.This functionality would
+            // require OS-specific and involved code.
+            dropdown.Items = deviceItems.Distinct().ToList();
         }
 
         private void onDeviceChanged(string name) => updateItems();

From 166a78a15a739f6ec2e24c2bac93707951d55073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas94@gmx.net>
Date: Sat, 8 Apr 2017 11:01:41 +0200
Subject: [PATCH 14/45] Fix up comment in audio device options

---
 .../Overlays/Options/Sections/Audio/AudioDevicesOptions.cs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs b/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
index df9be143c3..e3033b876d 100644
--- a/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
@@ -43,8 +43,8 @@ namespace osu.Game.Overlays.Options.Sections.Audio
             // device names. Dropdowns, however, may not have multiple identical
             // keys. Thus, we remove duplicate audio device names from
             // the dropdown. BASS does not give us a simple mechanism to select
-            // specific audio devices in such a case anyways.This functionality would
-            // require OS-specific and involved code.
+            // specific audio devices in such a case anyways. Such
+            // functionality would require involved OS-specific code.
             dropdown.Items = deviceItems.Distinct().ToList();
         }
 

From b99cbe69624f26976fe25f188dc26894bd0a4725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas94@gmx.net>
Date: Sat, 8 Apr 2017 11:01:56 +0200
Subject: [PATCH 15/45] Add back nice scaling of music controller buttons

---
 osu-framework                        | 2 +-
 osu.Game/Overlays/MusicController.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu-framework b/osu-framework
index a7c99e06ff..45e75163b2 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit a7c99e06ff4c3f56fad24bec170eb93f42b1e149
+Subproject commit 45e75163b272b7aa023afec7801ea079aba4ee69
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 1a955edbe0..997c8cd82f 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -144,7 +144,7 @@ namespace osu.Game.Overlays
                                         },
                                         playButton = new Button
                                         {
-                                            //Scale = new Vector2(1.3f),
+                                            Scale = new Vector2(1.3f),
                                             Action = () =>
                                             {
                                                 if (current?.Track == null) return;
@@ -484,7 +484,7 @@ namespace osu.Game.Overlays
 
             protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
             {
-                content.ScaleTo(1, 2000, EasingTypes.OutQuint);
+                content.ScaleTo(0.75f, 2000, EasingTypes.OutQuint);
                 return base.OnMouseDown(state, args);
             }
 

From e40ad69a3b4a2759743a4c47a013ca1d894f000b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 8 Apr 2017 19:25:40 +0900
Subject: [PATCH 16/45] Adjust icon scale of play button.

---
 osu.Game/Overlays/MusicController.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 997c8cd82f..627c3ea18c 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Overlays
 
         private const float progress_height = 10;
 
-        private const float bottom_black_area_height = 50;
+        private const float bottom_black_area_height = 55;
 
         public MusicController()
         {
@@ -144,7 +144,8 @@ namespace osu.Game.Overlays
                                         },
                                         playButton = new Button
                                         {
-                                            Scale = new Vector2(1.3f),
+                                            Scale = new Vector2(1.4f),
+                                            IconScale = new Vector2(1.4f),
                                             Action = () =>
                                             {
                                                 if (current?.Track == null) return;
@@ -423,6 +424,12 @@ namespace osu.Game.Overlays
 
             private const float button_size = 30;
 
+            public Vector2 IconScale
+            {
+                get { return icon.Scale; }
+                set { icon.Scale = value; }
+            }
+
             public Button()
             {
                 AutoSizeAxes = Axes.Both;

From e1e9772d46cad3d185c3fff3b8ed38182d4966de Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 8 Apr 2017 19:28:29 +0900
Subject: [PATCH 17/45] Flash buttons on click.

---
 osu.Game/Overlays/MusicController.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 627c3ea18c..9d21a0341c 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -423,6 +423,7 @@ namespace osu.Game.Overlays
             }
 
             private const float button_size = 30;
+            private Color4 flashColour;
 
             public Vector2 IconScale
             {
@@ -475,6 +476,7 @@ namespace osu.Game.Overlays
             private void load(OsuColour colours)
             {
                 hover.Colour = colours.Yellow.Opacity(0.6f);
+                flashColour = colours.Yellow;
             }
 
             protected override bool OnHover(InputState state)
@@ -489,6 +491,12 @@ namespace osu.Game.Overlays
                 base.OnHoverLost(state);
             }
 
+            protected override bool OnClick(InputState state)
+            {
+                hover.FlashColour(flashColour, 800, EasingTypes.OutQuint);
+                return base.OnClick(state);
+            }
+
             protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
             {
                 content.ScaleTo(0.75f, 2000, EasingTypes.OutQuint);

From b5431c496b16aa68419d208a048554280b8fa728 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 8 Apr 2017 19:34:04 +0900
Subject: [PATCH 18/45] Fix osu! logo handling drags for no reason.

---
 osu.Game/Screens/Menu/OsuLogo.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index e5fb1db38e..29f6cb2967 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -194,8 +194,6 @@ namespace osu.Game.Screens.Menu
             return true;
         }
 
-        protected override bool OnDragStart(InputState state) => true;
-
         protected override bool OnClick(InputState state)
         {
             if (!Interactive) return false;

From 667b52156a5338105b54cb94f7ea1c7880e05bba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 9 Apr 2017 18:59:43 +0900
Subject: [PATCH 19/45] Bring vscode launch/task configurations up to date.

---
 .vscode/launch.json |  4 ++--
 .vscode/tasks.json  | 24 +++++++++++-------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index b981556649..c836ff97bc 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -11,7 +11,7 @@
             "preLaunchTask": "build",
             "runtimeExecutable": null,
             "env": {},
-            "externalConsole": false
+            "console": "internalConsole"
         },
         {
             "name": "Launch Desktop",
@@ -23,7 +23,7 @@
             "preLaunchTask": "build",
             "runtimeExecutable": null,
             "env": {},
-            "externalConsole": false
+            "console": "internalConsole"
         },
         {
             "name": "Attach",
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 0c0e79f7fb..03f5bc4c6c 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -2,25 +2,23 @@
     // See https://go.microsoft.com/fwlink/?LinkId=733558
     // for the documentation about the tasks.json format
     "version": "0.1.0",
-    "windows": {
-        "command": "msbuild"
-    },
-    "linux": {
-        "command": "xbuild"
-    },
-    "args": [
-        // Ask msbuild to generate full paths for file names.
-        "/property:GenerateFullPaths=true"
-    ],
     "taskSelector": "/t:",
-    "showOutput": "silent",
     "tasks": [
         {
             "taskName": "build",
-            // Show the output window only if unrecognized errors occur.
+            "isShellCommand": true,
             "showOutput": "silent",
+            "command": "xbuild",
+            "windows": {
+                "command": "msbuild"
+            },
+            "args": [
+                // Ask msbuild to generate full paths for file names.
+                "/property:GenerateFullPaths=true"
+            ],
             // Use the standard MS compiler pattern to detect errors, warnings and infos
-            "problemMatcher": "$msCompile"
+            "problemMatcher": "$msCompile",
+            "isBuildCommand": true
         }
     ]
 }
\ No newline at end of file

From 4ab4f65c83e04942f4865acabe7ce0c266d6152b Mon Sep 17 00:00:00 2001
From: Andrey Zavadskiy <megaman9919@gmail.com>
Date: Sun, 9 Apr 2017 16:26:31 +0300
Subject: [PATCH 20/45] Retry on Tilde key

---
 osu.Game/Screens/Play/Player.cs | 53 +++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 36ab1ab946..0af3dcecba 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -22,6 +22,10 @@ using System;
 using System.Linq;
 using osu.Framework.Threading;
 using osu.Game.Modes.Scoring;
+using OpenTK.Input;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Graphics.Sprites;
+using OpenTK.Graphics;
 
 namespace osu.Game.Screens.Play
 {
@@ -59,10 +63,16 @@ namespace osu.Game.Screens.Play
         private HudOverlay hudOverlay;
         private PauseOverlay pauseOverlay;
         private FailOverlay failOverlay;
+        private Box retryOverlay;
+
+        private SampleChannel SampleClick;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, BeatmapDatabase beatmaps, OsuConfigManager config)
         {
+            AlwaysPresent = true;
+            SampleClick = audio.Sample.Get(@"Menu/menuback");
+
             var beatmap = Beatmap.Beatmap;
 
             if (beatmap.BeatmapInfo?.Mode > PlayMode.Taiko)
@@ -157,6 +167,13 @@ namespace osu.Game.Screens.Play
                 {
                     OnRetry = Restart,
                     OnQuit = Exit,
+                },
+                retryOverlay = new Box
+                {
+                    Alpha = 0,
+                    AlwaysPresent = true,
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
                 }
             };
         }
@@ -331,5 +348,41 @@ namespace osu.Game.Screens.Play
         private Bindable<bool> mouseWheelDisabled;
 
         protected override bool OnWheel(InputState state) => mouseWheelDisabled.Value && !IsPaused;
+
+        private bool isHolded;
+        protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
+        {
+            if (args.Repeat) return false;
+
+            if (args.Key == Key.Tilde)
+            {
+                isHolded = true;
+
+                retryOverlay.FadeIn(500);
+
+                Delay(500).Schedule(() =>{
+                    if (isHolded)
+                    {
+                        SampleClick.Play();
+                        Restart();
+                    }
+                });
+                return true;
+            }
+
+            return base.OnKeyDown(state, args);
+        }
+
+        protected override bool OnKeyUp(InputState state, KeyUpEventArgs args)
+        {
+            if (args.Key == Key.Tilde)
+            {
+                isHolded = false;
+                retryOverlay.FadeOut(200);
+                return true;
+            }
+
+            return base.OnKeyUp(state, args);
+        }
     }
 }
\ No newline at end of file

From 425e96c45cacbdbb07f6d60f4997f9a25014321c Mon Sep 17 00:00:00 2001
From: Andrey Zavadskiy <megaman9919@gmail.com>
Date: Sun, 9 Apr 2017 17:44:19 +0300
Subject: [PATCH 21/45] Moved logic to it's own class

---
 osu.Game/Screens/Play/Player.cs       | 55 +++--------------------
 osu.Game/Screens/Play/RetryOverlay.cs | 65 +++++++++++++++++++++++++++
 osu.Game/osu.Game.csproj              |  1 +
 3 files changed, 71 insertions(+), 50 deletions(-)
 create mode 100644 osu.Game/Screens/Play/RetryOverlay.cs

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 0af3dcecba..3b67f8d6e6 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -22,9 +22,6 @@ using System;
 using System.Linq;
 using osu.Framework.Threading;
 using osu.Game.Modes.Scoring;
-using OpenTK.Input;
-using osu.Framework.Audio.Sample;
-using osu.Framework.Graphics.Sprites;
 using OpenTK.Graphics;
 
 namespace osu.Game.Screens.Play
@@ -63,16 +60,11 @@ namespace osu.Game.Screens.Play
         private HudOverlay hudOverlay;
         private PauseOverlay pauseOverlay;
         private FailOverlay failOverlay;
-        private Box retryOverlay;
-
-        private SampleChannel SampleClick;
+        private RetryOverlay retryOverlay;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, BeatmapDatabase beatmaps, OsuConfigManager config)
         {
-            AlwaysPresent = true;
-            SampleClick = audio.Sample.Get(@"Menu/menuback");
-
             var beatmap = Beatmap.Beatmap;
 
             if (beatmap.BeatmapInfo?.Mode > PlayMode.Taiko)
@@ -168,12 +160,11 @@ namespace osu.Game.Screens.Play
                     OnRetry = Restart,
                     OnQuit = Exit,
                 },
-                retryOverlay = new Box
+                retryOverlay = new RetryOverlay
                 {
-                    Alpha = 0,
-                    AlwaysPresent = true,
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = Color4.Black,
+                    Action = Restart,
+                    OnKeyPressed = () => Content.FadeColour(Color4.Black, 500),
+                    OnKeyReleased = () => Content.FadeColour(Color4.White, 200),
                 }
             };
         }
@@ -348,41 +339,5 @@ namespace osu.Game.Screens.Play
         private Bindable<bool> mouseWheelDisabled;
 
         protected override bool OnWheel(InputState state) => mouseWheelDisabled.Value && !IsPaused;
-
-        private bool isHolded;
-        protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
-        {
-            if (args.Repeat) return false;
-
-            if (args.Key == Key.Tilde)
-            {
-                isHolded = true;
-
-                retryOverlay.FadeIn(500);
-
-                Delay(500).Schedule(() =>{
-                    if (isHolded)
-                    {
-                        SampleClick.Play();
-                        Restart();
-                    }
-                });
-                return true;
-            }
-
-            return base.OnKeyDown(state, args);
-        }
-
-        protected override bool OnKeyUp(InputState state, KeyUpEventArgs args)
-        {
-            if (args.Key == Key.Tilde)
-            {
-                isHolded = false;
-                retryOverlay.FadeOut(200);
-                return true;
-            }
-
-            return base.OnKeyUp(state, args);
-        }
     }
 }
\ No newline at end of file
diff --git a/osu.Game/Screens/Play/RetryOverlay.cs b/osu.Game/Screens/Play/RetryOverlay.cs
new file mode 100644
index 0000000000..e44f7d8914
--- /dev/null
+++ b/osu.Game/Screens/Play/RetryOverlay.cs
@@ -0,0 +1,65 @@
+// 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.Input;
+using OpenTK.Input;
+using osu.Framework.Allocation;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Audio;
+using System;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Screens.Play
+{
+    public class RetryOverlay : Container
+    {
+        public Action Action;
+        public Action OnKeyPressed;
+        public Action OnKeyReleased;
+
+        private SampleChannel retrySample;
+        private bool keyIsHeld;
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            retrySample = audio.Sample.Get(@"Menu/menuback");
+            AlwaysPresent = true;
+        }
+
+        protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
+        {
+            if (args.Repeat) return false;
+
+            if (args.Key == Key.Tilde)
+            {
+                keyIsHeld = true;
+                OnKeyPressed();
+
+                Delay(500).Schedule(() =>
+                {
+                    if (keyIsHeld)
+                    {
+                        retrySample.Play();
+                        Action();
+                    }
+                });
+                return true;
+            }
+
+            return base.OnKeyDown(state, args);
+        }
+
+        protected override bool OnKeyUp(InputState state, KeyUpEventArgs args)
+        {
+            if (args.Key == Key.Tilde)
+            {
+                keyIsHeld = false;
+                OnKeyReleased();
+                return true;
+            }
+
+            return base.OnKeyUp(state, args);
+        }
+    }
+}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 6dd5ec3088..1777bf6dc2 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -180,6 +180,7 @@
     <Compile Include="Screens\Backgrounds\BackgroundScreenEmpty.cs" />
     <Compile Include="Screens\Charts\ChartInfo.cs" />
     <Compile Include="Screens\Edit\Editor.cs" />
+    <Compile Include="Screens\Play\RetryOverlay.cs" />
     <Compile Include="Screens\ScreenWhiteBox.cs" />
     <Compile Include="Screens\Loader.cs" />
     <Compile Include="Screens\Menu\Button.cs" />

From a7264aa84cd86188379fd72e403172175e5094dc Mon Sep 17 00:00:00 2001
From: Andrey Zavadskiy <megaman9919@gmail.com>
Date: Sun, 9 Apr 2017 17:53:16 +0300
Subject: [PATCH 22/45] Warning fix

---
 osu.Game/Screens/Play/Player.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 3b67f8d6e6..af3da23231 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -60,7 +60,6 @@ namespace osu.Game.Screens.Play
         private HudOverlay hudOverlay;
         private PauseOverlay pauseOverlay;
         private FailOverlay failOverlay;
-        private RetryOverlay retryOverlay;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, BeatmapDatabase beatmaps, OsuConfigManager config)
@@ -160,7 +159,7 @@ namespace osu.Game.Screens.Play
                     OnRetry = Restart,
                     OnQuit = Exit,
                 },
-                retryOverlay = new RetryOverlay
+                new RetryOverlay
                 {
                     Action = Restart,
                     OnKeyPressed = () => Content.FadeColour(Color4.Black, 500),

From 1fe6b84dfc79827405cef05104303e4e5a0e287c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 Apr 2017 01:24:50 +0900
Subject: [PATCH 23/45] Update with new input changes from framework.

---
 osu-framework                                      | 2 +-
 osu.Game.Modes.Osu/OsuKeyConversionInputManager.cs | 8 ++++----
 osu.Game/Modes/Replays/FramedReplayInputHandler.cs | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu-framework b/osu-framework
index 45e75163b2..11b1c69d5f 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 45e75163b272b7aa023afec7801ea079aba4ee69
+Subproject commit 11b1c69d5ff2b212a69ee0bf5cc576a04e510044
diff --git a/osu.Game.Modes.Osu/OsuKeyConversionInputManager.cs b/osu.Game.Modes.Osu/OsuKeyConversionInputManager.cs
index 986240b37f..567c7a35b1 100644
--- a/osu.Game.Modes.Osu/OsuKeyConversionInputManager.cs
+++ b/osu.Game.Modes.Osu/OsuKeyConversionInputManager.cs
@@ -42,14 +42,14 @@ namespace osu.Game.Modes.Osu
             {
                 if (mouseDisabled.Value)
                 {
-                    mouse.PressedButtons.Remove(MouseButton.Left);
-                    mouse.PressedButtons.Remove(MouseButton.Right);
+                    mouse.SetPressed(MouseButton.Left, false);
+                    mouse.SetPressed(MouseButton.Right, false);
                 }
 
                 if (leftViaKeyboard)
-                    mouse.PressedButtons.Add(MouseButton.Left);
+                    mouse.SetPressed(MouseButton.Left, true);
                 if (rightViaKeyboard)
-                    mouse.PressedButtons.Add(MouseButton.Right);
+                    mouse.SetPressed(MouseButton.Right, true);
             }
         }
     }
diff --git a/osu.Game/Modes/Replays/FramedReplayInputHandler.cs b/osu.Game/Modes/Replays/FramedReplayInputHandler.cs
index ae20ece515..0c1e140ce4 100644
--- a/osu.Game/Modes/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Modes/Replays/FramedReplayInputHandler.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Modes.Replays
             public ReplayMouseState(Vector2 position, IEnumerable<MouseButton> list)
             {
                 Position = position;
-                list.ForEach(b => PressedButtons.Add(b));
+                list.ForEach(b => SetPressed(b, true));
             }
         }
 
@@ -148,4 +148,4 @@ namespace osu.Game.Modes.Replays
             }
         }
     }
-}
\ No newline at end of file
+}

From c882b9bafd96f752433d0e596350cd58e6632559 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Mon, 10 Apr 2017 05:08:05 +0900
Subject: [PATCH 24/45] Make taiko playfield scale by height.

---
 .../Tests/TestCaseTaikoPlayfield.cs            | 15 +++++++++++----
 .../Objects/Drawables/DrawableDrumRoll.cs      |  2 +-
 .../Drawables/DrawableTaikoHitObject.cs        |  4 +++-
 osu.Game.Modes.Taiko/UI/HitTarget.cs           |  6 +++---
 osu.Game.Modes.Taiko/UI/InputDrum.cs           |  2 +-
 osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs      | 18 +++++++++++++-----
 6 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs b/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
index 88a037afee..a942535d06 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
@@ -61,17 +61,24 @@ namespace osu.Desktop.VisualTests.Tests
         {
             TaikoHitResult hitResult = RNG.Next(2) == 0 ? TaikoHitResult.Good : TaikoHitResult.Great;
 
-            playfield.OnJudgement(new DrawableTestHit(new Hit())
+            var h = new DrawableTestHit(new Hit())
             {
                 X = RNG.NextSingle(hitResult == TaikoHitResult.Good ? -0.1f : -0.05f, hitResult == TaikoHitResult.Good ? 0.1f : 0.05f),
                 Judgement = new TaikoJudgement
                 {
                     Result = HitResult.Hit,
                     TaikoResult = hitResult,
-                    TimeOffset = 0,
-                    SecondHit = RNG.Next(10) == 0
+                    TimeOffset = 0
                 }
-            });
+            };
+
+            playfield.OnJudgement(h);
+
+            if (RNG.Next(10) == 0)
+            {
+                h.Judgement.SecondHit = true;
+                playfield.OnJudgement(h);
+            }
         }
 
         private void addMissJudgement()
diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 0a0098dd34..695717ce9e 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
         protected override TaikoPiece CreateMainPiece() => new ElongatedCirclePiece(HitObject.IsStrong)
         {
             Length = (float)(HitObject.Duration / HitObject.ScrollTime),
-            PlayfieldLengthReference = () => Parent.DrawSize.X
+            PlayfieldLengthReference = () => Parent.DrawSize.X / DrawScale.X
         };
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index f15f2bd152..7cd9f9baa5 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
         /// </summary>
         private readonly List<Key> validKeys = new List<Key>(new[] { Key.D, Key.F, Key.J, Key.K });
 
-        public override Vector2 OriginPosition => new Vector2(DrawHeight / 2);
+        public override Vector2 OriginPosition => new Vector2(bodyContainer.DrawHeight / 2f, DrawHeight / 2f);
 
         protected override Container<Drawable> Content => bodyContainer;
 
@@ -46,6 +46,8 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
 
             AddInternal(bodyContainer = new Container
             {
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
                 AutoSizeAxes = Axes.Both,
                 Children = new[]
                 {
diff --git a/osu.Game.Modes.Taiko/UI/HitTarget.cs b/osu.Game.Modes.Taiko/UI/HitTarget.cs
index a17480628d..f5d6a3b797 100644
--- a/osu.Game.Modes.Taiko/UI/HitTarget.cs
+++ b/osu.Game.Modes.Taiko/UI/HitTarget.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Modes.Taiko.UI
 
         public HitTarget()
         {
-            RelativeSizeAxes = Axes.Y;
+            Size = new Vector2(TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT);
 
             Children = new Drawable[]
             {
@@ -47,7 +47,7 @@ namespace osu.Game.Modes.Taiko.UI
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
                     Y = border_offset,
-                    Size = new Vector2(border_thickness, (TaikoPlayfield.PLAYFIELD_HEIGHT - strong_hit_diameter) / 2f - border_offset),
+                    Size = new Vector2(border_thickness, (TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT - strong_hit_diameter) / 2f - border_offset),
                     Alpha = 0.1f
                 },
                 new CircularContainer
@@ -96,7 +96,7 @@ namespace osu.Game.Modes.Taiko.UI
                     Anchor = Anchor.BottomCentre,
                     Origin = Anchor.BottomCentre,
                     Y = -border_offset,
-                    Size = new Vector2(border_thickness, (TaikoPlayfield.PLAYFIELD_HEIGHT - strong_hit_diameter) / 2f - border_offset),
+                    Size = new Vector2(border_thickness, (TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT - strong_hit_diameter) / 2f - border_offset),
                     Alpha = 0.1f
                 },
             };
diff --git a/osu.Game.Modes.Taiko/UI/InputDrum.cs b/osu.Game.Modes.Taiko/UI/InputDrum.cs
index 0c1e1105cb..d238c38e74 100644
--- a/osu.Game.Modes.Taiko/UI/InputDrum.cs
+++ b/osu.Game.Modes.Taiko/UI/InputDrum.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Modes.Taiko.UI
     {
         public InputDrum()
         {
-            Size = new Vector2(TaikoPlayfield.PLAYFIELD_HEIGHT);
+            Size = new Vector2(TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT);
 
             const float middle_split = 10;
 
diff --git a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
index 9e7eb571a1..0407cbc5fd 100644
--- a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Modes.Taiko.UI
         /// The play field height. This is relative to the size of hit objects
         /// such that the playfield is just a bit larger than strong hits.
         /// </summary>
-        public const float PLAYFIELD_HEIGHT = TaikoHitObject.CIRCLE_RADIUS * 2 * 2;
+        public const float DEFAULT_PLAYFIELD_HEIGHT = TaikoHitObject.CIRCLE_RADIUS * 2 * 2;
 
         /// <summary>
         /// The offset from <see cref="left_area_size"/> which the center of the hit target lies at.
@@ -53,7 +53,7 @@ namespace osu.Game.Modes.Taiko.UI
         public TaikoPlayfield()
         {
             RelativeSizeAxes = Axes.X;
-            Height = PLAYFIELD_HEIGHT;
+            Height = DEFAULT_PLAYFIELD_HEIGHT;
 
             AddInternal(new Drawable[]
             {
@@ -93,7 +93,8 @@ namespace osu.Game.Modes.Taiko.UI
                                 {
                                     Anchor = Anchor.CentreLeft,
                                     Origin = Anchor.Centre,
-                                    Size = new Vector2(TaikoHitObject.CIRCLE_RADIUS * 2),
+                                    Size = new Vector2(DEFAULT_PLAYFIELD_HEIGHT),
+                                    FillMode = FillMode.Fit,
                                     BlendingMode = BlendingMode.Additive
                                 },
                                 barLineContainer = new Container<DrawableBarLine>
@@ -104,6 +105,7 @@ namespace osu.Game.Modes.Taiko.UI
                                 {
                                     Anchor = Anchor.CentreLeft,
                                     Origin = Anchor.Centre,
+                                    FillMode = FillMode.Fit
                                 },
                                 hitObjectContainer = new Container
                                 {
@@ -111,7 +113,8 @@ namespace osu.Game.Modes.Taiko.UI
                                 },
                                 judgementContainer = new Container<DrawableTaikoJudgement>
                                 {
-                                    RelativeSizeAxes = Axes.Both,
+                                    Size = new Vector2(DEFAULT_PLAYFIELD_HEIGHT),
+                                    FillMode = FillMode.Fit,
                                     BlendingMode = BlendingMode.Additive
                                 },
                             },
@@ -120,7 +123,8 @@ namespace osu.Game.Modes.Taiko.UI
                 },
                 leftBackgroundContainer = new Container
                 {
-                    Size = new Vector2(left_area_size, PLAYFIELD_HEIGHT),
+                    RelativeSizeAxes = Axes.Y,
+                    Width = left_area_size,
                     BorderThickness = 1,
                     Children = new Drawable[]
                     {
@@ -134,6 +138,7 @@ namespace osu.Game.Modes.Taiko.UI
                             Origin = Anchor.Centre,
                             RelativePositionAxes = Axes.X,
                             Position = new Vector2(0.10f, 0),
+                            FillMode = FillMode.Fit,
                             Scale = new Vector2(0.9f)
                         },
                         new Box
@@ -164,6 +169,9 @@ namespace osu.Game.Modes.Taiko.UI
 
         public override void Add(DrawableHitObject<TaikoHitObject, TaikoJudgement> h)
         {
+            h.AutoSizeAxes = h.AutoSizeAxes & ~Axes.Y;
+            h.Height = DEFAULT_PLAYFIELD_HEIGHT;
+            h.FillMode = FillMode.Fit;
             h.Depth = (float)h.HitObject.StartTime;
 
             base.Add(h);

From 88666c865f3e673500c19f6e11cb61918f9a7997 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Mon, 10 Apr 2017 09:23:00 +0900
Subject: [PATCH 25/45] Make hit objects default size relative to play field
 size, not the other way around.

---
 .../Objects/Drawables/DrawableSwell.cs        |  4 ++--
 .../Objects/Drawables/Pieces/CirclePiece.cs   | 11 +++-------
 .../Objects/Drawables/Pieces/TaikoPiece.cs    |  2 +-
 .../Objects/Drawables/Pieces/TickPiece.cs     |  4 ++--
 .../Objects/TaikoHitObject.cs                 | 20 +++++++++++++++++--
 osu.Game.Modes.Taiko/UI/HitExplosion.cs       |  9 ++-------
 osu.Game.Modes.Taiko/UI/HitTarget.cs          | 18 ++++-------------
 osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs     |  4 ++--
 8 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableSwell.cs
index e1a590a025..1e440df69a 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                             Alpha = 0,
-                            Size = new Vector2(TaikoHitObject.CIRCLE_RADIUS * 2),
+                            Size = new Vector2(TaikoHitObject.DEFAULT_CIRCLE_DIAMETER),
                             BlendingMode = BlendingMode.Additive,
                             Masking = true,
                             Children = new []
@@ -82,7 +82,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
                             Name = "Target ring (thick border)",
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            Size = new Vector2(TaikoHitObject.CIRCLE_RADIUS * 2),
+                            Size = new Vector2(TaikoHitObject.DEFAULT_CIRCLE_DIAMETER),
                             Masking = true,
                             BorderThickness = target_ring_thick_border,
                             BlendingMode = BlendingMode.Additive,
diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
index f921511e22..216e05ebc4 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
@@ -19,15 +19,10 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
     /// </summary>
     public class CirclePiece : TaikoPiece
     {
-        public const float SYMBOL_SIZE = TaikoHitObject.CIRCLE_RADIUS * 2f * 0.45f;
+        public const float SYMBOL_SIZE = TaikoHitObject.DEFAULT_CIRCLE_DIAMETER * 0.45f;
         public const float SYMBOL_BORDER = 8;
         public const float SYMBOL_INNER_SIZE = SYMBOL_SIZE - 2 * SYMBOL_BORDER;
 
-        /// <summary>
-        /// The amount to scale up the base circle to show it as a "strong" piece.
-        /// </summary>
-        private const float strong_scale = 1.5f;
-
         /// <summary>
         /// The colour of the inner circle and outer glows.
         /// </summary>
@@ -129,10 +124,10 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
 
             if (isStrong)
             {
-                Size *= strong_scale;
+                Size *= TaikoHitObject.STRONG_CIRCLE_DIAMETER_SCALE;
 
                 //default for symbols etc.
-                Content.Scale *= strong_scale;
+                Content.Scale *= TaikoHitObject.STRONG_CIRCLE_DIAMETER_SCALE;
             }
         }
 
diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/TaikoPiece.cs b/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/TaikoPiece.cs
index a0c8865c59..2220438a4a 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/TaikoPiece.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/TaikoPiece.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
         public TaikoPiece()
         {
             //just a default
-            Size = new Vector2(TaikoHitObject.CIRCLE_RADIUS * 2);
+            Size = new Vector2(TaikoHitObject.DEFAULT_CIRCLE_DIAMETER);
         }
     }
 }
diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/TickPiece.cs b/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/TickPiece.cs
index 697102eb22..53e795e2e2 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/TickPiece.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/TickPiece.cs
@@ -15,12 +15,12 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
         /// Any tick that is not the first for a drumroll is not filled, but is instead displayed
         /// as a hollow circle. This is what controls the border width of that circle.
         /// </summary>
-        private const float tick_border_width = TaikoHitObject.CIRCLE_RADIUS / 2 / 4;
+        private const float tick_border_width = TaikoHitObject.DEFAULT_CIRCLE_DIAMETER / 16;
 
         /// <summary>
         /// The size of a tick.
         /// </summary>
-        private const float tick_size = TaikoHitObject.CIRCLE_RADIUS / 2;
+        private const float tick_size = TaikoHitObject.DEFAULT_CIRCLE_DIAMETER / 4;
 
         private bool filled;
         public bool Filled
diff --git a/osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs b/osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs
index 54ab8c5300..ebc9b19d3a 100644
--- a/osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs
+++ b/osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs
@@ -4,15 +4,31 @@
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Database;
 using osu.Game.Modes.Objects;
+using osu.Game.Modes.Taiko.UI;
 
 namespace osu.Game.Modes.Taiko.Objects
 {
     public abstract class TaikoHitObject : HitObject
     {
         /// <summary>
-        /// HitCircle radius.
+        /// Diameter of a circle relative to the size of the <see cref="TaikoPlayfield"/>.
         /// </summary>
-        public const float CIRCLE_RADIUS = 42f;
+        public const float PLAYFIELD_RELATIVE_DIAMETER = 0.5f;
+
+        /// <summary>
+        /// Scale multiplier for a strong circle.
+        /// </summary>
+        public const float STRONG_CIRCLE_DIAMETER_SCALE = 1.5f;
+
+        /// <summary>
+        /// Default circle diameter.
+        /// </summary>
+        public const float DEFAULT_CIRCLE_DIAMETER = TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT * PLAYFIELD_RELATIVE_DIAMETER;
+
+        /// <summary>
+        /// Default strong circle diameter.
+        /// </summary>
+        public const float DEFAULT_STRONG_CIRCLE_DIAMETER = DEFAULT_CIRCLE_DIAMETER * STRONG_CIRCLE_DIAMETER_SCALE;
 
         /// <summary>
         /// The time taken from the initial (off-screen) spawn position to the centre of the hit target for a <see cref="ControlPoint.BeatLength"/> of 1000ms.
diff --git a/osu.Game.Modes.Taiko/UI/HitExplosion.cs b/osu.Game.Modes.Taiko/UI/HitExplosion.cs
index eb43c1a5d0..e4e329523f 100644
--- a/osu.Game.Modes.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Modes.Taiko/UI/HitExplosion.cs
@@ -18,11 +18,6 @@ namespace osu.Game.Modes.Taiko.UI
     /// </summary>
     internal class HitExplosion : CircularContainer
     {
-        /// <summary>
-        /// The size multiplier of a hit explosion if a hit object has been hit with the second key.
-        /// </summary>
-        private const float secondhit_size_multiplier = 1.5f;
-
         /// <summary>
         /// The judgement this hit explosion visualises.
         /// </summary>
@@ -34,7 +29,7 @@ namespace osu.Game.Modes.Taiko.UI
         {
             Judgement = judgement;
 
-            Size = new Vector2(TaikoHitObject.CIRCLE_RADIUS * 2);
+            Size = new Vector2(TaikoHitObject.DEFAULT_CIRCLE_DIAMETER);
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -85,7 +80,7 @@ namespace osu.Game.Modes.Taiko.UI
         /// </summary>
         public void VisualiseSecondHit()
         {
-            ResizeTo(Size * secondhit_size_multiplier, 50);
+            ResizeTo(Size * TaikoHitObject.STRONG_CIRCLE_DIAMETER_SCALE, 50);
         }
     }
 }
diff --git a/osu.Game.Modes.Taiko/UI/HitTarget.cs b/osu.Game.Modes.Taiko/UI/HitTarget.cs
index f5d6a3b797..b22dc1d647 100644
--- a/osu.Game.Modes.Taiko/UI/HitTarget.cs
+++ b/osu.Game.Modes.Taiko/UI/HitTarget.cs
@@ -15,16 +15,6 @@ namespace osu.Game.Modes.Taiko.UI
     /// </summary>
     internal class HitTarget : Container
     {
-        /// <summary>
-        /// Diameter of normal hit object circles.
-        /// </summary>
-        private const float normal_diameter = TaikoHitObject.CIRCLE_RADIUS * 2;
-
-        /// <summary>
-        /// Diameter of strong hit object circles.
-        /// </summary>
-        private const float strong_hit_diameter = normal_diameter * 1.5f;
-
         /// <summary>
         /// The 1px inner border of the taiko playfield.
         /// </summary>
@@ -47,7 +37,7 @@ namespace osu.Game.Modes.Taiko.UI
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
                     Y = border_offset,
-                    Size = new Vector2(border_thickness, (TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT - strong_hit_diameter) / 2f - border_offset),
+                    Size = new Vector2(border_thickness, (TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT - TaikoHitObject.DEFAULT_STRONG_CIRCLE_DIAMETER) / 2f - border_offset),
                     Alpha = 0.1f
                 },
                 new CircularContainer
@@ -55,7 +45,7 @@ namespace osu.Game.Modes.Taiko.UI
                     Name = "Strong Hit Ring",
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Size = new Vector2(strong_hit_diameter),
+                    Size = new Vector2(TaikoHitObject.DEFAULT_STRONG_CIRCLE_DIAMETER),
                     Masking = true,
                     BorderColour = Color4.White,
                     BorderThickness = border_thickness,
@@ -75,7 +65,7 @@ namespace osu.Game.Modes.Taiko.UI
                     Name = "Normal Hit Ring",
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Size = new Vector2(normal_diameter),
+                    Size = new Vector2(TaikoHitObject.DEFAULT_CIRCLE_DIAMETER),
                     Masking = true,
                     BorderColour = Color4.White,
                     BorderThickness = border_thickness,
@@ -96,7 +86,7 @@ namespace osu.Game.Modes.Taiko.UI
                     Anchor = Anchor.BottomCentre,
                     Origin = Anchor.BottomCentre,
                     Y = -border_offset,
-                    Size = new Vector2(border_thickness, (TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT - strong_hit_diameter) / 2f - border_offset),
+                    Size = new Vector2(border_thickness, (TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT - TaikoHitObject.DEFAULT_STRONG_CIRCLE_DIAMETER) / 2f - border_offset),
                     Alpha = 0.1f
                 },
             };
diff --git a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
index 0407cbc5fd..ad21f22d1e 100644
--- a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
@@ -25,12 +25,12 @@ namespace osu.Game.Modes.Taiko.UI
         /// The play field height. This is relative to the size of hit objects
         /// such that the playfield is just a bit larger than strong hits.
         /// </summary>
-        public const float DEFAULT_PLAYFIELD_HEIGHT = TaikoHitObject.CIRCLE_RADIUS * 2 * 2;
+        public const float DEFAULT_PLAYFIELD_HEIGHT = 168f;
 
         /// <summary>
         /// The offset from <see cref="left_area_size"/> which the center of the hit target lies at.
         /// </summary>
-        private const float hit_target_offset = TaikoHitObject.CIRCLE_RADIUS * 1.5f + 40;
+        private const float hit_target_offset = TaikoHitObject.DEFAULT_STRONG_CIRCLE_DIAMETER / 2f + 40;
 
         /// <summary>
         /// The size of the left area of the playfield. This area contains the input drum.

From e95c7dfa3731ccab60a4fd9b9ec312a4dd72f4a2 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Mon, 10 Apr 2017 09:33:46 +0900
Subject: [PATCH 26/45] Update framework.

---
 osu-framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index 45e75163b2..3d74f40e52 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 45e75163b272b7aa023afec7801ea079aba4ee69
+Subproject commit 3d74f40e524adac263ead7437894a7b11fbf5a20

From 39adb609526d7cfb010743b19e91a98052da8662 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Mon, 10 Apr 2017 10:16:07 +0900
Subject: [PATCH 27/45] Update framework.

---
 osu-framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index 11b1c69d5f..7ac3dbff36 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 11b1c69d5ff2b212a69ee0bf5cc576a04e510044
+Subproject commit 7ac3dbff3615fb410da1e330e6379b53a41292b6

From 05ac73edcb18241c7822a941deba83388d875aae Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Mon, 10 Apr 2017 10:33:52 +0900
Subject: [PATCH 28/45] Apply width modification to hit object container
 instead of hit objects, to preserve original size.

---
 osu-framework                                 |  2 +-
 .../Drawables/DrawableTaikoHitObject.cs       |  4 +---
 osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs     | 23 +++++++++++++++----
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/osu-framework b/osu-framework
index 3d74f40e52..49775b9d5e 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 3d74f40e524adac263ead7437894a7b11fbf5a20
+Subproject commit 49775b9d5e7a383d78ef1018532040823fe18e76
diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 7cd9f9baa5..13ea09aab0 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
         /// </summary>
         private readonly List<Key> validKeys = new List<Key>(new[] { Key.D, Key.F, Key.J, Key.K });
 
-        public override Vector2 OriginPosition => new Vector2(bodyContainer.DrawHeight / 2f, DrawHeight / 2f);
+        public override Vector2 OriginPosition => new Vector2(DrawHeight / 2f);
 
         protected override Container<Drawable> Content => bodyContainer;
 
@@ -46,8 +46,6 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
 
             AddInternal(bodyContainer = new Container
             {
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.CentreLeft,
                 AutoSizeAxes = Axes.Both,
                 Children = new[]
                 {
diff --git a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
index ad21f22d1e..0056592447 100644
--- a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
@@ -107,9 +107,10 @@ namespace osu.Game.Modes.Taiko.UI
                                     Origin = Anchor.Centre,
                                     FillMode = FillMode.Fit
                                 },
-                                hitObjectContainer = new Container
+                                hitObjectContainer = new HitObjectContainer
                                 {
-                                    RelativeSizeAxes = Axes.Both,
+                                    Height = DEFAULT_PLAYFIELD_HEIGHT,
+                                    FillMode = FillMode.Fit
                                 },
                                 judgementContainer = new Container<DrawableTaikoJudgement>
                                 {
@@ -169,9 +170,6 @@ namespace osu.Game.Modes.Taiko.UI
 
         public override void Add(DrawableHitObject<TaikoHitObject, TaikoJudgement> h)
         {
-            h.AutoSizeAxes = h.AutoSizeAxes & ~Axes.Y;
-            h.Height = DEFAULT_PLAYFIELD_HEIGHT;
-            h.FillMode = FillMode.Fit;
             h.Depth = (float)h.HitObject.StartTime;
 
             base.Add(h);
@@ -216,5 +214,20 @@ namespace osu.Game.Modes.Taiko.UI
             else
                 hitExplosionContainer.Children.FirstOrDefault(e => e.Judgement == judgedObject.Judgement)?.VisualiseSecondHit();
         }
+
+        private class HitObjectContainer : Container
+        {
+            public HitObjectContainer()
+            {
+                RelativeSizeAxes = Axes.X;
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                Width = 1 / DrawScale.X;
+            }
+        }
     }
 }
\ No newline at end of file

From 30b5b6f7e2bcb0d018ea744b555df9178dfd3045 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Mon, 10 Apr 2017 11:54:01 +0900
Subject: [PATCH 29/45] General cleanup.

---
 osu.Game.Modes.Taiko/Objects/Drawables/DrawableDrumRoll.cs     | 2 +-
 .../Objects/Drawables/DrawableTaikoHitObject.cs                | 2 +-
 osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs                      | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 695717ce9e..0a0098dd34 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
         protected override TaikoPiece CreateMainPiece() => new ElongatedCirclePiece(HitObject.IsStrong)
         {
             Length = (float)(HitObject.Duration / HitObject.ScrollTime),
-            PlayfieldLengthReference = () => Parent.DrawSize.X / DrawScale.X
+            PlayfieldLengthReference = () => Parent.DrawSize.X
         };
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 13ea09aab0..f15f2bd152 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
         /// </summary>
         private readonly List<Key> validKeys = new List<Key>(new[] { Key.D, Key.F, Key.J, Key.K });
 
-        public override Vector2 OriginPosition => new Vector2(DrawHeight / 2f);
+        public override Vector2 OriginPosition => new Vector2(DrawHeight / 2);
 
         protected override Container<Drawable> Content => bodyContainer;
 
diff --git a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
index 0056592447..4cbae2c3aa 100644
--- a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
@@ -215,6 +215,9 @@ namespace osu.Game.Modes.Taiko.UI
                 hitExplosionContainer.Children.FirstOrDefault(e => e.Judgement == judgedObject.Judgement)?.VisualiseSecondHit();
         }
 
+        /// <summary>
+        /// Container for hit objects. Locks width to parent width even through scale.
+        /// </summary>
         private class HitObjectContainer : Container
         {
             public HitObjectContainer()

From e73f543c4f02a140418da3b1e5bb517aafca2190 Mon Sep 17 00:00:00 2001
From: Andrey Zavadskiy <megaman9919@gmail.com>
Date: Mon, 10 Apr 2017 06:06:10 +0300
Subject: [PATCH 30/45] Applied suggestions

---
 ...{RetryOverlay.cs => HotkeyRetryOverlay.cs} | 45 ++++++++++++-------
 osu.Game/Screens/Play/Player.cs               |  4 +-
 osu.Game/osu.Game.csproj                      |  2 +-
 3 files changed, 32 insertions(+), 19 deletions(-)
 rename osu.Game/Screens/Play/{RetryOverlay.cs => HotkeyRetryOverlay.cs} (53%)

diff --git a/osu.Game/Screens/Play/RetryOverlay.cs b/osu.Game/Screens/Play/HotkeyRetryOverlay.cs
similarity index 53%
rename from osu.Game/Screens/Play/RetryOverlay.cs
rename to osu.Game/Screens/Play/HotkeyRetryOverlay.cs
index e44f7d8914..4e383510fc 100644
--- a/osu.Game/Screens/Play/RetryOverlay.cs
+++ b/osu.Game/Screens/Play/HotkeyRetryOverlay.cs
@@ -8,23 +8,41 @@ using osu.Framework.Audio.Sample;
 using osu.Framework.Audio;
 using System;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using OpenTK.Graphics;
+using osu.Framework.Threading;
 
 namespace osu.Game.Screens.Play
 {
-    public class RetryOverlay : Container
+    public class HotkeyRetryOverlay : Container
     {
         public Action Action;
-        public Action OnKeyPressed;
-        public Action OnKeyReleased;
 
         private SampleChannel retrySample;
-        private bool keyIsHeld;
+        private ScheduledDelegate task;
+        private Box overlay;
+
+        private const int activate_delay = 500;
+        private const int fadeout_delay = 200;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
             retrySample = audio.Sample.Get(@"Menu/menuback");
+            RelativeSizeAxes = Axes.Both;
             AlwaysPresent = true;
+
+            Children = new Drawable[]
+            {
+                overlay = new Box
+                {
+                    Alpha = 0,
+                    AlwaysPresent = true,
+                    Colour = Color4.Black,
+                    RelativeSizeAxes = Axes.Both,
+                }
+            };
         }
 
         protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
@@ -33,17 +51,14 @@ namespace osu.Game.Screens.Play
 
             if (args.Key == Key.Tilde)
             {
-                keyIsHeld = true;
-                OnKeyPressed();
+                overlay.FadeIn(activate_delay);
 
-                Delay(500).Schedule(() =>
+                task = Scheduler.AddDelayed(() =>
                 {
-                    if (keyIsHeld)
-                    {
-                        retrySample.Play();
-                        Action();
-                    }
-                });
+                    retrySample.Play();
+                    Action();
+                }, activate_delay);
+
                 return true;
             }
 
@@ -54,8 +69,8 @@ namespace osu.Game.Screens.Play
         {
             if (args.Key == Key.Tilde)
             {
-                keyIsHeld = false;
-                OnKeyReleased();
+                task?.Cancel();
+                overlay.FadeOut(fadeout_delay);
                 return true;
             }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index af3da23231..939895654b 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -159,11 +159,9 @@ namespace osu.Game.Screens.Play
                     OnRetry = Restart,
                     OnQuit = Exit,
                 },
-                new RetryOverlay
+                new HotkeyRetryOverlay
                 {
                     Action = Restart,
-                    OnKeyPressed = () => Content.FadeColour(Color4.Black, 500),
-                    OnKeyReleased = () => Content.FadeColour(Color4.White, 200),
                 }
             };
         }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 1777bf6dc2..d90fdda41a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -180,7 +180,7 @@
     <Compile Include="Screens\Backgrounds\BackgroundScreenEmpty.cs" />
     <Compile Include="Screens\Charts\ChartInfo.cs" />
     <Compile Include="Screens\Edit\Editor.cs" />
-    <Compile Include="Screens\Play\RetryOverlay.cs" />
+    <Compile Include="Screens\Play\HotkeyRetryOverlay.cs" />
     <Compile Include="Screens\ScreenWhiteBox.cs" />
     <Compile Include="Screens\Loader.cs" />
     <Compile Include="Screens\Menu\Button.cs" />

From 1879a05c7beb31f1a3b69bb0234c47fa0235624e Mon Sep 17 00:00:00 2001
From: Andrey Zavadskiy <megaman9919@gmail.com>
Date: Mon, 10 Apr 2017 06:10:12 +0300
Subject: [PATCH 31/45] Removed using

---
 osu.Game/Screens/Play/Player.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 939895654b..a7108eda1b 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -22,7 +22,6 @@ using System;
 using System.Linq;
 using osu.Framework.Threading;
 using osu.Game.Modes.Scoring;
-using OpenTK.Graphics;
 
 namespace osu.Game.Screens.Play
 {

From d6f388f8fde4e18a2137d3b0426061a29652593b Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Mon, 10 Apr 2017 14:28:01 +0900
Subject: [PATCH 32/45] Add better scale adjustements to TaikoPlayfield.

It will now keep the original width while scaling everything inside to match the playfield height.
---
 osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs | 168 ++++++++++++++--------
 1 file changed, 105 insertions(+), 63 deletions(-)

diff --git a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
index 4cbae2c3aa..6fe2282d88 100644
--- a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
@@ -16,14 +16,14 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics.Primitives;
 using System.Linq;
 using osu.Game.Modes.Taiko.Objects.Drawables;
+using System;
 
 namespace osu.Game.Modes.Taiko.UI
 {
     public class TaikoPlayfield : Playfield<TaikoHitObject, TaikoJudgement>
     {
         /// <summary>
-        /// The play field height. This is relative to the size of hit objects
-        /// such that the playfield is just a bit larger than strong hits.
+        /// The default play field height.
         /// </summary>
         public const float DEFAULT_PLAYFIELD_HEIGHT = 168f;
 
@@ -53,12 +53,15 @@ namespace osu.Game.Modes.Taiko.UI
         public TaikoPlayfield()
         {
             RelativeSizeAxes = Axes.X;
+
+            // Default height
             Height = DEFAULT_PLAYFIELD_HEIGHT;
 
             AddInternal(new Drawable[]
             {
                 rightBackgroundContainer = new Container
                 {
+                    Name = "Transparent playfield background",
                     RelativeSizeAxes = Axes.Both,
                     BorderThickness = 2,
                     Masking = true,
@@ -77,82 +80,88 @@ namespace osu.Game.Modes.Taiko.UI
                         },
                     }
                 },
-                new Container
+                new ScaleFixContainer
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Left = left_area_size },
-                    Children = new Drawable[]
+                    RelativeSizeAxes = Axes.X,
+                    Height = DEFAULT_PLAYFIELD_HEIGHT,
+                    Children = new[]
                     {
                         new Container
                         {
-                            X = hit_target_offset,
+                            Name = "Transparent playfield elements",
                             RelativeSizeAxes = Axes.Both,
+                            Padding = new MarginPadding { Left = left_area_size },
                             Children = new Drawable[]
                             {
-                                hitExplosionContainer = new Container<HitExplosion>
+                                new Container
                                 {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.Centre,
-                                    Size = new Vector2(DEFAULT_PLAYFIELD_HEIGHT),
-                                    FillMode = FillMode.Fit,
-                                    BlendingMode = BlendingMode.Additive
+                                    Name = "Hit target container",
+                                    X = hit_target_offset,
+                                    RelativeSizeAxes = Axes.Both,
+                                    Children = new Drawable[]
+                                    {
+                                        hitExplosionContainer = new Container<HitExplosion>
+                                        {
+                                            Anchor = Anchor.CentreLeft,
+                                            Origin = Anchor.Centre,
+                                            RelativeSizeAxes = Axes.Y,
+                                            BlendingMode = BlendingMode.Additive
+                                        },
+                                        barLineContainer = new Container<DrawableBarLine>
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                        },
+                                        new HitTarget
+                                        {
+                                            Anchor = Anchor.CentreLeft,
+                                            Origin = Anchor.Centre,
+                                        },
+                                        hitObjectContainer = new Container
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                        },
+                                        judgementContainer = new Container<DrawableTaikoJudgement>
+                                        {
+                                            RelativeSizeAxes = Axes.Y,
+                                            BlendingMode = BlendingMode.Additive
+                                        },
+                                    },
                                 },
-                                barLineContainer = new Container<DrawableBarLine>
+                            }
+                        },
+                        leftBackgroundContainer = new Container
+                        {
+                            Name = "Left overlay",
+                            Size = new Vector2(left_area_size, DEFAULT_PLAYFIELD_HEIGHT),
+                            BorderThickness = 1,
+                            Children = new Drawable[]
+                            {
+                                leftBackground = new Box
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                 },
-                                new HitTarget
+                                new InputDrum
                                 {
-                                    Anchor = Anchor.CentreLeft,
+                                    Anchor = Anchor.Centre,
                                     Origin = Anchor.Centre,
-                                    FillMode = FillMode.Fit
+                                    RelativePositionAxes = Axes.X,
+                                    Position = new Vector2(0.10f, 0),
+                                    Scale = new Vector2(0.9f)
                                 },
-                                hitObjectContainer = new HitObjectContainer
+                                new Box
                                 {
-                                    Height = DEFAULT_PLAYFIELD_HEIGHT,
-                                    FillMode = FillMode.Fit
+                                    Anchor = Anchor.TopRight,
+                                    RelativeSizeAxes = Axes.Y,
+                                    Width = 10,
+                                    ColourInfo = Framework.Graphics.Colour.ColourInfo.GradientHorizontal(Color4.Black.Opacity(0.6f), Color4.Black.Opacity(0)),
                                 },
-                                judgementContainer = new Container<DrawableTaikoJudgement>
-                                {
-                                    Size = new Vector2(DEFAULT_PLAYFIELD_HEIGHT),
-                                    FillMode = FillMode.Fit,
-                                    BlendingMode = BlendingMode.Additive
-                                },
-                            },
-                        },
-                    }
-                },
-                leftBackgroundContainer = new Container
-                {
-                    RelativeSizeAxes = Axes.Y,
-                    Width = left_area_size,
-                    BorderThickness = 1,
-                    Children = new Drawable[]
-                    {
-                        leftBackground = new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        new InputDrum
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            RelativePositionAxes = Axes.X,
-                            Position = new Vector2(0.10f, 0),
-                            FillMode = FillMode.Fit,
-                            Scale = new Vector2(0.9f)
-                        },
-                        new Box
-                        {
-                            Anchor = Anchor.TopRight,
-                            RelativeSizeAxes = Axes.Y,
-                            Width = 10,
-                            ColourInfo = Framework.Graphics.Colour.ColourInfo.GradientHorizontal(Color4.Black.Opacity(0.6f), Color4.Black.Opacity(0)),
+                            }
                         },
                     }
                 },
                 topLevelHitContainer = new Container
                 {
+                    Name = "Top level hit objects",
                     RelativeSizeAxes = Axes.Both,
                 }
             });
@@ -216,20 +225,53 @@ namespace osu.Game.Modes.Taiko.UI
         }
 
         /// <summary>
-        /// Container for hit objects. Locks width to parent width even through scale.
+        /// This is a very special type of container. It serves a similar purpose to <see cref="FillMode.Fit"/>, however unlike <see cref="FillMode.Fit"/>,
+        /// this will only adjust the scale relative to the height of its parent and will maintain the original width relative to its parent.
+        /// 
+        /// <para>
+        /// By adjusting the scale relative to the height of its parent, the aspect ratio of this container's children is maintained, however this is undesirable
+        /// in the case where the hit object container should not have its width adjusted by scale. To counteract this, another container is nested inside this
+        /// container which takes care of reversing the width adjustment while appearing transparent to the user.
+        /// </para>
         /// </summary>
-        private class HitObjectContainer : Container
+        private class ScaleFixContainer : Container
         {
-            public HitObjectContainer()
+            protected override Container<Drawable> Content => widthAdjustmentContainer;
+            private readonly WidthAdjustmentContainer widthAdjustmentContainer;
+
+            /// <summary>
+            /// We only want to apply DrawScale in the Y-axis to preserve aspect ratio and <see cref="TaikoPlayfield"/> doesn't care about having its width adjusted.
+            /// </summary>
+            protected override Vector2 DrawScale => Scale * RelativeToAbsoluteFactor.Y / DrawHeight;
+
+            public ScaleFixContainer()
             {
-                RelativeSizeAxes = Axes.X;
+                AddInternal(widthAdjustmentContainer = new WidthAdjustmentContainer { ParentDrawScaleReference = () => DrawScale.X });
             }
 
-            protected override void Update()
+            /// <summary>
+            /// The container type that reverses the <see cref="Drawable.DrawScale"/> width adjustment.
+            /// </summary>
+            private class WidthAdjustmentContainer : Container
             {
-                base.Update();
+                /// <summary>
+                /// This container needs to know its parent's <see cref="Drawable.DrawScale"/> so it can reverse the width adjustment caused by <see cref="Drawable.DrawScale"/>.
+                /// </summary>
+                public Func<float> ParentDrawScaleReference;
 
-                Width = 1 / DrawScale.X;
+                public WidthAdjustmentContainer()
+                {
+                    // This container doesn't care about height, it should always fill its parent
+                    RelativeSizeAxes = Axes.Y;
+                }
+
+                protected override void Update()
+                {
+                    base.Update();
+
+                    // Reverse the DrawScale adjustment
+                    Width = Parent.DrawSize.X / ParentDrawScaleReference();
+                }
             }
         }
     }

From f4094fbde244901d1e4e159f8bf63831e1901bb2 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Mon, 10 Apr 2017 14:28:28 +0900
Subject: [PATCH 33/45] Extend TestCaseTaikoPlayfield a bit.

---
 .../Tests/TestCaseTaikoPlayfield.cs           | 43 ++++++++++++++++---
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs b/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
index a942535d06..a8e4382ebb 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.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 OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.MathUtils;
@@ -11,20 +12,21 @@ using osu.Game.Modes.Taiko.Judgements;
 using osu.Game.Modes.Taiko.Objects;
 using osu.Game.Modes.Taiko.Objects.Drawables;
 using osu.Game.Modes.Taiko.UI;
+using System;
 
 namespace osu.Desktop.VisualTests.Tests
 {
     internal class TestCaseTaikoPlayfield : TestCase
     {
-        public override string Description => "Taiko playfield";
+        private const double default_duration = 300;
+        private const float scroll_time = 1000;
 
-        private TaikoPlayfield playfield;
+        public override string Description => "Taiko playfield";
 
         protected override double TimePerAction => default_duration * 2;
 
-        private const double default_duration = 300;
-
-        private const float scroll_time = 1000;
+        private readonly Random rng = new Random(1337);
+        private TaikoPlayfield playfield;
 
         public override void Reset()
         {
@@ -41,7 +43,11 @@ namespace osu.Desktop.VisualTests.Tests
             AddStep("Strong Rim", () => addRimHit(true));
             AddStep("Add bar line", () => addBarLine(false));
             AddStep("Add major bar line", () => addBarLine(true));
-
+            AddStep("Height test 1", () => changePlayfieldSize(1));
+            AddStep("Height test 2", () => changePlayfieldSize(2));
+            AddStep("Height test 3", () => changePlayfieldSize(3));
+            AddStep("Height test 4", () => changePlayfieldSize(4));
+            AddStep("Height test 5", () => changePlayfieldSize(5));
 
             var rateAdjustClock = new StopwatchClock(true) { Rate = 1 };
 
@@ -57,6 +63,31 @@ namespace osu.Desktop.VisualTests.Tests
             });
         }
 
+        private void changePlayfieldSize(int step)
+        {
+            switch (step)
+            {
+                case 1:
+                    addCentreHit(false);
+                    break;
+                case 2:
+                    addCentreHit(true);
+                    break;
+                case 3:
+                    addDrumRoll(false);
+                    break;
+                case 4:
+                    addDrumRoll(true);
+                    break;
+                case 5:
+                    addSwell(1000);
+                    playfield.Delay(scroll_time - 100);
+                    break;
+            }
+
+            playfield.ResizeTo(new Vector2(1, rng.Next(25, 400)), 500);
+        }
+
         private void addHitJudgement()
         {
             TaikoHitResult hitResult = RNG.Next(2) == 0 ? TaikoHitResult.Good : TaikoHitResult.Great;

From b57351f6e301cd0a66c3ddc7905c38e3a49671c3 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Mon, 10 Apr 2017 14:43:13 +0900
Subject: [PATCH 34/45] Update framework.

---
 osu-framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index 49775b9d5e..7ac3dbff36 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 49775b9d5e7a383d78ef1018532040823fe18e76
+Subproject commit 7ac3dbff3615fb410da1e330e6379b53a41292b6

From bb4a909de5d912971aaad86a71d53cbdc0ed74de Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 Apr 2017 14:31:08 +0900
Subject: [PATCH 35/45] Update UI control access in line with framework
 changes.

---
 osu-framework                                 |  2 +-
 .../Tests/TestCaseTabControl.cs               |  2 +-
 osu.Game/Graphics/UserInterface/Nub.cs        | 40 +++++++---------
 .../Graphics/UserInterface/OsuCheckbox.cs     | 47 ++++---------------
 .../Graphics/UserInterface/OsuDropdown.cs     |  2 +-
 .../Graphics/UserInterface/OsuSliderBar.cs    |  5 +-
 .../UserInterface/OsuTabControlCheckbox.cs    | 35 +++++++-------
 osu.Game/Overlays/Options/OptionDropdown.cs   |  2 +-
 osu.Game/Overlays/Options/OptionTextBox.cs    | 30 +-----------
 .../Select/BeatmapDetailAreaTabControl.cs     |  9 ++--
 osu.Game/Screens/Select/FilterControl.cs      | 11 ++---
 11 files changed, 58 insertions(+), 127 deletions(-)

diff --git a/osu-framework b/osu-framework
index 7ac3dbff36..bbfd0fc7a8 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 7ac3dbff3615fb410da1e330e6379b53a41292b6
+Subproject commit bbfd0fc7a8f5293a0f853f51040b40808abbb459
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs b/osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs
index 2d3969b822..b72abd1992 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs
@@ -36,7 +36,7 @@ namespace osu.Desktop.VisualTests.Tests
             filter.PinItem(GroupMode.All);
             filter.PinItem(GroupMode.RecentlyPlayed);
 
-            filter.SelectedItem.ValueChanged += newFilter =>
+            filter.Current.ValueChanged += newFilter =>
             {
                 text.Text = "Currently Selected: " + newFilter.ToString();
             };
diff --git a/osu.Game/Graphics/UserInterface/Nub.cs b/osu.Game/Graphics/UserInterface/Nub.cs
index e150c7dc07..a5a4fab3e1 100644
--- a/osu.Game/Graphics/UserInterface/Nub.cs
+++ b/osu.Game/Graphics/UserInterface/Nub.cs
@@ -3,8 +3,8 @@
 
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -12,18 +12,18 @@ using osu.Framework.Graphics.UserInterface;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public class Nub : CircularContainer, IStateful<CheckboxState>
+    public class Nub : CircularContainer, IHasCurrentValue<bool>
     {
         public const float COLLAPSED_SIZE = 20;
         public const float EXPANDED_SIZE = 40;
 
-        private readonly Box fill;
-
         private const float border_width = 3;
         private Color4 glowingColour, idleColour;
 
         public Nub()
         {
+            Box fill;
+
             Size = new Vector2(COLLAPSED_SIZE, 12);
 
             BorderColour = Color4.White;
@@ -40,6 +40,14 @@ namespace osu.Game.Graphics.UserInterface
                     AlwaysPresent = true,
                 },
             };
+
+            Current.ValueChanged += newValue =>
+            {
+                if (newValue)
+                    fill.FadeIn(200, EasingTypes.OutQuint);
+                else
+                    fill.FadeTo(0.01f, 200, EasingTypes.OutQuint); //todo: remove once we figure why containers aren't drawing at all times
+            };
         }
 
         [BackgroundDependencyLoader]
@@ -84,28 +92,12 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        private CheckboxState state;
+        private readonly Bindable<bool> current = new Bindable<bool>();
 
-        public CheckboxState State
+        public Bindable<bool> Current
         {
-            get
-            {
-                return state;
-            }
-            set
-            {
-                state = value;
-
-                switch (state)
-                {
-                    case CheckboxState.Checked:
-                        fill.FadeIn(200, EasingTypes.OutQuint);
-                        break;
-                    case CheckboxState.Unchecked:
-                        fill.FadeTo(0.01f, 200, EasingTypes.OutQuint); //todo: remove once we figure why containers aren't drawing at all times
-                        break;
-                }
-            }
+            get { return current; }
+            set { current.BindTo(value); }
         }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
index 6a5151b90c..5d4760fec6 100644
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@@ -23,16 +23,10 @@ namespace osu.Game.Graphics.UserInterface
         {
             set
             {
-                if (bindable != null)
-                    bindable.ValueChanged -= bindableValueChanged;
                 bindable = value;
+
                 if (bindable != null)
-                {
-                    bool state = State == CheckboxState.Checked;
-                    if (state != bindable.Value)
-                        State = bindable.Value ? CheckboxState.Checked : CheckboxState.Unchecked;
-                    bindable.ValueChanged += bindableValueChanged;
-                }
+                    Current = bindable;
 
                 if (bindable?.Disabled ?? true)
                     Alpha = 0.3f;
@@ -78,23 +72,20 @@ namespace osu.Game.Graphics.UserInterface
                 labelSpriteText = new OsuSpriteText(),
                 nub = new Nub
                 {
+                    Current = Current,
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
                     Margin = new MarginPadding { Right = 5 },
                 }
             };
-        }
 
-        private void bindableValueChanged(bool isChecked)
-        {
-            State = isChecked ? CheckboxState.Checked : CheckboxState.Unchecked;
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            if (bindable != null)
-                bindable.ValueChanged -= bindableValueChanged;
-            base.Dispose(isDisposing);
+            Current.ValueChanged += newValue =>
+            {
+                if (newValue)
+                    sampleChecked?.Play();
+                else
+                    sampleUnchecked?.Play();
+            };
         }
 
         protected override bool OnHover(InputState state)
@@ -117,23 +108,5 @@ namespace osu.Game.Graphics.UserInterface
             sampleChecked = audio.Sample.Get(@"Checkbox/check-on");
             sampleUnchecked = audio.Sample.Get(@"Checkbox/check-off");
         }
-
-        protected override void OnChecked()
-        {
-            sampleChecked?.Play();
-            nub.State = CheckboxState.Checked;
-
-            if (bindable != null)
-                bindable.Value = true;
-        }
-
-        protected override void OnUnchecked()
-        {
-            sampleUnchecked?.Play();
-            nub.State = CheckboxState.Unchecked;
-
-            if (bindable != null)
-                bindable.Value = false;
-        }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
index 3466fb1a60..9bb0d15545 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Graphics.UserInterface
 
         private class OsuDropdownMenuItem : DropdownMenuItem<T>
         {
-            public OsuDropdownMenuItem(string text, T value) : base(text, value)
+            public OsuDropdownMenuItem(string text, T current) : base(text, current)
             {
                 Foreground.Padding = new MarginPadding(2);
 
diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index 078c8564d7..91fb1c672a 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -50,7 +50,6 @@ namespace osu.Game.Graphics.UserInterface
                 nub = new Nub
                 {
                     Origin = Anchor.TopCentre,
-                    State = CheckboxState.Unchecked,
                     Expanded = true,
                 }
             };
@@ -94,13 +93,13 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
         {
-            nub.State = CheckboxState.Checked;
+            nub.Current.Value = true;
             return base.OnMouseDown(state, args);
         }
 
         protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
         {
-            nub.State = CheckboxState.Unchecked;
+            nub.Current.Value = false;
             return base.OnMouseUp(state, args);
         }
 
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
index 5914d0ba4c..f732916889 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
@@ -1,7 +1,6 @@
 // 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 OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Allocation;
@@ -24,8 +23,6 @@ namespace osu.Game.Graphics.UserInterface
         private readonly SpriteText text;
         private readonly TextAwesome icon;
 
-        public event EventHandler<CheckboxState> Action;
-
         private Color4? accentColour;
         public Color4 AccentColour
         {
@@ -34,7 +31,7 @@ namespace osu.Game.Graphics.UserInterface
             {
                 accentColour = value;
 
-                if (State != CheckboxState.Checked)
+                if (Current)
                 {
                     text.Colour = AccentColour;
                     icon.Colour = AccentColour;
@@ -48,20 +45,6 @@ namespace osu.Game.Graphics.UserInterface
             set { text.Text = value; }
         }
 
-        protected override void OnChecked()
-        {
-            fadeIn();
-            icon.Icon = FontAwesome.fa_check_circle_o;
-            Action?.Invoke(this, State);
-        }
-
-        protected override void OnUnchecked()
-        {
-            fadeOut();
-            icon.Icon = FontAwesome.fa_circle_o;
-            Action?.Invoke(this, State);
-        }
-
         private const float transition_length = 500;
 
         private void fadeIn()
@@ -84,7 +67,7 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override void OnHoverLost(InputState state)
         {
-            if (State == CheckboxState.Unchecked)
+            if (!Current)
                 fadeOut();
 
             base.OnHoverLost(state);
@@ -134,6 +117,20 @@ namespace osu.Game.Graphics.UserInterface
                     Anchor = Anchor.BottomLeft,
                 }
             };
+
+            Current.ValueChanged += v =>
+            {
+                if (v)
+                {
+                    fadeIn();
+                    icon.Icon = FontAwesome.fa_check_circle_o;
+                }
+                else
+                {
+                    fadeOut();
+                    icon.Icon = FontAwesome.fa_circle_o;
+                }
+            };
         }
     }
 }
diff --git a/osu.Game/Overlays/Options/OptionDropdown.cs b/osu.Game/Overlays/Options/OptionDropdown.cs
index 9ae02a17d3..decf5896c2 100644
--- a/osu.Game/Overlays/Options/OptionDropdown.cs
+++ b/osu.Game/Overlays/Options/OptionDropdown.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Options
             set
             {
                 bindable = value;
-                dropdown.SelectedValue.BindTo(bindable);
+                dropdown.Current = bindable;
                 if (bindable.Disabled)
                     Alpha = 0.3f;
             }
diff --git a/osu.Game/Overlays/Options/OptionTextBox.cs b/osu.Game/Overlays/Options/OptionTextBox.cs
index 722f24d50d..346c9f88f5 100644
--- a/osu.Game/Overlays/Options/OptionTextBox.cs
+++ b/osu.Game/Overlays/Options/OptionTextBox.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Configuration;
-using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Options
@@ -15,38 +14,13 @@ namespace osu.Game.Overlays.Options
         {
             set
             {
-                if (bindable != null)
-                    bindable.ValueChanged -= bindableValueChanged;
                 bindable = value;
-                if (bindable != null)
-                {
-                    Text = bindable.Value;
-                    bindable.ValueChanged += bindableValueChanged;
-                }
+
+                Current = bindable;
 
                 if (bindable?.Disabled ?? true)
                     Alpha = 0.3f;
             }
         }
-
-        public OptionTextBox()
-        {
-            OnChange += onChange;
-        }
-
-        private void onChange(TextBox sender, bool newText)
-        {
-            if (bindable != null)
-                bindable.Value = Text;
-        }
-
-        private void bindableValueChanged(string newValue) => Text = newValue;
-
-        protected override void Dispose(bool isDisposing)
-        {
-            if (bindable != null)
-                bindable.ValueChanged -= bindableValueChanged;
-            base.Dispose(isDisposing);
-        }
     }
 }
\ No newline at end of file
diff --git a/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs b/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
index c52d0397ed..48a46f0b90 100644
--- a/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
+++ b/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
@@ -8,7 +8,6 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 
@@ -24,7 +23,7 @@ namespace osu.Game.Screens.Select
 
         private void invokeOnFilter()
         {
-            OnFilter?.Invoke(tabs.SelectedItem, modsCheckbox.State == CheckboxState.Checked);
+            OnFilter?.Invoke(tabs.Current, modsCheckbox.Current);
         }
 
         [BackgroundDependencyLoader]
@@ -61,10 +60,10 @@ namespace osu.Game.Screens.Select
                 },
             };
 
-            tabs.SelectedItem.ValueChanged += item => invokeOnFilter();
-            modsCheckbox.Action += (sender, e) => invokeOnFilter();
+            tabs.Current.ValueChanged += item => invokeOnFilter();
+            modsCheckbox.Current.ValueChanged += item => invokeOnFilter();
 
-            tabs.SelectedItem.Value = BeatmapDetailTab.Global;
+            tabs.Current.Value = BeatmapDetailTab.Global;
         }
     }
 
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 6d92b35993..7596af1484 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -93,11 +93,6 @@ namespace osu.Game.Screens.Select
                         searchTextBox = new SearchTextBox
                         {
                             RelativeSizeAxes = Axes.X,
-                            OnChange = (sender, newText) =>
-                            {
-                                if (newText)
-                                    FilterChanged?.Invoke(CreateCriteria());
-                            },
                             Exit = () => Exit?.Invoke(),
                         },
                         new Box
@@ -149,10 +144,12 @@ namespace osu.Game.Screens.Select
                 }
             };
 
+            searchTextBox.Current.ValueChanged += t => FilterChanged?.Invoke(CreateCriteria());
+
             groupTabs.PinItem(GroupMode.All);
             groupTabs.PinItem(GroupMode.RecentlyPlayed);
-            groupTabs.SelectedItem.ValueChanged += val => Group = val;
-            sortTabs.SelectedItem.ValueChanged += val => Sort = val;
+            groupTabs.Current.ValueChanged += val => Group = val;
+            sortTabs.Current.ValueChanged += val => Sort = val;
         }
 
         public void Deactivate()

From b7cfdff8d13be4cde6640b638dd60b0579df0baa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 Apr 2017 15:30:17 +0900
Subject: [PATCH 36/45] Update SliderBar to use IHasCurrentValue.

---
 osu-framework                                       | 2 +-
 osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs | 2 +-
 osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs | 2 +-
 osu.Game/Overlays/Options/OptionSlider.cs           | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu-framework b/osu-framework
index bbfd0fc7a8..561b24bed4 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit bbfd0fc7a8f5293a0f853f51040b40808abbb459
+Subproject commit 561b24bed48d3670b1d33acfc7ba5e11dcd3ac0c
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
index 99da7d1c73..b14607f235 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
@@ -112,7 +112,7 @@ namespace osu.Desktop.VisualTests.Tests
                         Width = 150,
                         Height = 10,
                         SelectionColor = Color4.Orange,
-                        Value = playbackSpeed
+                        Current = playbackSpeed
                     }
                 }
             });
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs b/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs
index 7e7782662b..d41da04b3e 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs
@@ -57,7 +57,7 @@ namespace osu.Desktop.VisualTests.Tests
                         Width = 150,
                         Height = 10,
                         SelectionColor = Color4.Orange,
-                        Value = bindable
+                        Current = bindable
                     }
                 }
             });
diff --git a/osu.Game/Overlays/Options/OptionSlider.cs b/osu.Game/Overlays/Options/OptionSlider.cs
index 8fa9bf063d..1cd9fdc60c 100644
--- a/osu.Game/Overlays/Options/OptionSlider.cs
+++ b/osu.Game/Overlays/Options/OptionSlider.cs
@@ -27,12 +27,12 @@ namespace osu.Game.Overlays.Options
             }
         }
 
-        public BindableNumber<T> Bindable
+        public Bindable<T> Bindable
         {
-            get { return slider.Value; }
+            get { return slider.Current; }
             set
             {
-                slider.Value = value;
+                slider.Current = value;
                 if (value?.Disabled ?? true)
                     Alpha = 0.3f;
             }

From f12b5a8954306c7cb94a50d0248cb1d8ab523ee7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 Apr 2017 16:22:36 +0900
Subject: [PATCH 37/45] Unify disable logic.

---
 osu.Game/Graphics/UserInterface/OsuCheckbox.cs | 7 ++-----
 osu.Game/Overlays/Options/OptionDropdown.cs    | 2 +-
 osu.Game/Overlays/Options/OptionSlider.cs      | 6 ++++--
 osu.Game/Overlays/Options/OptionTextBox.cs     | 4 +---
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
index 5d4760fec6..6dfbc931cf 100644
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@@ -24,11 +24,8 @@ namespace osu.Game.Graphics.UserInterface
             set
             {
                 bindable = value;
-
-                if (bindable != null)
-                    Current = bindable;
-
-                if (bindable?.Disabled ?? true)
+                Current = bindable;
+                if (value?.Disabled ?? true)
                     Alpha = 0.3f;
             }
         }
diff --git a/osu.Game/Overlays/Options/OptionDropdown.cs b/osu.Game/Overlays/Options/OptionDropdown.cs
index decf5896c2..332c95328b 100644
--- a/osu.Game/Overlays/Options/OptionDropdown.cs
+++ b/osu.Game/Overlays/Options/OptionDropdown.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Options
             {
                 bindable = value;
                 dropdown.Current = bindable;
-                if (bindable.Disabled)
+                if (value?.Disabled ?? true)
                     Alpha = 0.3f;
             }
         }
diff --git a/osu.Game/Overlays/Options/OptionSlider.cs b/osu.Game/Overlays/Options/OptionSlider.cs
index 1cd9fdc60c..0b0a9b8b50 100644
--- a/osu.Game/Overlays/Options/OptionSlider.cs
+++ b/osu.Game/Overlays/Options/OptionSlider.cs
@@ -27,12 +27,14 @@ namespace osu.Game.Overlays.Options
             }
         }
 
+        private Bindable<T> bindable;
+
         public Bindable<T> Bindable
         {
-            get { return slider.Current; }
             set
             {
-                slider.Current = value;
+                bindable = value;
+                slider.Current = bindable;
                 if (value?.Disabled ?? true)
                     Alpha = 0.3f;
             }
diff --git a/osu.Game/Overlays/Options/OptionTextBox.cs b/osu.Game/Overlays/Options/OptionTextBox.cs
index 346c9f88f5..c2c8e91016 100644
--- a/osu.Game/Overlays/Options/OptionTextBox.cs
+++ b/osu.Game/Overlays/Options/OptionTextBox.cs
@@ -15,10 +15,8 @@ namespace osu.Game.Overlays.Options
             set
             {
                 bindable = value;
-
                 Current = bindable;
-
-                if (bindable?.Disabled ?? true)
+                if (value?.Disabled ?? true)
                     Alpha = 0.3f;
             }
         }

From ba03a989925285ab0f979238de7711657fa5d04c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 Apr 2017 16:39:10 +0900
Subject: [PATCH 38/45] Add missing config set.

---
 osu.Game/Configuration/OsuConfigManager.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 7d7c61b69a..e2f33479c0 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -46,6 +46,7 @@ namespace osu.Game.Configuration
             Set(OsuConfig.AutomaticDownload, true).Disabled = true;
             Set(OsuConfig.AutomaticDownloadNoVideo, false).Disabled = true;
             Set(OsuConfig.BlockNonFriendPM, false).Disabled = true;
+            Set(OsuConfig.Bloom, false).Disabled = true;
             Set(OsuConfig.BloomSoftening, false).Disabled = true;
             Set(OsuConfig.BossKeyFirstActivation, true).Disabled = true;
             Set(OsuConfig.ChatAudibleHighlight, true).Disabled = true;

From 5af4259ab42f5576ff3dfd5f3aee0face56a3464 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 Apr 2017 17:10:15 +0900
Subject: [PATCH 39/45] Add back explicit binds.

---
 osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs | 6 ++++--
 osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs | 7 +++++--
 osu.Game/Graphics/UserInterface/Nub.cs              | 8 +-------
 osu.Game/Graphics/UserInterface/OsuCheckbox.cs      | 5 +++--
 osu.Game/Overlays/Options/OptionDropdown.cs         | 2 +-
 osu.Game/Overlays/Options/OptionSlider.cs           | 2 +-
 osu.Game/Overlays/Options/OptionTextBox.cs          | 2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
index b14607f235..3d9f3aad79 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
@@ -99,6 +99,7 @@ namespace osu.Desktop.VisualTests.Tests
 
             AddToggleStep(@"auto", state => { auto = state; load(mode); });
 
+            BasicSliderBar<double> sliderBar;
             Add(new Container
             {
                 Anchor = Anchor.TopRight,
@@ -107,16 +108,17 @@ namespace osu.Desktop.VisualTests.Tests
                 Children = new Drawable[]
                 {
                     new SpriteText { Text = "Playback Speed" },
-                    new BasicSliderBar<double>
+                    sliderBar = new BasicSliderBar<double>
                     {
                         Width = 150,
                         Height = 10,
                         SelectionColor = Color4.Orange,
-                        Current = playbackSpeed
                     }
                 }
             });
 
+            sliderBar.Current.BindTo(playbackSpeed);
+
             framedClock.ProcessFrame();
 
             var clockAdjustContainer = new Container
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs b/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs
index d41da04b3e..b1b9ddbcda 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs
@@ -44,6 +44,8 @@ namespace osu.Desktop.VisualTests.Tests
                 kc.Add(new KeyCounterKeyboard(key));
             });
 
+            TestSliderBar<int> sliderBar;
+
             Add(new Container
             {
                 Anchor = Anchor.TopRight,
@@ -52,16 +54,17 @@ namespace osu.Desktop.VisualTests.Tests
                 Children = new Drawable[]
                 {
                     new SpriteText { Text = "FadeTime" },
-                    new TestSliderBar<int>
+                    sliderBar =new TestSliderBar<int>
                     {
                         Width = 150,
                         Height = 10,
                         SelectionColor = Color4.Orange,
-                        Current = bindable
                     }
                 }
             });
 
+            sliderBar.Current.BindTo(bindable);
+
             Add(kc);
         }
         private class TestSliderBar<T> : SliderBar<T> where T : struct
diff --git a/osu.Game/Graphics/UserInterface/Nub.cs b/osu.Game/Graphics/UserInterface/Nub.cs
index a5a4fab3e1..82ede8f079 100644
--- a/osu.Game/Graphics/UserInterface/Nub.cs
+++ b/osu.Game/Graphics/UserInterface/Nub.cs
@@ -92,12 +92,6 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        private readonly Bindable<bool> current = new Bindable<bool>();
-
-        public Bindable<bool> Current
-        {
-            get { return current; }
-            set { current.BindTo(value); }
-        }
+        public Bindable<bool> Current { get; } = new Bindable<bool>();
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
index 6dfbc931cf..d339388aa5 100644
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Graphics.UserInterface
             set
             {
                 bindable = value;
-                Current = bindable;
+                Current.BindTo(bindable);
                 if (value?.Disabled ?? true)
                     Alpha = 0.3f;
             }
@@ -69,13 +69,14 @@ namespace osu.Game.Graphics.UserInterface
                 labelSpriteText = new OsuSpriteText(),
                 nub = new Nub
                 {
-                    Current = Current,
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
                     Margin = new MarginPadding { Right = 5 },
                 }
             };
 
+            nub.Current.BindTo(Current);
+
             Current.ValueChanged += newValue =>
             {
                 if (newValue)
diff --git a/osu.Game/Overlays/Options/OptionDropdown.cs b/osu.Game/Overlays/Options/OptionDropdown.cs
index 332c95328b..ee12ba9b05 100644
--- a/osu.Game/Overlays/Options/OptionDropdown.cs
+++ b/osu.Game/Overlays/Options/OptionDropdown.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Options
             set
             {
                 bindable = value;
-                dropdown.Current = bindable;
+                dropdown.Current.BindTo(bindable);
                 if (value?.Disabled ?? true)
                     Alpha = 0.3f;
             }
diff --git a/osu.Game/Overlays/Options/OptionSlider.cs b/osu.Game/Overlays/Options/OptionSlider.cs
index 0b0a9b8b50..1c4b54a080 100644
--- a/osu.Game/Overlays/Options/OptionSlider.cs
+++ b/osu.Game/Overlays/Options/OptionSlider.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Options
             set
             {
                 bindable = value;
-                slider.Current = bindable;
+                slider.Current.BindTo(bindable);
                 if (value?.Disabled ?? true)
                     Alpha = 0.3f;
             }
diff --git a/osu.Game/Overlays/Options/OptionTextBox.cs b/osu.Game/Overlays/Options/OptionTextBox.cs
index c2c8e91016..b5ef39c8b2 100644
--- a/osu.Game/Overlays/Options/OptionTextBox.cs
+++ b/osu.Game/Overlays/Options/OptionTextBox.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Overlays.Options
             set
             {
                 bindable = value;
-                Current = bindable;
+                Current.BindTo(bindable);
                 if (value?.Disabled ?? true)
                     Alpha = 0.3f;
             }

From 15c1013f5b68279f65e00b9657ac6df36b2e07a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 Apr 2017 17:25:46 +0900
Subject: [PATCH 40/45] Don't schedule event, it's unreliable and doesn't match
 the fade.

---
 osu.Game/Screens/Play/HotkeyRetryOverlay.cs | 25 ++++++++++++---------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Play/HotkeyRetryOverlay.cs b/osu.Game/Screens/Play/HotkeyRetryOverlay.cs
index 4e383510fc..3fcd773c19 100644
--- a/osu.Game/Screens/Play/HotkeyRetryOverlay.cs
+++ b/osu.Game/Screens/Play/HotkeyRetryOverlay.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using OpenTK.Graphics;
-using osu.Framework.Threading;
 
 namespace osu.Game.Screens.Play
 {
@@ -20,12 +19,13 @@ namespace osu.Game.Screens.Play
         public Action Action;
 
         private SampleChannel retrySample;
-        private ScheduledDelegate task;
         private Box overlay;
 
         private const int activate_delay = 500;
         private const int fadeout_delay = 200;
 
+        private bool fired;
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
@@ -52,13 +52,6 @@ namespace osu.Game.Screens.Play
             if (args.Key == Key.Tilde)
             {
                 overlay.FadeIn(activate_delay);
-
-                task = Scheduler.AddDelayed(() =>
-                {
-                    retrySample.Play();
-                    Action();
-                }, activate_delay);
-
                 return true;
             }
 
@@ -67,14 +60,24 @@ namespace osu.Game.Screens.Play
 
         protected override bool OnKeyUp(InputState state, KeyUpEventArgs args)
         {
-            if (args.Key == Key.Tilde)
+            if (args.Key == Key.Tilde && !fired)
             {
-                task?.Cancel();
                 overlay.FadeOut(fadeout_delay);
                 return true;
             }
 
             return base.OnKeyUp(state, args);
         }
+
+        protected override void Update()
+        {
+            base.Update();
+            if (!fired && overlay.Alpha == 1)
+            {
+                fired = true;
+                retrySample.Play();
+                Action?.Invoke();
+            }
+        }
     }
 }

From 3a01cfccee5db6e0fabf9e2eea7cb5e169131836 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 Apr 2017 17:25:56 +0900
Subject: [PATCH 41/45] Adjust fade length and easing.

---
 osu.Game/Screens/Play/HotkeyRetryOverlay.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HotkeyRetryOverlay.cs b/osu.Game/Screens/Play/HotkeyRetryOverlay.cs
index 3fcd773c19..6b30644ab0 100644
--- a/osu.Game/Screens/Play/HotkeyRetryOverlay.cs
+++ b/osu.Game/Screens/Play/HotkeyRetryOverlay.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Play
         private SampleChannel retrySample;
         private Box overlay;
 
-        private const int activate_delay = 500;
+        private const int activate_delay = 400;
         private const int fadeout_delay = 200;
 
         private bool fired;
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Play
 
             if (args.Key == Key.Tilde)
             {
-                overlay.FadeIn(activate_delay);
+                overlay.FadeIn(activate_delay, EasingTypes.Out);
                 return true;
             }
 
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.Play
         {
             if (args.Key == Key.Tilde && !fired)
             {
-                overlay.FadeOut(fadeout_delay);
+                overlay.FadeOut(fadeout_delay, EasingTypes.Out);
                 return true;
             }
 

From 43a46575404168ee8fd1e1b7ae99a6b9eb8b6ef7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 Apr 2017 17:26:05 +0900
Subject: [PATCH 42/45] Remove unnecessary AlwaysPresent.

---
 osu.Game/Screens/Play/HotkeyRetryOverlay.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HotkeyRetryOverlay.cs b/osu.Game/Screens/Play/HotkeyRetryOverlay.cs
index 6b30644ab0..16062bebe5 100644
--- a/osu.Game/Screens/Play/HotkeyRetryOverlay.cs
+++ b/osu.Game/Screens/Play/HotkeyRetryOverlay.cs
@@ -38,7 +38,6 @@ namespace osu.Game.Screens.Play
                 overlay = new Box
                 {
                     Alpha = 0,
-                    AlwaysPresent = true,
                     Colour = Color4.Black,
                     RelativeSizeAxes = Axes.Both,
                 }

From 960ea27684610167124338fb41621f9b9ee7c9f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 Apr 2017 19:21:27 +0900
Subject: [PATCH 43/45] Make all Playfields completely relative.

---
 osu.Game.Modes.Catch/UI/CatchPlayfield.cs | 3 +--
 osu.Game.Modes.Mania/UI/ManiaPlayfield.cs | 3 +--
 osu.Game.Modes.Osu/UI/OsuPlayfield.cs     | 2 --
 osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs | 5 -----
 osu.Game/Modes/UI/Playfield.cs            | 7 +++++++
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Modes.Catch/UI/CatchPlayfield.cs b/osu.Game.Modes.Catch/UI/CatchPlayfield.cs
index cf1a665470..f8792a7fd5 100644
--- a/osu.Game.Modes.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Modes.Catch/UI/CatchPlayfield.cs
@@ -14,8 +14,7 @@ namespace osu.Game.Modes.Catch.UI
     {
         public CatchPlayfield()
         {
-            RelativeSizeAxes = Axes.Y;
-            Size = new Vector2(512, 0.9f);
+            Size = new Vector2(1, 0.9f);
             Anchor = Anchor.BottomCentre;
             Origin = Anchor.BottomCentre;
 
diff --git a/osu.Game.Modes.Mania/UI/ManiaPlayfield.cs b/osu.Game.Modes.Mania/UI/ManiaPlayfield.cs
index 670d18f71f..deb4ebac25 100644
--- a/osu.Game.Modes.Mania/UI/ManiaPlayfield.cs
+++ b/osu.Game.Modes.Mania/UI/ManiaPlayfield.cs
@@ -15,8 +15,7 @@ namespace osu.Game.Modes.Mania.UI
     {
         public ManiaPlayfield(int columns)
         {
-            RelativeSizeAxes = Axes.Both;
-            Size = new Vector2(columns / 20f, 1f);
+            Size = new Vector2(0.8f, 1f);
             Anchor = Anchor.BottomCentre;
             Origin = Anchor.BottomCentre;
 
diff --git a/osu.Game.Modes.Osu/UI/OsuPlayfield.cs b/osu.Game.Modes.Osu/UI/OsuPlayfield.cs
index d89bbfd131..4164607b4d 100644
--- a/osu.Game.Modes.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Modes.Osu/UI/OsuPlayfield.cs
@@ -38,8 +38,6 @@ namespace osu.Game.Modes.Osu.UI
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
-            RelativeSizeAxes = Axes.Both;
-            Size = new Vector2(0.75f);
 
             Add(new Drawable[]
             {
diff --git a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
index 6fe2282d88..db3a1bc84e 100644
--- a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
@@ -52,11 +52,6 @@ namespace osu.Game.Modes.Taiko.UI
 
         public TaikoPlayfield()
         {
-            RelativeSizeAxes = Axes.X;
-
-            // Default height
-            Height = DEFAULT_PLAYFIELD_HEIGHT;
-
             AddInternal(new Drawable[]
             {
                 rightBackgroundContainer = new Container
diff --git a/osu.Game/Modes/UI/Playfield.cs b/osu.Game/Modes/UI/Playfield.cs
index f31ee0f189..bf5f0acde5 100644
--- a/osu.Game/Modes/UI/Playfield.cs
+++ b/osu.Game/Modes/UI/Playfield.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.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Modes.Objects;
@@ -63,6 +64,12 @@ namespace osu.Game.Modes.UI
             Add(HitObjects);
         }
 
+        public override Axes RelativeSizeAxes
+        {
+            get { return Axes.Both; }
+            set { throw new InvalidOperationException($@"{nameof(Playfield<TObject, TJudgement>)}'s {nameof(RelativeSizeAxes)} should never be changed from {Axes.Both}"); }
+        }
+
         /// <summary>
         /// Performs post-processing tasks (if any) after all DrawableHitObjects are loaded into this Playfield.
         /// </summary>

From b9ce98efd65965c495305158e07111a95ebec404 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 Apr 2017 19:22:02 +0900
Subject: [PATCH 44/45] Add AspectAdjust to HitRenderer to allow playfield to
 consume ful HitRenderer size when needed.

---
 osu.Game.Modes.Osu/UI/OsuHitRenderer.cs     |  3 +++
 osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs | 12 ++++++++++++
 osu.Game/Modes/UI/HitRenderer.cs            | 19 +++++++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs b/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
index ca9ff6fc61..7e314c5ba1 100644
--- a/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
+++ b/osu.Game.Modes.Osu/UI/OsuHitRenderer.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 OpenTK;
 using osu.Game.Beatmaps;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Osu.Beatmaps;
@@ -46,5 +47,7 @@ namespace osu.Game.Modes.Osu.UI
                 return new DrawableSpinner(spinner);
             return null;
         }
+
+        protected override Vector2 GetPlayfieldAspectAdjust() => new Vector2(0.75f);
     }
 }
diff --git a/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs b/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
index 29fa693d58..32476dff7f 100644
--- a/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
+++ b/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
@@ -17,6 +17,7 @@ using osu.Game.Modes.Taiko.Objects.Drawables;
 using osu.Game.Modes.Taiko.Scoring;
 using osu.Game.Modes.UI;
 using osu.Game.Modes.Taiko.Replays;
+using OpenTK;
 
 namespace osu.Game.Modes.Taiko.UI
 {
@@ -100,6 +101,17 @@ namespace osu.Game.Modes.Taiko.UI
             }
         }
 
+        protected override Vector2 GetPlayfieldAspectAdjust()
+        {
+            const float default_relative_height = TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT / 768;
+            const float default_aspect = 16f / 9f;
+
+            float aspectAdjust = MathHelper.Clamp(DrawWidth / DrawHeight, 0.4f, 4) / default_aspect;
+
+            return new Vector2(1, default_relative_height * aspectAdjust);
+        }
+
+
         public override ScoreProcessor CreateScoreProcessor() => new TaikoScoreProcessor(this);
 
         protected override IBeatmapConverter<TaikoHitObject> CreateBeatmapConverter() => new TaikoBeatmapConverter();
diff --git a/osu.Game/Modes/UI/HitRenderer.cs b/osu.Game/Modes/UI/HitRenderer.cs
index a958c61c68..afc525d686 100644
--- a/osu.Game/Modes/UI/HitRenderer.cs
+++ b/osu.Game/Modes/UI/HitRenderer.cs
@@ -16,6 +16,7 @@ using System.Diagnostics;
 using System.Linq;
 using osu.Game.Modes.Replays;
 using osu.Game.Modes.Scoring;
+using OpenTK;
 
 namespace osu.Game.Modes.UI
 {
@@ -167,6 +168,11 @@ namespace osu.Game.Modes.UI
     {
         public event Action<TJudgement> OnJudgement;
 
+        /// <summary>
+        /// Whether to apply adjustments to the child <see cref="Playfield{TObject,TJudgement}"/> based on our own size.
+        /// </summary>
+        public bool AspectAdjust = true;
+
         public sealed override bool ProvidingUserCursor => !HasReplayLoaded && Playfield.ProvidingUserCursor;
 
         protected override Container<Drawable> Content => content;
@@ -219,6 +225,19 @@ namespace osu.Game.Modes.UI
             Playfield.PostProcess();
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            Playfield.Size = AspectAdjust ? GetPlayfieldAspectAdjust() : Vector2.One;
+        }
+
+        /// <summary>
+        /// In some cases we want to apply changes to the relative size of our contained <see cref="Playfield{TObject, TJudgement}"/> based on custom conditions.
+        /// </summary>
+        /// <returns></returns>
+        protected virtual Vector2 GetPlayfieldAspectAdjust() => new Vector2(0.75f); //a sane default
+
         /// <summary>
         /// Triggered when an object's Judgement is updated.
         /// </summary>

From b1d5a563099f89ee9fa2afaf1dbb572aa8791ffb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 Apr 2017 19:44:45 +0900
Subject: [PATCH 45/45] Update framework.

---
 osu-framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index 561b24bed4..1490f00327 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 561b24bed48d3670b1d33acfc7ba5e11dcd3ac0c
+Subproject commit 1490f003273d7aab6589e489f6e4b02d204c9f27