Merge remote-tracking branch 'upstream/master' into partial-judgements

# Conflicts:
#	osu.Game/osu.Game.csproj
This commit is contained in:
Dean Herbert
2017-03-31 16:46:40 +09:00
27 changed files with 595 additions and 383 deletions

View File

@ -26,6 +26,7 @@ namespace osu.Desktop.VisualTests.Tests
AddButton("Hit!", addHitJudgement);
AddButton("Miss :(", addMissJudgement);
AddButton("Swell", addSwell);
AddButton("Centre", () => addCentreHit(false));
AddButton("Strong Centre", () => addCentreHit(true));
AddButton("Rim", () => addRimHit(false));
@ -72,6 +73,16 @@ namespace osu.Desktop.VisualTests.Tests
});
}
private void addSwell()
{
playfield.Add(new DrawableSwell(new Swell
{
StartTime = Time.Current + 1000,
EndTime = Time.Current + 5000,
PreEmpt = 1000
}));
}
private void addCentreHit(bool strong)
{
Hit h = new Hit