Merge branch 'master' into fix-resume-from-player-audio

This commit is contained in:
Dan Balasescu
2019-10-11 19:21:14 +09:00
committed by GitHub
38 changed files with 289 additions and 394 deletions

View File

@ -66,11 +66,7 @@ namespace osu.Game.Screens.Select
/// </summary>
protected readonly Container FooterPanels;
protected override BackgroundScreen CreateBackground()
{
var background = new BackgroundScreenBeatmap();
return background;
}
protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap();
protected readonly BeatmapCarousel Carousel;
private readonly BeatmapInfoWedge beatmapInfoWedge;