1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 00:27:25 +08:00
osu-lazer/osu.Game/Modes/Objects
smoogipooo 42da0f1a72 Merge remote-tracking branch 'origin/master' into generic_judgements_2
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
	osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
	osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
	osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
	osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
	osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
	osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
	osu.Game/Modes/UI/HitRenderer.cs
	osu.Game/osu.Game.csproj
2017-03-15 21:36:43 +09:00
..
Drawables Merge remote-tracking branch 'origin/master' into generic_judgements_2 2017-03-15 21:36:43 +09:00
Legacy HasSpecial -> HasHold. 2017-03-15 19:43:38 +09:00
Types HasSpecial -> HasHold. 2017-03-15 19:43:38 +09:00
BezierApproximator.cs Add further abstraction to Sliders/IHasCurve. 2017-03-15 12:52:25 +09:00
CircularArcApproximator.cs Add further abstraction to Sliders/IHasCurve. 2017-03-15 12:52:25 +09:00
CurvedHitObject.cs Refactorings. 2017-03-15 12:57:17 +09:00
HitObject.cs Null-safety in the case where there are no HitObjects. 2017-03-14 19:44:14 +09:00
HitObjectParser.cs Fix some license headers. 2017-03-02 18:45:20 +09:00
LegacyHitObjectParser.cs HitObjectType -> LegacyHitObjectType, move to Legacy namespace. 2017-03-15 19:39:40 +09:00
SliderCurve.cs Add further abstraction to Sliders/IHasCurve. 2017-03-15 12:52:25 +09:00