Dean Herbert bdbe8501d3 Merge branch 'master' into add-flash-effects ... # Conflicts: # osu.Game/Overlays/Options/General/LoginOptions.cs		2017-01-30 21:47:05 +09:00
..
Options	Merge branch 'master' into add-flash-effects	2017-01-30 21:47:05 +09:00
Toolbar	Hook up icons better.	2017-01-30 13:35:40 +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
MusicController.cs	Move window/volume configuration to framework level.	2017-01-25 18:44:51 +09:00
OptionsOverlay.cs	Refactor OsuColour into injected instance class	2017-01-12 23:49:05 -05:00