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

Merge branch 'master' into slider_ticks

Browse Source 
Conflicts:
	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
	osu.Game.Modes.Osu/Objects/Slider.cs
This commit is contained in:
Damnae
2017-02-15 10:48:29 +01:00
parent ace7a1d009 7fc035835b
commit e2fae24ad5
81 changed files with 1608 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
osu.Game.Modes.Osu/Objects/Slider.cs
View File

@ -1,11 +1,11 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Beatmaps;
using OpenTK;
using System.Collections.Generic;
using System;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Samples;
using System;
using System.Collections.Generic;
namespace osu.Game.Modes.Osu.Objects
{
@ -22,11 +22,28 @@ namespace osu.Game.Modes.Osu.Objects
set
{
stackHeight = value;
if (Curve != null)
Curve.Offset = StackOffset;
Curve.Offset = StackOffset;
}
}
public List<Vector2> ControlPoints
{
get { return Curve.ControlPoints; }
set { Curve.ControlPoints = value; }
}
public double Length
{
get { return Curve.Length; }
set { Curve.Length = value; }
}
public CurveTypes CurveType
{
get { return Curve.CurveType; }
set { Curve.CurveType = value; }
}
public double Velocity;
public double TickDistance;
@ -43,9 +60,9 @@ namespace osu.Game.Modes.Osu.Objects
TickDistance = (100 * baseDifficulty.SliderMultiplier) / baseDifficulty.SliderTickRate / (multipliedStartBeatLength / startBeatLength);
}
public int RepeatCount;
public int RepeatCount = 1;
public SliderCurve Curve;
internal readonly SliderCurve Curve = new SliderCurve();
public IEnumerable<SliderTick> Ticks
{