smoogipoo a3470f9ec3 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change ... # Conflicts: # osu.Game/Overlays/Music/PlaylistOverlay.cs # osu.Game/Screens/OsuScreen.cs		2018-05-28 18:01:15 +09:00
..
Backgrounds
Charts
Direct
Edit	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change	2018-05-28 18:01:15 +09:00
Menu	Privatise the OsuGame beatmap, add local beatmap to OsuTestCase	2018-05-23 17:38:02 +09:00
Multi	Adjust transitions of DrawableRoom	2018-05-28 13:30:29 +09:00
Play	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change	2018-05-28 18:01:15 +09:00
Ranking	Privatise the OsuGame beatmap, add local beatmap to OsuTestCase	2018-05-23 17:38:02 +09:00
Select	Fix base.CreateLocalDependencies sometimes not being called	2018-05-24 13:03:25 +09:00
Tournament	expose two Bindables with split logic instead of one with mixed logic	2018-05-21 15:53:55 +02:00
BackgroundScreen.cs
Loader.cs	expose two Bindables with split logic instead of one with mixed logic	2018-05-21 15:53:55 +02:00
OsuScreen.cs	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change	2018-05-28 18:01:15 +09:00
ScreenWhiteBox.cs