Dean Herbert 12d2102a88 Merge remote-tracking branch 'upstream/master' into song-progress-graph ...

# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
#	osu.Game/Modes/UI/HudOverlay.cs
#	osu.Game/Screens/Play/PauseOverlay.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/osu.Game.csproj

2017-04-07 09:22:18 +09:00

..

Pause

fixes

2017-03-28 05:19:32 +03:00

FailOverlay.cs

InGameOverlay -> MenuOverlay.

2017-04-06 15:34:52 +09:00

KeyConversionInputManager.cs

Split PlayerInputManager into two classes, allowing more precise handling of input (for KeyCounter).

2017-03-14 16:00:35 +09:00

KeyCounter.cs

Reduce error count.

2017-03-09 14:24:16 +09:00

KeyCounterCollection.cs

Enforce readonly private members where possible.

2017-03-23 13:50:08 +09:00

KeyCounterKeyboard.cs

Use Color4Extensions from Framework and remove redundant Name

2017-03-04 19:42:37 +01:00

KeyCounterMouse.cs

Make everything share DropDown implementations again. Remove unnecessary files.

2017-03-16 21:17:14 +09:00

MenuOverlay.cs

InGameOverlay -> MenuOverlay.

2017-04-06 15:34:52 +09:00

PauseOverlay.cs

InGameOverlay -> MenuOverlay.

2017-04-06 15:34:52 +09:00

Player.cs

Merge remote-tracking branch 'upstream/master' into song-progress-graph

2017-04-07 09:22:18 +09:00

PlayerInputManager.cs

Enforce readonly private members where possible.

2017-03-23 13:50:08 +09:00

PlayerLoader.cs

Update async load usage to new style.

2017-04-02 15:56:12 +09:00

ReplayPlayer.cs

Refactor ReplayInputHandler creation for more flexibility.

2017-03-31 15:59:53 +09:00

SkipButton.cs

Do not shadow Colour in TwoLayerButton

2017-02-23 22:33:37 +01:00

SongProgress.cs

Unused using

2017-03-24 00:45:19 -03:00

SongProgressBar.cs

Use OsuColour instead of static colours

2017-03-24 00:41:14 -03:00

SongProgressGraph.cs

Use OsuColour instead of static colours

2017-03-24 00:41:14 -03:00