h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-05 02:53:21 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into settingsource-dropdown

Browse Source
This commit is contained in:
Dan Balasescu 2020-02-28 16:42:24 +09:00 committed by GitHub
commit 5118d57a7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
View File

@ -16,6 +16,8 @@ namespace osu.Game.Beatmaps.Drawables
{
public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
protected override double LoadDelay => 500;
[Resolved]
private BeatmapManager beatmaps { get; set; }

4
osu.Game/Online/Multiplayer/PlaylistItem.cs
View File

@ -65,9 +65,7 @@ namespace osu.Game.Online.Multiplayer
public void MapObjects(BeatmapManager beatmaps, RulesetStore rulesets)
{
// If we don't have an api beatmap, the request occurred as a result of room creation, so we can query the local beatmap instead
// Todo: Is this a bug? Room creation only returns the beatmap ID
Beatmap.Value = apiBeatmap == null ? beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == BeatmapID) : apiBeatmap.ToBeatmap(rulesets);
Beatmap.Value = apiBeatmap.ToBeatmap(rulesets);
Ruleset.Value = rulesets.GetRuleset(RulesetID);
Ruleset rulesetInstance = Ruleset.Value.CreateInstance();

9
osu.Game/Online/Multiplayer/Room.cs
View File

@ -118,15 +118,6 @@ namespace osu.Game.Online.Multiplayer
if (DateTimeOffset.Now >= EndDate.Value)
Status.Value = new RoomStatusEnded();
// transfer local beatmaps across to ensure we have Metadata available (CreateRoomRequest does not give us metadata as expected)
foreach (var item in other.Playlist)
{
var localItem = Playlist.FirstOrDefault(i => i.BeatmapID == item.BeatmapID);
if (localItem != null)
item.Beatmap.Value.Metadata = localItem.Beatmap.Value.Metadata;
}
if (!Playlist.SequenceEqual(other.Playlist))
{
Playlist.Clear();

2
osu.Game/Screens/Menu/IntroTriangles.cs
View File

@ -54,8 +54,6 @@ namespace osu.Game.Screens.Menu
{
base.LogoArriving(logo, resuming);
logo.Triangles = true;
if (!resuming)
{
PrepareMenuLoad();