Dean Herbert 7ce5fc08ee Merge branch 'master' into skip-button ... # Conflicts: # osu.Game/Graphics/UserInterface/BackButton.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj		2017-02-01 14:05:58 +09:00
..
Objects	Fix TestCaseHitObjects not working at all due to state being set before load is complete.	2017-01-27 00:16:02 +09:00
UI	Make skip button work.	2017-01-27 21:57:22 +09:00
PlayMode.cs	Add missing licence headers.	2016-12-06 19:07:15 +09:00
Ruleset.cs	Hook up icons better.	2017-01-30 13:35:40 +09:00
Score.cs	Add basic HP display support.	2017-01-10 16:08:01 +08:00
ScoreProcesssor.cs	Make HasFailed's set private.	2017-01-27 00:41:34 +09:00