RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-double-load-playlist-backgrounds

This commit is contained in:
Bartłomiej Dach 2024-05-03 08:15:56 +02:00
parent d1a50ff85b 53b9159a01
commit cf27366f99
No known key found for this signature in database
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/DummyWorkingBeatmap.cs
View File

@ -53,7 +53,7 @@ public DummyWorkingBeatmap([NotNull] AudioManager audio, TextureStore textures)
protected override IBeatmap GetBeatmap() => new Beatmap();
public override Texture GetBackground() => textures?.Get(@"Backgrounds/bg4");
public override Texture GetBackground() => textures?.Get(@"Backgrounds/bg2");
protected override Track GetBeatmapTrack() => GetVirtualTrack();

1
osu.Game/Overlays/BeatmapListingOverlay.cs
View File

@ -198,6 +198,7 @@ private IEnumerable<BeatmapCard> createCardsFor(IEnumerable<APIBeatmapSet> beatm
{
c.Anchor = Anchor.TopCentre;
c.Origin = Anchor.TopCentre;
c.Scale = new Vector2(0.8f);
})).ToArray();
private static ReverseChildIDFillFlowContainer<BeatmapCard> createCardContainerFor(IEnumerable<BeatmapCard> newCards)

2
osu.Game/Overlays/NowPlayingOverlay.cs
View File

@ -422,7 +422,7 @@ public Background(WorkingBeatmap beatmap)
[BackgroundDependencyLoader]
private void load(LargeTextureStore textures)
{
sprite.Texture = beatmap.GetBackground() ?? textures.Get(@"Backgrounds/bg4");
sprite.Texture = beatmap.GetBackground() ?? textures.Get(@"Backgrounds/bg2");
}
}