Merge branch 'master' into click-disabled-difficulty-icons

This commit is contained in:
Dean Herbert
2020-03-16 11:30:53 +09:00
60 changed files with 1221 additions and 857 deletions

View File

@ -32,7 +32,7 @@ namespace osu.Game.Screens.Select.Carousel
if (Beatmap.BeatmapSet?.Equals(criteria.SelectedBeatmapSet) == true)
{
// bypass filtering for selected beatmap
// only check ruleset equality or convertability for selected beatmap
Filtered.Value = !match;
return;
}