1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 03:55:30 +08:00
osu-lazer/osu.Game/Modes/UI
smoogipooo 75ed7406e4 Merge remote-tracking branch 'origin/master' into refactor_hitrenderer
Conflicts:
	osu.Game.Modes.Catch/CatchRuleset.cs
	osu.Game.Modes.Mania/ManiaRuleset.cs
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game.Modes.Taiko/TaikoRuleset.cs
2017-03-11 14:22:59 +09:00
..
ComboCounter.cs Combo should not be longs. 2017-03-10 16:05:05 +09:00
ComboResultCounter.cs Fix most warnings. 2017-03-07 13:05:57 +09:00
HealthDisplay.cs More general refactorings. 2017-03-10 14:42:14 +09:00
HitRenderer.cs Make HitRenderer not have a publicly-settable Beatmap, replace AllObjectsJudged for performance. 2017-03-10 15:19:36 +09:00
HudOverlay.cs Make HudOverlay not dependent on Ruleset. 2017-03-10 16:16:07 +09:00
ModIcon.cs Merge branch 'master' into modselect 2017-03-09 12:51:40 +09:00
Playfield.cs Fix second mono regression. 2017-03-09 15:53:16 +09:00
StandardComboCounter.cs Combo should not be longs. 2017-03-10 16:05:05 +09:00
StandardHealthDisplay.cs More general refactorings. 2017-03-10 14:42:14 +09:00
StandardHudOverlay.cs Make HudOverlay not dependent on Ruleset. 2017-03-10 16:16:07 +09:00