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
..
Backgrounds	Removed unused variables and parameters	2017-02-27 17:32:32 +03:00
Charts	GameMode -> Screen.	2017-02-17 19:23:58 +09:00
Direct	GameMode -> Screen.	2017-02-17 19:23:58 +09:00
Edit	GameMode -> Screen.	2017-02-17 19:23:58 +09:00
Menu	FlowDirection -> FillDirection	2017-03-01 20:15:38 +01:00
Multiplayer	GameMode -> Screen.	2017-02-17 19:23:58 +09:00
Play	Merge branch 'master' into DrabWeb/song-progress-graph	2017-03-02 20:20:27 +09:00
Ranking	FlowDirection -> FillDirection	2017-03-01 20:15:38 +01:00
Select	Merge branch 'master' into master	2017-03-02 18:06:31 +09:00
BackgroundScreen.cs	Update framework	2017-02-26 11:22:58 +09:00
GameScreenWhiteBox.cs	FlowDirection -> FillDirection	2017-03-01 20:15:38 +01:00
Loader.cs	Update framework and add "Async" suffix to asynchronous methods	2017-02-23 22:32:10 +01:00
OsuGameScreen.cs	Fix test case regression.	2017-02-27 18:09:27 +09:00