1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 00:33:21 +08:00
osu-lazer/osu.Game.Rulesets.Osu/Objects
smoogipoo 78596dfe80 Merge remote-tracking branch 'origin/master' into move-osu-settings
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
#	osu.Game.Rulesets.Osu.Tests/TestCaseSlider.cs
2019-03-05 13:25:03 +09:00
..
Drawables Merge remote-tracking branch 'origin/master' into move-osu-settings 2019-03-05 13:25:03 +09:00
HitCircle.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
ISliderProgress.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
OsuHitObject.cs Adjust namespaces 2019-02-21 19:05:52 +09:00
OsuHitWindows.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
RepeatPoint.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Slider.cs Fix remaining issues 2019-02-28 13:31:40 +09:00
SliderCircle.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
SliderTailCircle.cs Adjust namespaces 2019-02-21 19:05:52 +09:00
SliderTick.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Spinner.cs Update licence header (and remove year) 2019-01-24 17:43:03 +09:00