Merge remote-tracking branch 'origin/master' into facade-container

# Conflicts:
#	osu.Game/Screens/Play/PlayerLoader.cs
This commit is contained in:
smoogipoo
2019-04-17 17:17:33 +09:00
65 changed files with 272 additions and 208 deletions

View File

@ -253,7 +253,7 @@ namespace osu.Game.Tests.Visual.UserInterface
private class TestModSelectOverlay : ModSelectOverlay
{
public new Bindable<IEnumerable<Mod>> SelectedMods => base.SelectedMods;
public new Bindable<IReadOnlyList<Mod>> SelectedMods => base.SelectedMods;
public ModButton GetModButton(Mod mod)
{