Dean Herbert 9e1383fa48 Merge remote-tracking branch 'upstream/master' into replay ... # Conflicts: # osu.Game.Modes.Catch/CatchRuleset.cs # osu.Game.Modes.Mania/ManiaRuleset.cs # osu.Game.Modes.Taiko/TaikoRuleset.cs # osu.Game/Screens/Play/Player.cs		2017-03-04 13:17:01 +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	Remvoe ctor argument and fallback to storage-based TeamList if no custom list has been provided.	2017-03-03 20:21:11 +09:00
Multiplayer	GameMode -> Screen.	2017-02-17 19:23:58 +09:00
Play	Merge remote-tracking branch 'upstream/master' into replay	2017-03-04 13:17:01 +09:00
Ranking	FlowDirection -> FillDirection	2017-03-01 20:15:38 +01:00
Select	Put mod select over beatmap options	2017-03-03 04:19:03 -04:00
Tournament	GroupsContainer -> GroupContainer.	2017-03-03 20:46:07 +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