Dean Herbert 50c328f1b4 Merge remote-tracking branch 'upstream/master' into partial-judgements ... # Conflicts: # osu.Game/osu.Game.csproj		2017-03-31 16:46:40 +09:00
..
ComboCounter.cs	Update framework.	2017-03-31 12:58:54 +09:00
ComboResultCounter.cs	Update framework.	2017-03-31 12:58:54 +09:00
HealthDisplay.cs	More general refactorings.	2017-03-10 14:42:14 +09:00
HitRenderer.cs	Merge remote-tracking branch 'upstream/master' into partial-judgements	2017-03-31 16:46:40 +09:00
HudOverlay.cs	Move ScoreProcessor and Score to Scoring/.	2017-03-24 09:51:52 +09:00
ModIcon.cs	Enforce readonly private members where possible.	2017-03-23 13:50:08 +09:00
Playfield.cs	JudgementInfo -> Judgement.	2017-03-23 19:00:18 +09:00
StandardComboCounter.cs	Combo should not be longs.	2017-03-10 16:05:05 +09:00
StandardHealthDisplay.cs	Update references.	2017-03-28 21:26:20 +09:00
StandardHudOverlay.cs	Re-add files.	2017-03-11 14:27:18 +09:00