RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
osu/osu.Game.Modes.Osu/Objects
History
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
HitCircle.cs Fix some license headers. 2017-03-02 18:45:20 +09:00
HitObjectType.cs Add license headers. 2017-03-14 13:02:42 +09:00
OsuHitObject.cs Fix defaults not being set (keep in mind this will be changed in a later pullrequest). 2017-03-14 19:04:40 +09:00
OsuHitObjectDifficulty.cs Fix most warnings. 2017-03-07 13:05:57 +09:00
Slider.cs Add further abstraction to Sliders/IHasCurve. 2017-03-15 12:52:25 +09:00
SliderTick.cs Fix some license headers. 2017-03-02 18:45:20 +09:00
Spinner.cs Rework beatmap post-processing into HitRenderer. 2017-03-14 17:01:21 +09:00