1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 02:27:25 +08:00
osu-lazer/osu.Game/Modes/UI
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
..
ComboCounter.cs Combo should not be longs. 2017-03-10 16:05:05 +09:00
ComboResultCounter.cs More bindables! 2017-03-10 13:49:51 +09:00
HealthDisplay.cs More general refactorings. 2017-03-10 14:42:14 +09:00
HitRenderer.cs Merge remote-tracking branch 'origin/master' into generic_judgements_2 2017-03-15 21:36:43 +09:00
HudOverlay.cs Fix using. 2017-03-11 14:28:06 +09:00
ModIcon.cs Merge branch 'master' into modselect 2017-03-09 12:51:40 +09:00
Playfield.cs General refactoring (no more casts :D). 2017-03-15 19:18:23 +09:00
StandardComboCounter.cs Combo should not be longs. 2017-03-10 16:05:05 +09:00
StandardHealthDisplay.cs Add license headers. 2017-03-15 21:32:47 +09:00
StandardHudOverlay.cs Re-add files. 2017-03-11 14:27:18 +09:00