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

CI fixes.

Browse Source
This commit is contained in:
smoogipooo
2017-04-21 20:42:13 +09:00
parent 5cdbb226f8
commit d7477955ac
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
View File

@ -10,7 +10,6 @@ using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.UserInterface; using osu.Framework.Graphics.UserInterface;
using osu.Framework.Testing; using osu.Framework.Testing;
using osu.Framework.Timing; using osu.Framework.Timing;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Osu.Judgements; using osu.Game.Rulesets.Osu.Judgements;
using osu.Game.Rulesets.Osu.Objects; using osu.Game.Rulesets.Osu.Objects;

10
osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
View File

@ -30,11 +30,11 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
{ {
StartTime = original.StartTime, StartTime = original.StartTime,
Samples = original.Samples, Samples = original.Samples,
ControlPoints = curveData?.ControlPoints ?? null, ControlPoints = curveData.ControlPoints,
CurveType = curveData?.CurveType ?? CurveType.Catmull, CurveType = curveData.CurveType,
Distance = curveData?.Distance ?? 0, Distance = curveData.Distance,
RepeatSamples = curveData?.RepeatSamples ?? null, RepeatSamples = curveData.RepeatSamples,
RepeatCount = curveData?.RepeatCount ?? 1, RepeatCount = curveData.RepeatCount,
Position = positionData?.Position ?? Vector2.Zero, Position = positionData?.Position ?? Vector2.Zero,
NewCombo = comboData?.NewCombo ?? false NewCombo = comboData?.NewCombo ?? false
}; };

2
osu.Game/Rulesets/Objects/HitObject.cs
View File

@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Objects
/// <summary> /// <summary>
/// The samples to be played when this hit object is hit. /// The samples to be played when this hit object is hit.
/// <para> /// <para>
/// In the case of <see cref="CurvedHitObject"/> types, this is the sample of the curve body /// In the case of <see cref="IHasRepeats"/> types, this is the sample of the curve body
/// and can be treated as the default samples for the hit object. /// and can be treated as the default samples for the hit object.
/// </para> /// </para>
/// </summary> /// </summary>