Merge remote-tracking branch 'upstream/master' into LobbyList

This commit is contained in:
David Zhao
2019-03-05 18:59:38 +09:00
72 changed files with 906 additions and 304 deletions

View File

@ -54,7 +54,7 @@ namespace osu.Game.Screens.Multi.Match.Components
hasBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmap.OnlineBeatmapID) != null;
}
private void beatmapAdded(BeatmapSetInfo model, bool existing, bool silent)
private void beatmapAdded(BeatmapSetInfo model, bool existing)
{
if (Beatmap.Value == null)
return;

View File

@ -202,7 +202,7 @@ namespace osu.Game.Screens.Multi.Match
/// <summary>
/// Handle the case where a beatmap is imported (and can be used by this match).
/// </summary>
private void beatmapAdded(BeatmapSetInfo model, bool existing, bool silent) => Schedule(() =>
private void beatmapAdded(BeatmapSetInfo model, bool existing) => Schedule(() =>
{
if (Beatmap.Value != beatmapManager.DefaultBeatmap)
return;