Dean Herbert 471b9daa93

Merge branch 'master' into mod-overlay ...

# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/osu.Game.csproj

2017-03-02 20:27:04 +09:00

..

ComboCounter.cs

Update framework

2017-02-26 11:22:58 +09:00

ComboResultCounter.cs

Update framework

2017-02-26 11:22:58 +09:00

HealthDisplay.cs

Fix some license headers.

2017-03-02 18:45:20 +09:00

HitRenderer.cs

Add follow points.

2017-02-10 06:19:59 +01:00

ModIcon.cs

Added mod selection overlay

2017-02-16 16:05:03 -04:00

Playfield.cs

Add follow points.

2017-02-10 06:19:59 +01:00

ScoreOverlay.cs

Triggering fix

2017-03-01 13:36:53 +03:00