Dean Herbert 4e4408cd20 Merge branch 'master' into replay ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs		2017-03-05 17:45:03 +09:00
..
OsuComboCounter.cs	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
OsuHitRenderer.cs	Add spinners and improve TestCaseHitObjects.	2017-02-15 01:23:20 +09:00
OsuPlayfield.cs	Basic partial replay support.	2017-03-01 22:04:20 +09:00
OsuScoreOverlay.cs	Use Color4Extensions from Framework and remove redundant Name	2017-03-04 19:42:37 +01:00