Dean Herbert 14b22445fa Merge remote-tracking branch 'upstream/master' into general-fixes ... # Conflicts: # osu.Game/Modes/UI/HitRenderer.cs		2017-03-14 16:15:26 +09:00
..
Pause	Move PauseOverlay to correct namespace.	2017-03-03 10:17:39 +09:00
FailDialog.cs	Fix most warnings.	2017-03-07 13:05:57 +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	Move InputManager to a higher and more implicit level.	2017-03-07 19:30:48 +09:00
KeyCounterKeyboard.cs	Use Color4Extensions from Framework and remove redundant Name	2017-03-04 19:42:37 +01:00
KeyCounterMouse.cs	Fix KeyCounter M1 M2 display.	2017-03-14 12:31:09 +09:00
PauseOverlay.cs	Reduce error count.	2017-03-09 14:24:16 +09:00
Player.cs	Initial attempt at making mods apply better.	2017-03-12 22:13:43 +09:00
PlayerInputManager.cs	Split PlayerInputManager into two classes, allowing more precise handling of input (for KeyCounter).	2017-03-14 16:00:35 +09:00
PlayerLoader.cs	Reduce warning/suggestion count to zero.	2017-03-09 15:52:40 +09:00
SkipButton.cs	Do not shadow Colour in TwoLayerButton	2017-02-23 22:33:37 +01:00