sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 08:49:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework

Browse Source
This commit is contained in:
Dean Herbert
2018-06-11 20:08:17 +09:00
parent 1dfa3ff995 519200c3d3
commit 8092d70402
230 changed files with 4265 additions and 2652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
View File

@ -5,7 +5,6 @@ using System;
using System.Collections.Generic;
using NUnit.Framework;
using OpenTK;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Overlays;
@ -16,9 +15,7 @@ namespace osu.Game.Tests.Visual
[TestFixture]
public class TestCaseEditorComposeTimeline : OsuTestCase
{
public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(TimelineArea), typeof(Timeline), typeof(BeatmapWaveformGraph), typeof(TimelineButton) };
private readonly TimelineArea timelineArea;
public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(TimelineArea), typeof(Timeline), typeof(TimelineButton) };
public TestCaseEditorComposeTimeline()
{
@ -30,7 +27,7 @@ namespace osu.Game.Tests.Visual
Origin = Anchor.TopCentre,
State = Visibility.Visible
},
timelineArea = new TimelineArea
new TimelineArea
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
@ -39,11 +36,5 @@ namespace osu.Game.Tests.Visual
}
};
}
[BackgroundDependencyLoader]
private void load(OsuGameBase osuGame)
{
timelineArea.Beatmap.BindTo(osuGame.Beatmap);
}
}
}