Dean Herbert 9bf861d0a4 Merge remote-tracking branch 'upstream/master' into peppy/pause-clean-up ... # Conflicts: # osu.Game/Screens/Play/FailOverlay.cs # osu.Game/Screens/Play/PauseOverlay.cs		2017-04-14 01:07:34 +09:00
..
Pause	fixes	2017-03-28 05:19:32 +03:00
FailOverlay.cs	Improve "escape" pressing logic in pause/fail menus.	2017-04-13 12:40:00 +09:00
HotkeyRetryOverlay.cs	Remove unnecessary AlwaysPresent.	2017-04-10 17:26:05 +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	Fix MosueUp and HighResolution events not being handled by MenuOverlays.	2017-04-13 13:03:07 +09:00
PauseOverlay.cs	Improve "escape" pressing logic in pause/fail menus.	2017-04-13 12:40:00 +09:00
Player.cs	Add exception for failing.	2017-04-13 19:13:09 +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