Dean Herbert 435e845067 Merge branch 'master' into DrabWeb/song-progress-graph ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Overlays/Pause/PauseProgressBar.cs # osu.Game/Overlays/Pause/PauseProgressGraph.cs # osu.Game/osu.Game.csproj		2017-03-02 20:20:27 +09:00
..
FailDialog.cs	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
KeyCounter.cs	Update Key Counter font.	2017-02-16 22:43:49 +09:00
KeyCounterCollection.cs	FlowDirection -> FillDirection	2017-03-01 20:15:38 +01:00
KeyCounterKeyboard.cs	Update framework	2017-02-26 11:22:58 +09:00
KeyCounterMouse.cs	Update framework	2017-02-26 11:22:58 +09:00
ModSelect.cs	GameMode -> Screen.	2017-02-17 19:23:58 +09:00
Player.cs	Remove references to PassThrough.	2017-03-02 16:28:51 +09:00
PlayerInputManager.cs	Weld -> BindWith.	2017-02-27 12:24:53 +09:00
PlayerLoader.cs	FlowDirection -> FillDirection	2017-03-01 20:15:38 +01:00
SkipButton.cs	Do not shadow Colour in TwoLayerButton	2017-02-23 22:33:37 +01:00
SongProgress.cs	Merge branch 'master' into DrabWeb/song-progress-graph	2017-03-02 20:20:27 +09:00
SongProgressBar.cs	Removed gradient from test case, modified DragBar to allow access to what's needed in the progress bar, styled the progress bar	2017-02-09 16:28:40 -04:00
SongProgressGraph.cs	Merge branch 'master' into DrabWeb/song-progress-graph	2017-03-02 20:20:27 +09:00
SongProgressGraphColumn.cs	Merge branch 'master' into DrabWeb/song-progress-graph	2017-03-02 20:20:27 +09:00