Dean Herbert 12d2102a88 Merge remote-tracking branch 'upstream/master' into song-progress-graph ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Modes/UI/HudOverlay.cs # osu.Game/Screens/Play/PauseOverlay.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj		2017-04-07 09:22:18 +09:00
..
ComboCounter.cs	Update bindables.	2017-04-04 11:34:13 +09:00
ComboResultCounter.cs	Update framework.	2017-03-31 12:58:54 +09:00
HealthDisplay.cs	Update bindables.	2017-04-04 11:34:13 +09:00
HitRenderer.cs	Allow playfield to specify whether it has a cursor or not.	2017-04-05 17:38:57 +09:00
HudOverlay.cs	Merge remote-tracking branch 'upstream/master' into song-progress-graph	2017-04-07 09:22:18 +09:00
ModIcon.cs	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
Playfield.cs	Allow playfield to specify whether it has a cursor or not.	2017-04-05 17:38:57 +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	Formatting	2017-03-23 07:24:43 -03:00