Merge remote-tracking branch 'upstream/master' into song-select-filtering

This commit is contained in:
Drew DeVault
2017-01-30 09:35:14 -05:00
19 changed files with 315 additions and 78 deletions

View File

@ -369,7 +369,7 @@ namespace osu.Game.Screens.Select
if (b.Metadata == null) b.Metadata = beatmapSet.Metadata;
});
beatmapSet.Beatmaps = beatmapSet.Beatmaps.OrderBy(b => b.BaseDifficulty.OverallDifficulty).ToList();
beatmapSet.Beatmaps = beatmapSet.Beatmaps.OrderBy(b => b.StarDifficulty).ToList();
var beatmap = new WorkingBeatmap(beatmapSet.Beatmaps.FirstOrDefault(), beatmapSet, database);