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

Merge remote-tracking branch 'origin/master' into timeline-audio-scrolling

Browse Source 
# Conflicts:
#	osu-framework
#	osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
#	osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs
This commit is contained in:
smoogipoo
2018-06-12 14:19:21 +09:00
parent b649025e86 065991996f
commit 30b7b7961f
266 changed files with 4921 additions and 3136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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,10 +15,9 @@ namespace osu.Game.Tests.Visual
[TestFixture]
public class TestCaseEditorComposeTimeline : EditorClockTestCase
{
public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(TimelineArea), typeof(Timeline), typeof(BeatmapWaveformGraph), typeof(TimelineButton) };
public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(TimelineArea), typeof(Timeline), typeof(TimelineButton) };
[BackgroundDependencyLoader]
private void load(OsuGameBase osuGame)
public TestCaseEditorComposeTimeline()
{
TimelineArea timelineArea;
@ -31,7 +29,7 @@ namespace osu.Game.Tests.Visual
Origin = Anchor.TopCentre,
State = Visibility.Visible
},
timelineArea = new TimelineArea
new TimelineArea
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
@ -39,8 +37,6 @@ namespace osu.Game.Tests.Visual
Size = new Vector2(0.8f, 100)
}
};
timelineArea.Beatmap.BindTo(osuGame.Beatmap);
}
}
}