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

@ -21,7 +21,7 @@ namespace osu.Desktop.VisualTests.Tests
{
base.Reset();
AddToggle("Kiai", b =>
AddToggleStep("Kiai", b =>
{
kiai = !kiai;
Reset();