1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 13:27:23 +08:00
osu-lazer/osu.Game.Modes.Osu
Damnae e2fae24ad5 Merge branch 'master' into slider_ticks
Conflicts:
	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
	osu.Game.Modes.Osu/Objects/Slider.cs
2017-02-15 10:53:42 +01:00
..
Objects Merge branch 'master' into slider_ticks 2017-02-15 10:53:42 +01:00
Properties Update and standardise license headers. 2017-02-07 14:27:41 +09:00
UI Add spinners and improve TestCaseHitObjects. 2017-02-15 01:23:20 +09:00
app.config Add/update license headers. 2017-02-14 18:17:35 +09:00
OpenTK.dll.config Add/update license headers. 2017-02-14 18:17:35 +09:00
osu.Game.Modes.Osu.csproj Merge branch 'master' into slider_ticks 2017-02-15 10:53:42 +01:00
OsuRuleset.cs Add hit object stacking. 2017-02-09 07:28:40 +01:00
OsuScore.cs Update and standardise license headers. 2017-02-07 14:27:41 +09:00
OsuScoreProcessor.cs Update and standardise license headers. 2017-02-07 14:27:41 +09:00
packages.config Add/update license headers. 2017-02-14 18:17:35 +09:00