Dean Herbert 4e4408cd20 Merge branch 'master' into replay ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs		2017-03-05 17:45:03 +09:00
..
Pause	Move PauseOverlay to correct namespace.	2017-03-03 10:17:39 +09:00
FailDialog.cs	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
KeyCounter.cs	Use Color4Extensions from Framework and remove redundant Name	2017-03-04 19:42:37 +01:00
KeyCounterCollection.cs	Update usage of FillDirection	2017-03-04 11:00:17 +01:00
KeyCounterKeyboard.cs	Use Color4Extensions from Framework and remove redundant Name	2017-03-04 19:42:37 +01:00
KeyCounterMouse.cs	Use Color4Extensions from Framework and remove redundant Name	2017-03-04 19:42:37 +01:00
PauseOverlay.cs	Use Color4Extensions from Framework and remove redundant Name	2017-03-04 19:42:37 +01:00
Player.cs	Don't show pause menu when watching replays.	2017-03-04 21:35:26 +09:00
PlayerInputManager.cs	Create class hierarchy for Score/Replay storage.	2017-03-04 15:32:41 +09:00
PlayerLoader.cs	Update usage of FillDirection	2017-03-04 11:00:17 +01:00
SkipButton.cs	Do not shadow Colour in TwoLayerButton	2017-02-23 22:33:37 +01:00