Dean Herbert 62c5ad907a Merge remote-tracking branch 'upstream/master' into login-updates ... # Conflicts: # osu.Game/Overlays/Options/General/LoginOptions.cs		2017-01-31 17:05:33 +09:00
..
Options	Merge remote-tracking branch 'upstream/master' into login-updates	2017-01-31 17:05:33 +09:00
Toolbar	Make LoginOverlay mask better.	2017-01-31 16:59:38 +09:00
ChatOverlay.cs	Refactor colors to palette based design	2017-01-12 16:38:27 -05:00
DragBar.cs	IsEnabled property for drag bar of music controller.	2016-12-01 08:20:24 +08:00
LoginOverlay.cs	Add proper masking support to the login overlay.	2017-01-31 16:42:46 +09:00
MusicController.cs	Move login screen to toolbar and update design (still not fully implemented).	2017-01-30 22:55:35 +09:00
OptionsOverlay.cs	Refactor OsuColour into injected instance class	2017-01-12 23:49:05 -05:00