Dean Herbert 16a01abc4d Merge remote-tracking branch 'upstream/master' into options-refactor ... # Conflicts: # osu.Game/Beatmaps/Drawables/BeatmapPanel.cs # osu.Game/Graphics/UserInterface/BackButton.cs # osu.Game/Screens/Play/KeyCounter.cs		2017-02-03 13:16:07 +09:00
..
BeatmapBackgroundSprite.cs	Fix some nullrefs when running visualtests with no maps loaded.	2017-01-27 00:16:02 +09:00
BeatmapGroup.cs	Fix laggy animations, incorrect hiding logic.	2017-02-02 19:24:14 +09:00
BeatmapPanel.cs	Merge remote-tracking branch 'upstream/master' into options-refactor	2017-02-03 13:16:07 +09:00
BeatmapSetHeader.cs	Merge remote-tracking branch 'upstream/master' into options-refactor	2017-02-03 13:16:07 +09:00
DifficultyIcon.cs	Add StarDifficulty property and correct colouring of difficulty icons.	2017-01-30 15:26:28 +09:00
Panel.cs	Fix laggy animations, incorrect hiding logic.	2017-02-02 19:24:14 +09:00