sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 06:36:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into control-point-timeline-representation

Browse Source
This commit is contained in:
Dean Herbert
2020-10-05 19:24:28 +09:00
committed by GitHub
parent 0d3a95d8fc 08f7b18dbe
commit ba55256fb4
83 changed files with 1426 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
View File

@ -13,6 +13,7 @@ using osu.Framework.Input.Events;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Rulesets.Edit;
using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
using osuTK;
namespace osu.Game.Screens.Edit.Compose.Components.Timeline
@ -62,6 +63,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
}
private WaveformGraph waveform;
private ControlPointPart controlPoints;
private TimelineTickDisplay ticks;
private TimelineTickDisplay ticks;