Dean Herbert df65443f07 Merge branch 'master' ...

Conflicts:
	osu-framework
	osu.Game/Screens/Play/Player.cs

2018-01-30 18:31:03 +09:00

..

BreaksOverlay

Minor cleanups

2018-01-24 17:48:42 +09:00

HUD

Update licence headers

2018-01-05 20:21:19 +09:00

ReplaySettings

Cleanup

2018-01-10 17:39:15 +09:00

FailOverlay.cs

Update licence headers

2018-01-05 20:21:19 +09:00

GameplayMenuOverlay.cs

Remove unnecessary overrides

2018-01-16 20:34:40 +09:00

HotkeyRetryOverlay.cs

Remove usings

2018-01-23 13:24:04 +09:00

HUDOverlay.cs

Minor cleanups

2018-01-24 17:48:42 +09:00

KeyCounter.cs

Update licence headers

2018-01-05 20:21:19 +09:00

KeyCounterAction.cs

Update licence headers

2018-01-05 20:21:19 +09:00

KeyCounterCollection.cs

Apply conditionals directly rather than using an in-between property

2018-01-16 20:34:40 +09:00

KeyCounterKeyboard.cs

Update licence headers

2018-01-05 20:21:19 +09:00

KeyCounterMouse.cs

Update licence headers

2018-01-05 20:21:19 +09:00

PauseContainer.cs

Update licence headers

2018-01-05 20:21:19 +09:00

Player.cs

Merge branch 'master'

2018-01-30 18:31:03 +09:00

PlayerLoader.cs

Update licence headers

2018-01-05 20:21:19 +09:00

ReplayPlayer.cs

Update licence headers

2018-01-05 20:21:19 +09:00

SkipButton.cs

Make SkipButton an OverlayContainer to use the menu cursor

2018-01-12 18:21:17 +09:00

SongProgress.cs

Remove unneeded event binding

2018-01-18 00:04:33 +09:00

SongProgressBar.cs

Update licence headers

2018-01-05 20:21:19 +09:00

SongProgressGraph.cs

Update licence headers

2018-01-05 20:21:19 +09:00

SongProgressInfo.cs

Update licence headers

2018-01-05 20:21:19 +09:00

SquareGraph.cs

Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties

2018-01-07 23:40:00 +03:00