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
..
Beatmaps	Merge branch 'master' into add-flash-effects	2017-01-30 21:47:05 +09:00
Configuration	Simplify checking	2017-01-28 17:01:11 +03:00
Database	Add StarDifficulty property and correct colouring of difficulty icons.	2017-01-30 15:26:28 +09:00
Graphics	Merge branch 'master' into skip-button	2017-02-01 14:05:58 +09:00
Input
IPC
Modes	Merge branch 'master' into skip-button	2017-02-01 14:05:58 +09:00
Online	Add central color class	2017-01-09 17:20:31 -05:00
Overlays	Fixed quitting not working	2017-01-31 22:33:28 -04:00
Properties
Screens	Merge branch 'master' into skip-button	2017-02-01 14:05:58 +09:00
Users
osu.Game.csproj	Merge branch 'master' into skip-button	2017-02-01 14:05:58 +09:00
OsuGame.cs	Move window/volume configuration to framework level.	2017-01-25 18:44:51 +09:00
OsuGameBase.cs	Merge branch 'master' into login_fix	2017-01-28 11:24:08 +02:00
packages.config	Add missing licence headers.	2016-12-06 19:07:15 +09:00