Commit Graph

12 Commits

Author SHA1 Message Date
Dean Herbert aa96d98822 Merge branch 'master' into limit-game-access
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs
	osu.Game/GameModes/Menu/ButtonSystem.cs
	osu.Game/Online/Chat/Display/ChatLine.cs
	osu.Game/OsuGame.cs
	osu.Game/Overlays/ToolbarButton.cs
2016-10-12 20:44:33 +09:00
Dean Herbert 4052a665bf Remove all non-load Game access. 2016-10-12 15:47:08 +09:00
Dean Herbert 926c46dbd4 Code formatting and slight changes to transitions. 2016-10-08 23:27:53 +09:00
Dean Herbert 9594b7193c Standardise drawable state access and split large nested classes out of MainMenu.ButtonSystem 2016-10-08 23:27:46 +09:00
Dean Herbert adba72d293 Toolbar stores its current state locally (just for conformity). 2016-10-08 19:23:21 +09:00
Dean Herbert 556420ee58 Add proper toolbar state handling. 2016-10-08 15:54:09 +09:00
Dean Herbert 836083667f Clean up a bit. 2016-10-04 19:57:32 +09:00
Dean Herbert cc52580568 Implement mode selector highlight line. 2016-10-04 19:41:18 +09:00
Dean Herbert 11403a922a Make Home, Settings and PlayMode buttons work. 2016-10-04 17:15:03 +09:00
Dean Herbert ddcd5ec286 Add basic layout for toolbar. 2016-10-03 20:39:32 +09:00
Dean Herbert ac16bffe49 Bring framework and resources up-to-date. 2016-10-01 19:05:26 +09:00
Dean Herbert d93718d953 Add template toolbar. 2016-09-30 18:45:27 +09:00