sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into remove-usings

Browse Source
This commit is contained in:
Dean Herbert
2017-02-24 11:29:34 +09:00
parent a5dfa7ab06 a8135332d6
commit c5552dfb27
25 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -120,7 +120,7 @@ namespace osu.Game.Screens.Select
{
BeatmapInfo = carousel.SelectedGroup.SelectedPanel.Beatmap,
PreferredPlayMode = playMode.Value
})).Preload(Game, l => Push(player));
})).LoadAsync(Game, l => Push(player));
}
}
};
@ -338,7 +338,7 @@ namespace osu.Game.Screens.Select
//for the time being, let's completely load the difficulty panels in the background.
//this likely won't scale so well, but allows us to completely async the loading flow.
Task.WhenAll(group.BeatmapPanels.Select(panel => panel.Preload(game))).ContinueWith(task => Schedule(delegate
Task.WhenAll(group.BeatmapPanels.Select(panel => panel.LoadAsync(game))).ContinueWith(task => Schedule(delegate
{
beatmapGroups.Add(group);