Merge branch 'master' into return_to_large_logo_after_idle

This commit is contained in:
UselessToucan
2018-09-25 19:48:38 +03:00
committed by GitHub
66 changed files with 1153 additions and 294 deletions

View File

@ -359,7 +359,7 @@ namespace osu.Game
loadComponentSingleFile(beatmapSetOverlay = new BeatmapSetOverlay { Depth = -3 }, mainContent.Add);
loadComponentSingleFile(musicController = new MusicController
{
Depth = -4,
Depth = -5,
Position = new Vector2(0, Toolbar.HEIGHT),
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,