Merge remote-tracking branch 'upstream/master' into taiko_drumroll_drawing

# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
This commit is contained in:
Dean Herbert
2017-04-01 16:02:32 +09:00
25 changed files with 125 additions and 135 deletions

View File

@ -24,21 +24,20 @@ namespace osu.Desktop.VisualTests.Tests
{
base.Reset();
AddButton("Hit!", addHitJudgement);
AddButton("Miss :(", addMissJudgement);
AddButton("DrumRoll", () => addDrumRoll(false));
AddButton("Strong DrumRoll", () => addDrumRoll(true));
AddButton("Swell", addSwell);
AddButton("Centre", () => addCentreHit(false));
AddButton("Strong Centre", () => addCentreHit(true));
AddButton("Rim", () => addRimHit(false));
AddButton("Strong Rim", () => addRimHit(true));
AddStep("Hit!", addHitJudgement);
AddStep("Miss :(", addMissJudgement);
AddStep("DrumRoll", () => addDrumRoll(false));
AddStep("Strong DrumRoll", () => addDrumRoll(true));
AddStep("Swell", addSwell);
AddStep("Centre", () => addCentreHit(false));
AddStep("Strong Centre", () => addCentreHit(true));
AddStep("Rim", () => addRimHit(false));
AddStep("Strong Rim", () => addRimHit(true));
Add(new Container
{
RelativeSizeAxes = Axes.X,
Y = 200,
Padding = new MarginPadding { Left = 200 },
Children = new[]
{
playfield = new TaikoPlayfield()