sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 22:26:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into disallow-beatmap-change

Browse Source 
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
#	osu.Game/Screens/Menu/Intro.cs
#	osu.Game/Screens/Menu/MenuSideFlashes.cs
This commit is contained in:
smoogipoo
2018-06-06 18:26:51 +09:00
parent 0f7b23d765 e7fa043226
commit 4086ff7313
49 changed files with 490 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/Select/SongSelect.cs
View File

@ -435,7 +435,7 @@ namespace osu.Game.Screens.Select
backgroundModeBeatmap.FadeTo(1, 250);
}
beatmapInfoWedge.UpdateBeatmap(beatmap);
beatmapInfoWedge.Beatmap = beatmap;
}
private void ensurePlayingSelected(bool preview = false)