1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 08:02:54 +08:00
osu-lazer/osu.Game/Modes/UI
smoogipooo 854212a7aa Merge branch 'master' into beatmap_parsing
Conflicts:
	osu.Desktop.VisualTests/app.config
	osu.Game.Modes.Catch/CatchRuleset.cs
	osu.Game.Modes.Mania/ManiaRuleset.cs
	osu.Game.Modes.Mania/app.config
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game.Modes.Osu/app.config
	osu.Game.Modes.Taiko/TaikoRuleset.cs
	osu.Game/Modes/Ruleset.cs
	osu.Game/app.config
	osu.Game/osu.Game.csproj
2017-03-14 13:39:19 +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 I don't like this renaming. 2017-03-14 12:54:09 +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 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 Add license headers. 2017-03-14 13:02:42 +09:00
StandardHudOverlay.cs Re-add files. 2017-03-11 14:27:18 +09:00