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

Merge branch 'master' into beatmap-serialization

Browse Source
This commit is contained in:
smoogipoo
2017-12-21 13:39:39 +09:00
parent bdf283a4e1 2f02e062fd
commit c99ea32574
128 changed files with 7392 additions and 2712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Beatmaps/Beatmap.cs
View File

@ -8,7 +8,6 @@ using System.Collections.Generic;
using System.Linq;
using osu.Game.Beatmaps.ControlPoints;
using osu.Game.IO.Serialization;
using osu.Game.Storyboards;
using Newtonsoft.Json;
using osu.Game.IO.Serialization.Converters;
@ -46,11 +45,6 @@ namespace osu.Game.Beatmaps
[JsonIgnore]
public double TotalBreakTime => Breaks.Sum(b => b.Duration);
/// <summary>
/// The Beatmap's Storyboard.
/// </summary>
public Storyboard Storyboard = new Storyboard();
/// <summary>
/// Constructs a new beatmap.
/// </summary>
@ -62,7 +56,6 @@ namespace osu.Game.Beatmaps
Breaks = original?.Breaks ?? Breaks;
ComboColors = original?.ComboColors ?? ComboColors;
HitObjects = original?.HitObjects ?? HitObjects;
Storyboard = original?.Storyboard ?? Storyboard;
if (original == null && Metadata == null)
{