1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 01:32:55 +08:00
osu-lazer/osu.Game/Modes
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
..
Judgements Add license headers. 2017-03-15 21:32:47 +09:00
Mods Add license headers. 2017-03-15 21:32:47 +09:00
Objects Merge remote-tracking branch 'origin/master' into generic_judgements_2 2017-03-15 21:36:43 +09:00
UI Merge remote-tracking branch 'origin/master' into generic_judgements_2 2017-03-15 21:36:43 +09:00
LegacyReplay.cs Update framework. 2017-03-14 12:01:58 +09:00
PlayMode.cs Added Descriptions to Rulesets + PlayModes list 2017-03-09 21:37:03 +01:00
Replay.cs Replay loading via drag-drop huzzah! 2017-03-04 19:02:43 +09:00
Ruleset.cs Merge branch 'master' into beatmap_parsing 2017-03-14 13:39:19 +09:00
Score.cs Combo should not be longs. 2017-03-10 16:05:05 +09:00
ScoreProcesssor.cs General refactoring (no more casts :D). 2017-03-15 19:18:23 +09:00