Merge remote-tracking branch 'origin/master' into taiko_replays

Conflicts:
	osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj

osu-framework

@@ -1 +1 @@
-Subproject commit 51737ec1320b4ea9dce4978f24e1d77a28f0a98e
+Subproject commit fee17db53738938cc3ab8589ef1ff1dc7fd82d8a

osu-resources

@@ -1 +1 @@
-Subproject commit f85c594c182db2b01233e29ca52639b7baa00402
+Subproject commit e67453159540f5008b5efadfbc12dfb3f4bee1f7

osu.Desktop.VisualTests/Benchmark.cs

@@ -3,7 +3,7 @@
 
 using System;
 using osu.Framework.Allocation;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Game;
 
 namespace osu.Desktop.VisualTests

osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetailArea.cs

@@ -3,7 +3,7 @@
 
 using OpenTK;
 using osu.Framework.Graphics;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Game.Screens.Select;
 
 namespace osu.Desktop.VisualTests.Tests

osu.Desktop.VisualTests/Tests/TestCaseBeatmapOptionsOverlay.cs

@@ -3,7 +3,7 @@
 
 using OpenTK.Graphics;
 using OpenTK.Input;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Screens.Select.Options;
 

osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs

@@ -1,7 +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 osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Threading;
 using osu.Game.Overlays;

osu.Desktop.VisualTests/Tests/TestCaseDialogOverlay.cs

@@ -1,7 +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 osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Dialog;

osu.Desktop.VisualTests/Tests/TestCaseDrawings.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Game.Screens.Tournament;
 using osu.Game.Screens.Tournament.Teams;
 using osu.Game.Users;

osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs

@@ -5,7 +5,7 @@ using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.MathUtils;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Database;

osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs

@@ -8,7 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Modes.Objects;
 using osu.Game.Modes.Objects.Drawables;

osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs

@@ -1,7 +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 osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Framework.Graphics;
 using OpenTK.Input;
 using osu.Framework.Graphics.UserInterface;
@@ -10,7 +10,6 @@ using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.MathUtils;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Game.Screens.Play;
 
 namespace osu.Desktop.VisualTests.Tests

osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs

@@ -3,7 +3,7 @@
 
 using OpenTK;
 using osu.Framework.Graphics;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Game.Modes.Mods;
 using osu.Game.Modes.Osu.Mods;
 using osu.Game.Modes.Scoring;

osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs

@@ -1,7 +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 osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Screens.Menu;

osu.Desktop.VisualTests/Tests/TestCaseModSelectOverlay.cs

@@ -3,7 +3,7 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Overlays.Mods;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Game.Modes;
 
 namespace osu.Desktop.VisualTests.Tests

osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs

@@ -1,7 +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 osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Timing;
 using osu.Game.Overlays;

osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using osu.Framework.Graphics;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Framework.MathUtils;
 using osu.Game.Overlays;
 using System.Linq;

osu.Desktop.VisualTests/Tests/TestCaseOptions.cs

@@ -1,7 +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 osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Game.Overlays;
 
 namespace osu.Desktop.VisualTests.Tests

osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Logging;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Game.Screens.Play;
 
 namespace osu.Desktop.VisualTests.Tests

osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using osu.Desktop.VisualTests.Platform;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Framework.MathUtils;
 using osu.Game.Database;
 using osu.Game.Modes;

osu.Desktop.VisualTests/Tests/TestCasePlayer.cs

@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using OpenTK;
 using osu.Framework.Graphics.Sprites;

osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs

@@ -6,7 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.MathUtils;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Modes.UI;
 

osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs

@@ -3,7 +3,7 @@
 
 using OpenTK;
 using osu.Framework.Graphics.Primitives;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Select.Filter;

osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs

@@ -0,0 +1,212 @@
+// 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 OpenTK.Graphics;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Testing;
+using osu.Game.Graphics;
+using osu.Game.Modes.Taiko.Objects;
+using osu.Game.Modes.Taiko.Objects.Drawable.Pieces;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseTaikoHitObjects : TestCase
+    {
+        public override string Description => "Taiko hit objects";
+
+        private bool kiai;
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            AddToggle("Kiai", b =>
+            {
+                kiai = !kiai;
+                Reset();
+            });
+
+            Add(new CentreHitCircle(new CirclePiece()
+            {
+                KiaiMode = kiai
+            })
+            {
+                Position = new Vector2(100, 100)
+            });
+
+            Add(new CentreHitCircle(new StrongCirclePiece()
+            {
+                KiaiMode = kiai
+            })
+            {
+                Position = new Vector2(350, 100)
+            });
+
+            Add(new RimHitCircle(new CirclePiece()
+            {
+                KiaiMode = kiai
+            })
+            {
+                Position = new Vector2(100, 300)
+            });
+
+            Add(new RimHitCircle(new StrongCirclePiece()
+            {
+                KiaiMode = kiai
+            })
+            {
+                Position = new Vector2(350, 300)
+            });
+
+            Add(new SwellCircle(new CirclePiece()
+            {
+                KiaiMode = kiai
+            })
+            {
+                Position = new Vector2(100, 500)
+            });
+
+            Add(new SwellCircle(new StrongCirclePiece()
+            {
+                KiaiMode = kiai
+            })
+            {
+                Position = new Vector2(350, 500)
+            });
+
+            Add(new DrumRollCircle(new CirclePiece()
+            {
+                KiaiMode = kiai
+            })
+            {
+                Width = 250,
+                Position = new Vector2(575, 100)
+            });
+
+            Add(new DrumRollCircle(new StrongCirclePiece()
+            {
+                KiaiMode = kiai
+            })
+            {
+                Width = 250,
+                Position = new Vector2(575, 300)
+            });
+        }
+
+        private class SwellCircle : BaseCircle
+        {
+            public SwellCircle(CirclePiece piece)
+                : base(piece)
+            {
+                Piece.Add(new TextAwesome
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    TextSize = SYMBOL_INNER_SIZE,
+                    Icon = FontAwesome.fa_asterisk,
+                    Shadow = false
+                });
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                Piece.AccentColour = colours.YellowDark;
+            }
+        }
+
+        private class DrumRollCircle : BaseCircle
+        {
+            public DrumRollCircle(CirclePiece piece)
+                : base(piece)
+            {
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                Piece.AccentColour = colours.YellowDark;
+            }
+        }
+
+        private class CentreHitCircle : BaseCircle
+        {
+            public CentreHitCircle(CirclePiece piece)
+                : base(piece)
+            {
+                Piece.Add(new CircularContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(SYMBOL_INNER_SIZE),
+                    Masking = true,
+                    Children = new[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        }
+                    }
+                });
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                Piece.AccentColour = colours.PinkDarker;
+            }
+        }
+
+        private class RimHitCircle : BaseCircle
+        {
+            public RimHitCircle(CirclePiece piece)
+                : base(piece)
+            {
+                Piece.Add(new CircularContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(SYMBOL_SIZE),
+                    BorderThickness = SYMBOL_BORDER,
+                    BorderColour = Color4.White,
+                    Masking = true,
+                    Children = new[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Alpha = 0,
+                            AlwaysPresent = true
+                        }
+                    }
+                });
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                Piece.AccentColour = colours.BlueDarker;
+            }
+        }
+
+        private abstract class BaseCircle : Container
+        {
+            protected const float SYMBOL_SIZE = TaikoHitObject.CIRCLE_RADIUS * 2f * 0.45f;
+            protected const float SYMBOL_BORDER = 8;
+            protected const float SYMBOL_INNER_SIZE = SYMBOL_SIZE - 2 * SYMBOL_BORDER;
+
+            protected readonly CirclePiece Piece;
+
+            protected BaseCircle(CirclePiece piece)
+            {
+                Piece = piece;
+
+                Add(Piece);
+            }
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.MathUtils;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Taiko.Judgements;
 using osu.Game.Modes.Taiko.Objects;

osu.Desktop.VisualTests/Tests/TestCaseTextAwesome.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.MathUtils;

osu.Desktop.VisualTests/Tests/TestCaseTwoLayerButton.cs

@@ -1,7 +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 osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Play;
 

osu.Desktop.VisualTests/VisualTestGame.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Platform;
-using osu.Framework.Screens.Testing;
+using osu.Framework.Testing;
 using osu.Game;
 using osu.Game.Screens.Backgrounds;
 

osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj

@@ -150,6 +150,10 @@
       <Project>{65dc628f-a640-4111-ab35-3a5652bc1e17}</Project>
       <Name>osu.Framework.Desktop</Name>
     </ProjectReference>
+    <ProjectReference Include="..\osu-framework\osu.Framework.Testing\osu.Framework.Testing.csproj">
+      <Project>{007b2356-ab6f-4bd9-96d5-116fc2dce69a}</Project>
+      <Name>osu.Framework.Testing</Name>
+    </ProjectReference>
     <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">
       <Project>{c76bf5b3-985e-4d39-95fe-97c9c879b83a}</Project>
       <Name>osu.Framework</Name>
@@ -194,6 +198,7 @@
     <Compile Include="Tests\TestCaseReplay.cs" />
     <Compile Include="Tests\TestCaseScoreCounter.cs" />
     <Compile Include="Tests\TestCaseTabControl.cs" />
+    <Compile Include="Tests\TestCaseTaikoHitObjects.cs" />
     <Compile Include="Tests\TestCaseTaikoPlayfield.cs" />
     <Compile Include="Tests\TestCaseTextAwesome.cs" />
     <Compile Include="Tests\TestCasePlaySongSelect.cs" />
@@ -211,9 +216,7 @@
   </ItemGroup>
   <ItemGroup />
   <ItemGroup />
-  <ItemGroup>
+  <ItemGroup />
-    <Folder Include="Beatmaps\" />
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.

osu.Game.Modes.Osu/Objects/Drawables/Connections/FollowPoint.cs

@@ -7,7 +7,6 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 
 namespace osu.Game.Modes.Osu.Objects.Drawables.Connections
 {

osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs

@@ -3,7 +3,6 @@
 
 using System;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Transforms;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Osu.Objects.Drawables.Pieces;
 using OpenTK;

osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuJudgement.cs

@@ -1,7 +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 osu.Framework.Graphics.Transforms;
+using osu.Framework.Graphics;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Osu.Judgements;
 using OpenTK;

osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs

@@ -7,7 +7,6 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Game.Beatmaps.Samples;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Osu.Judgements;

osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs

@@ -4,7 +4,6 @@
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.MathUtils;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Osu.Objects.Drawables.Pieces;

osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs

@@ -4,7 +4,6 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 using OpenTK.Graphics;
 

osu.Game.Modes.Osu/OsuAutoReplay.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using OpenTK;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.MathUtils;
 using osu.Game.Beatmaps;
 using osu.Game.Modes.Osu.Objects;
@@ -10,6 +9,7 @@ using osu.Game.Modes.Osu.Objects.Drawables;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using osu.Framework.Graphics;
 using osu.Game.Modes.Objects.Types;
 
 namespace osu.Game.Modes.Osu

osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs

@@ -45,9 +45,7 @@ namespace osu.Game.Modes.Taiko.Beatmaps
             IHasEndTime endTimeData = original as IHasEndTime;
 
             // Old osu! used hit sounding to determine hits
-            SampleType sample = original.Sample?.Type ?? SampleType.None;
+            bool strong = ((original.Sample?.Type ?? SampleType.None) & SampleType.Finish) > 0;
-
-            bool accented = (sample & SampleType.Finish) > 0;
 
             if (distanceData != null)
             {
@@ -55,7 +53,7 @@ namespace osu.Game.Modes.Taiko.Beatmaps
                 {
                     StartTime = original.StartTime,
                     Sample = original.Sample,
-                    Accented = accented,
+                    IsStrong = strong,
 
                     Distance = distanceData.Distance * (repeatsData?.RepeatCount ?? 1)
                 };
@@ -64,11 +62,11 @@ namespace osu.Game.Modes.Taiko.Beatmaps
             if (endTimeData != null)
             {
                 // We compute the end time manually to add in the Bash convert factor
-                return new Bash
+                return new Swell
                 {
                     StartTime = original.StartTime,
                     Sample = original.Sample,
-                    Accented = accented,
+                    IsStrong = strong,
 
                     EndTime = original.StartTime + endTimeData.Duration * bash_convert_factor 
                 };
@@ -80,7 +78,7 @@ namespace osu.Game.Modes.Taiko.Beatmaps
             {
                 StartTime = original.StartTime,
                 Sample = original.Sample,
-                Accented = accented,
+                IsStrong = strong
                 Type = type
             };
         }

osu.Game.Modes.Taiko/Objects/Drawable/DrawableDrumRoll.cs

@@ -0,0 +1,57 @@
+// 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.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Taiko.Judgements;
+using System.Linq;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawable
+{
+    public class DrawableDrumRoll : DrawableTaikoHitObject
+    {
+        private readonly DrumRoll drumRoll;
+
+        public DrawableDrumRoll(DrumRoll drumRoll)
+            : base(drumRoll)
+        {
+            this.drumRoll = drumRoll;
+
+            int tickIndex = 0;
+            foreach (var tick in drumRoll.Ticks)
+            {
+                var newTick = new DrawableDrumRollTick(tick)
+                {
+                    Depth = tickIndex,
+                    X = (float)((tick.StartTime - HitObject.StartTime) / drumRoll.Duration)
+                };
+
+                AddNested(newTick);
+
+                tickIndex++;
+            }
+        }
+
+        protected override void UpdateState(ArmedState state)
+        {
+        }
+
+        protected override void CheckJudgement(bool userTriggered)
+        {
+            if (userTriggered)
+                return;
+
+            if (Judgement.TimeOffset < 0)
+                return;
+
+            int countHit = NestedHitObjects.Count(o => o.Judgement.Result == HitResult.Hit);
+
+            if (countHit > drumRoll.RequiredGoodHits)
+            {
+                Judgement.Result = HitResult.Hit;
+                Judgement.TaikoResult = countHit >= drumRoll.RequiredGreatHits ? TaikoHitResult.Great : TaikoHitResult.Good;
+            }
+            else
+                Judgement.Result = HitResult.Miss;
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/Drawable/DrawableDrumRollTick.cs

@@ -0,0 +1,53 @@
+// 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.Input;
+using osu.Game.Modes.Taiko.Judgements;
+using System;
+using osu.Game.Modes.Objects.Drawables;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawable
+{
+    public class DrawableDrumRollTick : DrawableTaikoHitObject
+    {
+        private readonly DrumRollTick tick;
+
+        public DrawableDrumRollTick(DrumRollTick tick)
+            : base(tick)
+        {
+            this.tick = tick;
+        }
+
+        protected override TaikoJudgement CreateJudgement() => new TaikoDrumRollTickJudgement();
+
+        protected override void CheckJudgement(bool userTriggered)
+        {
+            if (!userTriggered)
+            {
+                if (Judgement.TimeOffset > tick.HitWindow)
+                    Judgement.Result = HitResult.Miss;
+                return;
+            }
+
+            if (Math.Abs(Judgement.TimeOffset) < tick.HitWindow)
+            {
+                Judgement.Result = HitResult.Hit;
+                Judgement.TaikoResult = TaikoHitResult.Great;
+            }
+        }
+
+        protected override void UpdateState(ArmedState state)
+        {
+        }
+
+        protected override void UpdateScrollPosition(double time)
+        {
+            // Drum roll ticks shouldn't move
+        }
+
+        protected override bool HandleKeyPress(Key key)
+        {
+            return !Judgement.Result.HasValue && UpdateJudgement(true);
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/Drawable/DrawableHit.cs

@@ -0,0 +1,67 @@
+// 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.Input;
+using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Taiko.Judgements;
+using System;
+using System.Collections.Generic;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawable
+{
+    public abstract class DrawableHit : DrawableTaikoHitObject
+    {
+        /// <summary>
+        /// A list of keys which can result in hits for this HitObject.
+        /// </summary>
+        protected abstract List<Key> HitKeys { get; }
+
+        private readonly Hit hit;
+
+        /// <summary>
+        /// Whether the last key pressed is a valid hit key.
+        /// </summary>
+        private bool validKeyPressed;
+
+        protected DrawableHit(Hit hit)
+            : base(hit)
+        {
+            this.hit = hit;
+        }
+
+        protected override void CheckJudgement(bool userTriggered)
+        {
+            if (!userTriggered)
+            {
+                if (Judgement.TimeOffset > hit.HitWindowGood)
+                    Judgement.Result = HitResult.Miss;
+                return;
+            }
+
+            double hitOffset = Math.Abs(Judgement.TimeOffset);
+
+            if (hitOffset > hit.HitWindowMiss)
+                return;
+
+            if (!validKeyPressed)
+                Judgement.Result = HitResult.Miss;
+            else if (hitOffset < hit.HitWindowGood)
+            {
+                Judgement.Result = HitResult.Hit;
+                Judgement.TaikoResult = hitOffset < hit.HitWindowGreat ? TaikoHitResult.Great : TaikoHitResult.Good;
+            }
+            else
+                Judgement.Result = HitResult.Miss;
+        }
+
+        protected override bool HandleKeyPress(Key key)
+        {
+            if (Judgement.Result.HasValue)
+                return false;
+
+            validKeyPressed = HitKeys.Contains(key);
+
+            return UpdateJudgement(true);
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/Drawable/DrawableStrongHit.cs

@@ -0,0 +1,85 @@
+// 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.Input;
+using System;
+using System.Linq;
+using osu.Framework.Input;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawable
+{
+    public abstract class DrawableStrongHit : DrawableHit
+    {
+        /// <summary>
+        /// The lenience for the second key press.
+        /// This does not adjust by map difficulty in ScoreV2 yet.
+        /// </summary>
+        private const double second_hit_window = 30;
+
+        private double firstHitTime;
+        private bool firstKeyHeld;
+        private Key firstHitKey;
+
+        protected DrawableStrongHit(Hit hit)
+            : base(hit)
+        {
+        }
+
+        protected override void CheckJudgement(bool userTriggered)
+        {
+            if (!Judgement.Result.HasValue)
+            {
+                base.CheckJudgement(userTriggered);
+                return;
+            }
+
+            if (!userTriggered)
+                return;
+
+            // If we get here, we're assured that the key pressed is the correct secondary key
+
+            if (Math.Abs(firstHitTime - Time.Current) < second_hit_window)
+                Judgement.SecondHit = true;
+        }
+
+        protected override bool HandleKeyPress(Key key)
+        {
+            // Check if we've handled the first key
+            if (!Judgement.Result.HasValue)
+            {
+                // First key hasn't been handled yet, attempt to handle it
+                bool handled = base.HandleKeyPress(key);
+
+                if (handled)
+                {
+                    firstHitTime = Time.Current;
+                    firstHitKey = key;
+                }
+
+                return handled;
+            }
+
+            // If we've already hit the second key, don't handle this object any further
+            if (Judgement.SecondHit)
+                return false;
+
+            // Don't handle represses of the first key
+            if (firstHitKey == key)
+                return false;
+
+            // Don't handle invalid hit key presses
+            if (!HitKeys.Contains(key))
+                return false;
+
+            // Assume the intention was to hit the strong hit with both keys only if the first key is still being held down
+            return firstKeyHeld && UpdateJudgement(true);
+        }
+
+        protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
+        {
+            firstKeyHeld = state.Keyboard.Keys.Contains(firstHitKey);
+
+            return base.OnKeyDown(state, args);
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/Drawable/DrawableSwell.cs

@@ -0,0 +1,75 @@
+// 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.Input;
+using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Taiko.Judgements;
+using System;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawable
+{
+    public class DrawableSwell : DrawableTaikoHitObject
+    {
+        /// <summary>
+        /// The amount of times the user has hit this swell.
+        /// </summary>
+        private int userHits;
+
+        private readonly Swell swell;
+
+        public DrawableSwell(Swell swell)
+            : base(swell)
+        {
+            this.swell = swell;
+        }
+
+        protected override void CheckJudgement(bool userTriggered)
+        {
+            if (userTriggered)
+            {
+                if (Time.Current < HitObject.StartTime)
+                    return;
+
+                userHits++;
+
+                if (userHits == swell.RequiredHits)
+                {
+                    Judgement.Result = HitResult.Hit;
+                    Judgement.TaikoResult = TaikoHitResult.Great;
+                }
+            }
+            else
+            {
+                if (Judgement.TimeOffset < 0)
+                    return;
+
+                if (userHits > swell.RequiredHits / 2)
+                {
+                    Judgement.Result = HitResult.Hit;
+                    Judgement.TaikoResult = TaikoHitResult.Good;
+                }
+                else
+                    Judgement.Result = HitResult.Miss;
+            }
+        }
+
+        protected override void UpdateState(ArmedState state)
+        {
+        }
+
+        protected override void UpdateScrollPosition(double time)
+        {
+            base.UpdateScrollPosition(Math.Min(time, HitObject.StartTime));
+        }
+
+        protected override bool HandleKeyPress(Key key)
+        {
+            if (Judgement.Result.HasValue)
+                return false;
+
+            UpdateJudgement(true);
+
+            return true;
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs

@@ -1,14 +1,23 @@
 // 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.Input;
 using osu.Framework.Graphics;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Taiko.Judgements;
+using System.Collections.Generic;
+using osu.Framework.Input;
 
 namespace osu.Game.Modes.Taiko.Objects.Drawable
 {
     public abstract class DrawableTaikoHitObject : DrawableHitObject<TaikoHitObject, TaikoJudgement>
     {
+        /// <summary>
+        /// A list of keys which this hit object will accept. These are the standard Taiko keys for now.
+        /// These should be moved to bindings later.
+        /// </summary>
+        private readonly List<Key> validKeys = new List<Key>(new[] { Key.D, Key.F, Key.J, Key.K });
+
         protected DrawableTaikoHitObject(TaikoHitObject hitObject)
             : base(hitObject)
         {
@@ -42,5 +51,21 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
         {
             UpdateScrollPosition(Time.Current);
         }
+
+        protected virtual bool HandleKeyPress(Key key) => false;
+
+        protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
+        {
+            // Make sure we don't handle held-down keys
+            if (args.Repeat)
+                return false;
+
+            // Check if we've pressed a valid taiko key
+            if (!validKeys.Contains(args.Key))
+                return false;
+
+            // Handle it!
+            return HandleKeyPress(args.Key);
+        }
     }
 }

osu.Game.Modes.Taiko/Objects/Drawable/Pieces/CirclePiece.cs

@@ -0,0 +1,160 @@
+// 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.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics.Backgrounds;
+using OpenTK.Graphics;
+using System;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
+{
+    /// <summary>
+    /// A circle piece which is used uniformly through osu!taiko to visualise hitobjects.
+    /// <para>
+    /// The body of this piece will overshoot its parent by <see cref="CirclePiece.Height"/> to form 
+    /// a rounded (_[-Width-]_) figure such that a regular "circle" is the result of a parent with Width = 0.
+    /// </para>
+    /// </summary>
+    public class CirclePiece : Container
+    {
+        public const float SYMBOL_SIZE = TaikoHitObject.CIRCLE_RADIUS * 2f * 0.45f;
+        public const float SYMBOL_BORDER = 8;
+        public const float SYMBOL_INNER_SIZE = SYMBOL_SIZE - 2 * SYMBOL_BORDER;
+
+        private Color4 accentColour;
+        /// <summary>
+        /// The colour of the inner circle and outer glows.
+        /// </summary>
+        public Color4 AccentColour
+        {
+            get { return accentColour; }
+            set
+            {
+                accentColour = value;
+
+                innerBackground.Colour = AccentColour;
+
+                triangles.ColourLight = AccentColour;
+                triangles.ColourDark = AccentColour.Darken(0.1f);
+
+                resetEdgeEffects();
+            }
+        }
+
+        private bool kiaiMode;
+        /// <summary>
+        /// Whether Kiai mode effects are enabled for this circle piece.
+        /// </summary>
+        public bool KiaiMode
+        {
+            get { return kiaiMode; }
+            set
+            {
+                kiaiMode = value;
+
+                resetEdgeEffects();
+            }
+        }
+
+        public override Anchor Origin
+        {
+            get { return Anchor.CentreLeft; }
+            set { throw new InvalidOperationException($"{nameof(CirclePiece)} must always use CentreLeft origin."); }
+        }
+
+        protected override Container<Framework.Graphics.Drawable> Content => SymbolContainer;
+        protected readonly Container SymbolContainer;
+
+        private readonly Container innerLayer;
+        private readonly Container innerCircleContainer;
+        private readonly Box innerBackground;
+        private readonly Triangles triangles;
+
+        public CirclePiece()
+        {
+            RelativeSizeAxes = Axes.X;
+            Height = TaikoHitObject.CIRCLE_RADIUS * 2;
+
+            // The "inner layer" is the body of the CirclePiece that overshoots it by Height/2 px on both sides
+            AddInternal(innerLayer = new Container
+            {
+                Name = "Inner Layer",
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Y,
+                Children = new Framework.Graphics.Drawable[]
+                {
+                    innerCircleContainer = new CircularContainer
+                    {
+                        Name = "Inner Circle",
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        Masking = true,
+                        Children = new Framework.Graphics.Drawable[]
+                        {
+                            innerBackground = new Box
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                RelativeSizeAxes = Axes.Both,
+                            },
+                            triangles = new Triangles
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                RelativeSizeAxes = Axes.Both,
+                            }
+                        }
+                    },
+                    new CircularContainer
+                    {
+                        Name = "Ring",
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        BorderThickness = 8,
+                        BorderColour = Color4.White,
+                        Masking = true,
+                        Children = new[]
+                        {
+                            new Box
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                RelativeSizeAxes = Axes.Both,
+                                Alpha = 0,
+                                AlwaysPresent = true
+                            }
+                        }
+                    },
+                    SymbolContainer = new Container
+                    {
+                        Name = "Symbol",
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    }
+                }
+            });
+        }
+
+        protected override void Update()
+        {
+            // Add the overshoot to compensate for corner radius
+            innerLayer.Width = DrawWidth + DrawHeight;
+        }
+
+        private void resetEdgeEffects()
+        {
+            innerCircleContainer.EdgeEffect = new EdgeEffect
+            {
+                Type = EdgeEffectType.Glow,
+                Colour = AccentColour,
+                Radius = KiaiMode ? 50 : 8
+            };
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/Drawable/Pieces/StrongCirclePiece.cs

@@ -0,0 +1,25 @@
+// 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;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
+{
+    /// <summary>
+    /// A type of circle piece which is drawn at a higher scale to represent a "strong" piece.
+    /// </summary>
+    public class StrongCirclePiece : CirclePiece
+    {
+        /// <summary>
+        /// The amount to scale up the base circle to show it as a "strong" piece.
+        /// </summary>
+        private const float strong_scale = 1.5f;
+
+        public StrongCirclePiece()
+        {
+            SymbolContainer.Scale = new Vector2(strong_scale);
+        }
+
+        public override Vector2 Size => new Vector2(base.Size.X, base.Size.Y * strong_scale);
+    }
+}

osu.Game.Modes.Taiko/Objects/DrumRoll.cs

@@ -101,4 +101,4 @@ namespace osu.Game.Modes.Taiko.Objects
             return ret;
         }
     }
-}
+}

osu.Game.Modes.Taiko/Objects/DrumRollTick.cs

@@ -15,5 +15,10 @@ namespace osu.Game.Modes.Taiko.Objects
         /// <para>Half of this value is the hit window of the tick.</para>
         /// </summary>
         public double TickTimeDistance;
+
+        /// <summary>
+        /// The time allowed to hit this tick.
+        /// </summary>
+        public double HitWindow => TickTimeDistance / 2;
     }
 }

osu.Game.Modes.Taiko/Objects/Swell.cs

@@ -8,14 +8,14 @@ using osu.Game.Modes.Objects.Types;
 
 namespace osu.Game.Modes.Taiko.Objects
 {
-    public class Bash : TaikoHitObject, IHasEndTime
+    public class Swell : TaikoHitObject, IHasEndTime
     {
         public double EndTime { get; set; }
 
         public double Duration => EndTime - StartTime;
 
         /// <summary>
-        /// The number of hits required to complete the bash successfully.
+        /// The number of hits required to complete the swell successfully.
         /// </summary>
         public int RequiredHits { get; protected set; }
 

osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs

@@ -20,10 +20,10 @@ namespace osu.Game.Modes.Taiko.Objects
         public double PreEmpt;
 
         /// <summary>
-        /// Whether this HitObject is accented.
+        /// Whether this HitObject is a "strong" type.
-        /// Accented hit objects give more points for hitting the hit object with both keys.
+        /// Strong hit objects give more points for hitting the hit object with both keys.
         /// </summary>
-        public bool Accented;
+        public bool IsStrong;
 
         /// <summary>
         /// Whether this HitObject is in Kiai time.

osu.Game.Modes.Taiko/Scoring/TaikoScoreProcessor.cs

@@ -137,7 +137,7 @@ namespace osu.Game.Modes.Taiko.Scoring
             hpIncreaseGood = hpMultiplierNormal * hp_hit_good;
             hpIncreaseMiss = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.Difficulty.DrainRate, hp_miss_min, hp_miss_mid, hp_miss_max);
 
-            var accentedHits = beatmap.HitObjects.FindAll(o => o is Hit && o.Accented);
+            var accentedHits = beatmap.HitObjects.FindAll(o => o is Hit && o.IsStrong);
 
             // This is a linear function that awards:
             // 10 times bonus points for hitting an accented hit object with both keys with 30 accented hit objects in the map
@@ -152,7 +152,7 @@ namespace osu.Game.Modes.Taiko.Scoring
                     {
                         Result = HitResult.Hit,
                         TaikoResult = TaikoHitResult.Great,
-                        SecondHit = obj.Accented
+                        SecondHit = obj.IsStrong
                     });
                 }
                 else if (obj is DrumRoll)
@@ -163,7 +163,7 @@ namespace osu.Game.Modes.Taiko.Scoring
                         {
                             Result = HitResult.Hit,
                             TaikoResult = TaikoHitResult.Great,
-                            SecondHit = obj.Accented
+                            SecondHit = obj.IsStrong
                         });
                     }
 
@@ -171,10 +171,10 @@ namespace osu.Game.Modes.Taiko.Scoring
                     {
                         Result = HitResult.Hit,
                         TaikoResult = TaikoHitResult.Great,
-                        SecondHit = obj.Accented
+                        SecondHit = obj.IsStrong
                     });
                 }
-                else if (obj is Bash)
+                else if (obj is Swell)
                 {
                     AddJudgement(new TaikoJudgement
                     {

osu.Game.Modes.Taiko/UI/HitExplosion.cs

@@ -7,7 +7,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Game.Graphics;
 using osu.Game.Modes.Taiko.Judgements;
 using osu.Game.Modes.Taiko.Objects;

osu.Game.Modes.Taiko/UI/InputDrum.cs

@@ -9,7 +9,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 using osu.Game.Graphics;
 
@@ -139,7 +138,7 @@ namespace osu.Game.Modes.Taiko.UI
                 {
                     target.FadeTo(Math.Min(target.Alpha + 0.4f, 1), 40, EasingTypes.OutQuint);
                     target.Delay(40);
-                    target.FadeOut(600, EasingTypes.OutQuint);
+                    target.FadeOut(1000, EasingTypes.OutQuint);
                 }
 
                 return false;

osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs

@@ -26,6 +26,7 @@ namespace osu.Game.Modes.Taiko.UI
 
         /// <summary>
         /// The play field height scale.
+        /// This also uniformly scales the notes to match the new playfield height.
         /// </summary>
         public const float PLAYFIELD_SCALE = 0.65f;
 
@@ -173,6 +174,7 @@ namespace osu.Game.Modes.Taiko.UI
         public override void Add(DrawableHitObject<TaikoHitObject, TaikoJudgement> h)
         {
             h.Depth = (float)h.HitObject.StartTime;
+            h.Scale = new Vector2(PLAYFIELD_SCALE);
 
             base.Add(h);
         }

osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj

@@ -53,15 +53,22 @@
     <Compile Include="Judgements\TaikoJudgement.cs" />
     <Compile Include="Judgements\TaikoHitResult.cs" />
     <Compile Include="LegacyTaikoReplay.cs" />
+    <Compile Include="Objects\Drawable\DrawableHit.cs" />
+    <Compile Include="Objects\Drawable\DrawableStrongHit.cs" />
+    <Compile Include="Objects\Drawable\DrawableDrumRoll.cs" />
+    <Compile Include="Objects\Drawable\DrawableDrumRollTick.cs" />
+    <Compile Include="Objects\Drawable\DrawableSwell.cs" />
     <Compile Include="Objects\Drawable\DrawableTaikoHitObject.cs" />
-    <Compile Include="Objects\Bash.cs" />
+    <Compile Include="Objects\Drawable\Pieces\StrongCirclePiece.cs" />
+    <Compile Include="Objects\Drawable\Pieces\CirclePiece.cs" />
     <Compile Include="Objects\DrumRoll.cs" />
     <Compile Include="Objects\DrumRollTick.cs" />
     <Compile Include="Objects\Hit.cs" />
     <Compile Include="Objects\HitType.cs" />
+    <Compile Include="Objects\Swell.cs" />
     <Compile Include="TaikoAutoReplay.cs" />
-    <Compile Include="TaikoDifficultyCalculator.cs" />
     <Compile Include="Objects\TaikoHitObject.cs" />
+    <Compile Include="TaikoDifficultyCalculator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Scoring\TaikoScoreProcessor.cs" />
     <Compile Include="TaikoScore.cs" />
@@ -99,4 +106,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs

@@ -33,12 +33,25 @@ namespace osu.Game.Beatmaps.Drawables
 
             Children = new Drawable[]
             {
+                new DelayedLoadContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    TimeBeforeLoad = 100,
+                    Children = new[]
+                    {
+                        new PanelBackground(beatmap)
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Depth = 1,
+                        }
+                    }
+                },
                 new FillFlowContainer
                 {
                     Direction = FillDirection.Vertical,
                     Padding = new MarginPadding { Top = 5, Left = 18, Right = 10, Bottom = 10 },
                     AutoSizeAxes = Axes.Both,
-                    Children = new[]
+                    Children = new Drawable[]
                     {
                         title = new OsuSpriteText
                         {
@@ -71,23 +84,13 @@ namespace osu.Game.Beatmaps.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config, OsuGameBase game)
+        private void load(OsuConfigManager config)
         {
             this.config = config;
 
             preferUnicode = config.GetBindable<bool>(OsuConfig.ShowUnicode);
             preferUnicode.ValueChanged += preferUnicode_changed;
             preferUnicode_changed(preferUnicode, null);
-
-            new PanelBackground(beatmap)
-            {
-                RelativeSizeAxes = Axes.Both,
-                Depth = 1,
-            }.LoadAsync(game, b =>
-            {
-                Add(b);
-                b.FadeInFromZero(200);
-            });
         }
 
         private void preferUnicode_changed(object sender, EventArgs e)

osu.Game/Beatmaps/Drawables/Panel.cs

@@ -4,7 +4,6 @@
 using osu.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 using OpenTK;
 using OpenTK.Graphics;

osu.Game/Graphics/Containers/ParallaxContainer.cs

@@ -6,7 +6,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Input;
 using OpenTK;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics.Transforms;
 using osu.Game.Configuration;
 using osu.Framework.Configuration;
 

osu.Game/Graphics/Cursor/GameplayCursor.cs

@@ -10,7 +10,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 using osu.Game.Configuration;
 using System;

osu.Game/Graphics/Cursor/MenuCursor.cs

@@ -12,7 +12,6 @@ using osu.Framework.Input;
 using osu.Game.Configuration;
 using System;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Graphics.Transforms;
 
 namespace osu.Game.Graphics.Cursor
 {
@@ -20,9 +19,11 @@ namespace osu.Game.Graphics.Cursor
     {
         protected override Drawable CreateCursor() => new Cursor();
 
+        private bool dragging;
+
         protected override bool OnMouseMove(InputState state)
         {
-            if (state.Mouse.HasMainButtonPressed)
+            if (dragging)
             {
                 Vector2 offset = state.Mouse.Position - state.Mouse.PositionMouseDown ?? state.Mouse.Delta;
                 float degrees = (float)MathHelper.RadiansToDegrees(Math.Atan2(-offset.X, offset.Y)) + 24.3f;
@@ -39,6 +40,12 @@ namespace osu.Game.Graphics.Cursor
             return base.OnMouseMove(state);
         }
 
+        protected override bool OnDragStart(InputState state)
+        {
+            dragging = true;
+            return base.OnDragStart(state);
+        }
+
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
         {
             ActiveCursor.Scale = new Vector2(1);
@@ -53,6 +60,8 @@ namespace osu.Game.Graphics.Cursor
         {
             if (!state.Mouse.HasMainButtonPressed)
             {
+                dragging = false;
+
                 ((Cursor)ActiveCursor).AdditiveLayer.FadeOut(500, EasingTypes.OutQuint);
                 ActiveCursor.RotateTo(0, 600 * (1 + Math.Abs(ActiveCursor.Rotation / 720)), EasingTypes.OutElasticHalf);
                 ActiveCursor.ScaleTo(1, 500, EasingTypes.OutElastic);

osu.Game/Graphics/UserInterface/DialogButton.cs

@@ -4,7 +4,6 @@
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Containers;

osu.Game/Graphics/UserInterface/Nub.cs

@@ -8,7 +8,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Graphics.UserInterface;
 
 namespace osu.Game.Graphics.UserInterface

osu.Game/Graphics/UserInterface/OsuButton.cs

@@ -6,7 +6,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Game.Graphics.Backgrounds;

osu.Game/Graphics/UserInterface/OsuMenu.cs

@@ -6,7 +6,6 @@ using OpenTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Graphics.UserInterface;
 
 namespace osu.Game.Graphics.UserInterface

osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs

@@ -4,7 +4,6 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using OpenTK;
 using OpenTK.Graphics;
 

osu.Game/Graphics/UserInterface/OsuSliderBar.cs

@@ -8,7 +8,6 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 

osu.Game/Graphics/UserInterface/OsuTabControl.cs

@@ -11,7 +11,6 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Game.Graphics.Sprites;

osu.Game/Graphics/UserInterface/OsuTabControlCheckBox.cs

@@ -9,7 +9,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Game.Graphics.Sprites;

osu.Game/Graphics/UserInterface/StarCounter.cs

@@ -4,7 +4,6 @@
 using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.MathUtils;
 using System;
 

osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs

@@ -5,7 +5,6 @@ using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 using osu.Game.Graphics.Sprites;
 using OpenTK;

osu.Game/Modes/Judgements/DrawableJudgement.cs

@@ -7,7 +7,6 @@ using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Modes.Objects.Drawables;

osu.Game/Modes/UI/StandardHealthDisplay.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.Transforms;
 using osu.Game.Graphics;
 
 namespace osu.Game.Modes.UI

osu.Game/Online/API/APIAccess.cs

@@ -12,6 +12,7 @@ using osu.Framework.Configuration;
 using osu.Framework.Logging;
 using osu.Framework.Threading;
 using osu.Game.Online.API.Requests;
+using osu.Game.Users;
 
 namespace osu.Game.Online.API
 {
@@ -118,7 +119,7 @@ namespace osu.Game.Online.API
                             //todo: this fails even on network-related issues. we should probably handle those differently.
                             //NotificationManager.ShowMessage("Login failed!");
                             log.Add(@"Login failed!");
-                            clearCredentials();
+                            Password = null;
                             continue;
                         }
 

osu.Game/Online/API/Requests/GetUserRequest.cs

@@ -1,6 +1,8 @@
 // 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.Game.Users;
+
 namespace osu.Game.Online.API.Requests
 {
     public class GetUserRequest : APIRequest<User>

osu.Game/Online/Chat/Drawables/ChatLine.cs

@@ -91,7 +91,7 @@ namespace osu.Game.Online.Chat.Drawables
                         new OsuSpriteText
                         {
                             Font = @"Exo2.0-BoldItalic",
-                            Text = $@"{Message.User.Name}:",
+                            Text = $@"{Message.User.Username}:",
                             Colour = getUsernameColour(Message),
                             TextSize = text_size,
                             Origin = Anchor.TopRight,

osu.Game/Online/Chat/Message.cs

@@ -3,6 +3,7 @@
 
 using System;
 using Newtonsoft.Json;
+using osu.Game.Users;
 
 namespace osu.Game.Online.Chat
 {

osu.Game/Online/User.cs

@@ -1,19 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using Newtonsoft.Json;
-
-namespace osu.Game.Online
-{
-    public class User
-    {
-        [JsonProperty(@"username")]
-        public string Name;
-
-        [JsonProperty(@"id")]
-        public int Id;
-
-        [JsonProperty(@"colour")]
-        public string Colour;
-    }
-}

osu.Game/OsuGame.cs

@@ -14,7 +14,6 @@ using OpenTK.Input;
 using osu.Framework.Logging;
 using osu.Game.Graphics.UserInterface.Volume;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Timing;
 using osu.Game.Modes;
 using osu.Game.Overlays.Toolbar;

osu.Game/Overlays/ChatOverlay.cs

@@ -10,7 +10,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Threading;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API;

osu.Game/Overlays/Dialog/PopupDialog.cs

@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;

osu.Game/Overlays/DialogOverlay.cs

@@ -5,7 +5,6 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Game.Overlays.Dialog;
 using OpenTK.Graphics;
 

osu.Game/Overlays/LoginOverlay.cs

@@ -6,7 +6,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Game.Graphics;
 using osu.Game.Overlays.Options.Sections.General;
 using OpenTK.Graphics;
@@ -67,6 +66,8 @@ namespace osu.Game.Overlays
 
             optionsSection.Bounding = true;
             FadeIn(transition_time, EasingTypes.OutQuint);
+
+            optionsSection.TriggerFocus();
         }
 
         protected override void PopOut()

osu.Game/Overlays/Mods/ModButton.cs

@@ -10,7 +10,6 @@ using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Modes.Mods;

osu.Game/Overlays/Mods/ModSelectOverlay.cs

@@ -10,7 +10,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Sprites;

osu.Game/Overlays/MusicController.cs

@@ -14,7 +14,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 using osu.Framework.MathUtils;
 using osu.Game.Beatmaps;
@@ -29,7 +28,7 @@ namespace osu.Game.Overlays
 {
     public class MusicController : FocusedOverlayContainer
     {
-        private MusicControllerBackground backgroundSprite;
+        private Drawable currentBackground;
         private DragBar progress;
         private TextAwesome playButton;
         private SpriteText title, artist;
@@ -44,7 +43,6 @@ namespace osu.Game.Overlays
         private Bindable<bool> preferUnicode;
         private WorkingBeatmap current;
         private BeatmapDatabase beatmaps;
-        private Framework.Game game;
 
         private Container dragContainer;
 
@@ -78,10 +76,8 @@ namespace osu.Game.Overlays
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase osuGame, OsuConfigManager config, BeatmapDatabase beatmaps, OsuColour colours)
+        private void load(OsuGameBase game, OsuConfigManager config, BeatmapDatabase beatmaps, OsuColour colours)
         {
-            game = osuGame;
-
             unicodeString = config.GetUnicodeString;
 
             Children = new Drawable[]
@@ -212,15 +208,15 @@ namespace osu.Game.Overlays
             };
 
             this.beatmaps = beatmaps;
-            trackManager = osuGame.Audio.Track;
+            trackManager = game.Audio.Track;
             preferUnicode = config.GetBindable<bool>(OsuConfig.ShowUnicode);
             preferUnicode.ValueChanged += preferUnicode_changed;
 
-            beatmapSource = osuGame.Beatmap ?? new Bindable<WorkingBeatmap>();
+            beatmapSource = game.Beatmap ?? new Bindable<WorkingBeatmap>();
             playList = beatmaps.GetAllWithChildren<BeatmapSetInfo>();
 
-            backgroundSprite = new MusicControllerBackground();
+            currentBackground = new MusicControllerBackground();
-            dragContainer.Add(backgroundSprite);
+            dragContainer.Add(currentBackground);
         }
 
         protected override void LoadComplete()
@@ -351,29 +347,29 @@ namespace osu.Game.Overlays
                     }
                 });
 
-                MusicControllerBackground newBackground;
+                dragContainer.Add(new AsyncLoadContainer
-
-                (newBackground = new MusicControllerBackground(beatmap)).LoadAsync(game, delegate
                 {
-
+                    RelativeSizeAxes = Axes.Both,
-                    dragContainer.Add(newBackground);
+                    Depth = float.MaxValue,
-
+                    Children = new[] { new MusicControllerBackground(beatmap) },
-                    switch (direction)
+                    FinishedLoading = d =>
                     {
-                        case TransformDirection.Next:
+                        switch (direction)
-                            newBackground.Position = new Vector2(400, 0);
+                        {
-                            newBackground.MoveToX(0, 500, EasingTypes.OutCubic);
+                            case TransformDirection.Next:
-                            backgroundSprite.MoveToX(-400, 500, EasingTypes.OutCubic);
+                                d.Position = new Vector2(400, 0);
-                            break;
+                                d.MoveToX(0, 500, EasingTypes.OutCubic);
-                        case TransformDirection.Prev:
+                                currentBackground.MoveToX(-400, 500, EasingTypes.OutCubic);
-                            newBackground.Position = new Vector2(-400, 0);
+                                break;
-                            newBackground.MoveToX(0, 500, EasingTypes.OutCubic);
+                            case TransformDirection.Prev:
-                            backgroundSprite.MoveToX(400, 500, EasingTypes.OutCubic);
+                                d.Position = new Vector2(-400, 0);
-                            break;
+                                d.MoveToX(0, 500, EasingTypes.OutCubic);
+                                currentBackground.MoveToX(400, 500, EasingTypes.OutCubic);
+                                break;
+                        }
+                        currentBackground.Expire();
+                        currentBackground = d;
                     }
-
-                    backgroundSprite.Expire();
-                    backgroundSprite = newBackground;
                 });
             };
         }
@@ -422,8 +418,8 @@ namespace osu.Game.Overlays
             {
                 this.beatmap = beatmap;
                 CacheDrawnFrameBuffer = true;
-                RelativeSizeAxes = Axes.Both;
                 Depth = float.MaxValue;
+                RelativeSizeAxes = Axes.Both;
 
                 Children = new Drawable[]
                 {

osu.Game/Overlays/NotificationManager.cs

@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Game.Overlays.Notifications;
 using OpenTK.Graphics;
 

osu.Game/Overlays/Notifications/NotificationSection.cs

@@ -9,7 +9,6 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
-using osu.Framework.Graphics.Transforms;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using OpenTK;

osu.Game/Overlays/Notifications/ProgressNotification.cs

@@ -6,7 +6,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using OpenTK;

osu.Game/Overlays/Options/Sections/General/LoginOptions.cs

@@ -11,12 +11,14 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using OpenTK;
+using osu.Framework.Input;
 
 namespace osu.Game.Overlays.Options.Sections.General
 {
     public class LoginOptions : OptionsSubsection, IOnlineComponent
     {
         private bool bounding = true;
+        private LoginForm form;
 
         protected override string Header => "Account";
 
@@ -40,12 +42,14 @@ namespace osu.Game.Overlays.Options.Sections.General
 
         public void APIStateChanged(APIAccess api, APIState state)
         {
+            form = null;
+
             switch (state)
             {
                 case APIState.Offline:
                     Children = new Drawable[]
                     {
-                        new LoginForm()
+                        form = new LoginForm()
                     };
                     break;
                 case APIState.Failing:
@@ -82,6 +86,14 @@ namespace osu.Game.Overlays.Options.Sections.General
                     };
                     break;
             }
+
+            form?.TriggerFocus();
+        }
+
+        protected override bool OnFocus(InputState state)
+        {
+            form?.TriggerFocus();
+            return base.OnFocus(state);
         }
 
         private class LoginForm : FillFlowContainer
@@ -144,6 +156,19 @@ namespace osu.Game.Overlays.Options.Sections.General
                     }
                 };
             }
+
+            protected override bool OnFocus(InputState state)
+            {
+                Schedule(() =>
+                {
+                    if (string.IsNullOrEmpty(username.Text))
+                        username.TriggerFocus();
+                    else
+                        password.TriggerFocus();
+                });
+
+                return base.OnFocus(state);
+            }
         }
     }
 }

osu.Game/Overlays/Options/Sidebar.cs

@@ -6,7 +6,6 @@ using OpenTK.Graphics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 using osu.Framework.Threading;
 using osu.Game.Overlays.Toolbar;

osu.Game/Overlays/OptionsOverlay.cs

@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Game.Overlays.Options;
 using System;
 using osu.Game.Graphics;

osu.Game/Overlays/Toolbar/Toolbar.cs

@@ -7,7 +7,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 using osu.Game.Graphics;
 using osu.Game.Modes;

osu.Game/Overlays/Toolbar/ToolbarButton.cs

@@ -10,7 +10,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;

osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs

@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Game.Modes;
 using OpenTK;
 using OpenTK.Graphics;

osu.Game/Overlays/Toolbar/ToolbarUserButton.cs

@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Toolbar
 {
     internal class ToolbarUserButton : ToolbarButton, IOnlineComponent
     {
-        private readonly Avatar avatar;
+        private readonly UpdateableAvatar avatar;
 
         public ToolbarUserButton()
         {
@@ -24,7 +24,7 @@ namespace osu.Game.Overlays.Toolbar
 
             Add(new OpaqueBackground { Depth = 1 });
 
-            Flow.Add(avatar = new Avatar
+            Flow.Add(avatar = new UpdateableAvatar
             {
                 Masking = true,
                 Size = new Vector2(32),
@@ -52,11 +52,11 @@ namespace osu.Game.Overlays.Toolbar
             {
                 default:
                     Text = @"Guest";
-                    avatar.UserId = 1;
+                    avatar.User = new User();
                     break;
                 case APIState.Online:
                     Text = api.Username;
-                    avatar.UserId = api.LocalUser.Value.Id;
+                    avatar.User = api.LocalUser;
                     break;
             }
         }

osu.Game/Overlays/WaveOverlayContainer.cs

@@ -7,7 +7,6 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using System;
 
 namespace osu.Game.Overlays

osu.Game/Screens/BackgroundScreen.cs

@@ -6,7 +6,6 @@ using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Screens;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 using OpenTK;
 

osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs

@@ -2,8 +2,8 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using OpenTK;
-using osu.Framework.Graphics.Transforms;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Backgrounds;
 

osu.Game/Screens/GameScreenWhiteBox.cs

@@ -7,7 +7,6 @@ using osu.Framework.Screens;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Screens.Backgrounds;

osu.Game/Screens/Menu/ButtonSystem.cs

@@ -9,7 +9,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 using osu.Game.Graphics;
 using osu.Game.Overlays.Toolbar;

osu.Game/Screens/Menu/Intro.cs

@@ -7,7 +7,6 @@ using osu.Framework.Audio.Sample;
 using osu.Framework.Audio.Track;
 using osu.Framework.Screens;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Transforms;
 using osu.Game.Graphics.Containers;
 using osu.Game.Screens.Backgrounds;
 using OpenTK.Graphics;

osu.Game/Screens/Menu/MainMenu.cs

@@ -2,10 +2,8 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
-using osu.Framework.Screens;
-using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Transforms;
+using osu.Framework.Screens;
 using osu.Game.Graphics.Containers;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Charts;
@@ -49,7 +47,6 @@ namespace osu.Game.Screens.Menu
                             OnEdit = delegate { Push(new Editor()); },
                             OnSolo = delegate { Push(consumeSongSelect()); },
                             OnMulti = delegate { Push(new Lobby()); },
-                            OnTest  = delegate { Push(new TestBrowser()); },
                             OnExit = delegate { Exit(); },
                         }
                     }