Merge branch 'master' into leased-bindables-dont-work

This commit is contained in:
Dean Herbert
2019-02-11 16:30:12 +09:00
committed by GitHub
70 changed files with 1103 additions and 992 deletions

View File

@ -31,6 +31,7 @@ using osu.Game.Screens.Menu;
using osu.Game.Screens.Play;
using osu.Game.Screens.Select.Options;
using osu.Game.Skinning;
using osuTK.Graphics;
namespace osu.Game.Screens.Select
{
@ -564,7 +565,7 @@ namespace osu.Game.Screens.Select
{
backgroundModeBeatmap.Beatmap = beatmap;
backgroundModeBeatmap.BlurTo(background_blur, 750, Easing.OutQuint);
backgroundModeBeatmap.FadeTo(1, 250);
backgroundModeBeatmap.FadeColour(Color4.White, 250);
}
beatmapInfoWedge.Beatmap = beatmap;