sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 06:36:31 +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

6
osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
View File

@ -49,7 +49,7 @@ namespace osu.Game.Tests.Visual
AddStep("show", () =>
{
infoWedge.State = Visibility.Visible;
infoWedge.UpdateBeatmap(Beatmap);
infoWedge.Beatmap = Beatmap;
});
// select part is redundant, but wait for load isn't
@ -129,7 +129,7 @@ namespace osu.Game.Tests.Visual
AddStep($"select {b.Metadata.Title} beatmap", () =>
{
infoBefore = infoWedge.Info;
infoWedge.UpdateBeatmap(Beatmap.Value = new TestWorkingBeatmap(b));
infoWedge.Beatmap = Beatmap.Value = new TestWorkingBeatmap(b);
});
AddUntilStep(() => infoWedge.Info != infoBefore, "wait for async load");
@ -140,7 +140,7 @@ namespace osu.Game.Tests.Visual
AddStep("select null beatmap", () =>
{
Beatmap.Value = Beatmap.Default;
infoWedge.UpdateBeatmap(Beatmap);
infoWedge.Beatmap = Beatmap;
});
}