Merge remote-tracking branch 'origin/master' into editor-selection-tool

This commit is contained in:
smoogipoo
2017-12-08 15:13:03 +09:00
60 changed files with 3847 additions and 1226 deletions

View File

@ -79,7 +79,7 @@ namespace osu.Game.Tests.Visual
var decoupledClock = new DecoupleableInterpolatingFramedClock { IsCoupled = true };
storyboardContainer.Clock = decoupledClock;
storyboard = working.Beatmap.Storyboard.CreateDrawable(beatmapBacking);
storyboard = working.Storyboard.CreateDrawable(beatmapBacking);
storyboard.Passing = false;
storyboardContainer.Add(storyboard);