11 Commits

Author	SHA1	Message	Date
Dean Herbert	a0e1513df6	Merge branch 'refs/heads/master' into sidebar-toolbar-coexistence ... # Conflicts: # osu.Game/OsuGame.cs	2016-11-11 13:30:57 +09:00
Dean Herbert	fdb83bed79	Make OsuGameModes self-aware of if they want a toolbar or not.	2016-11-09 15:24:22 +09:00
Huo Yaoyuan	f2a8cc0c29	Merge branch 'master'	2016-11-03 20:38:34 +08:00
Huo Yaoyuan	6aba03e1ca	OsuGameMode<-WorkingBeatMap->OsuGameBase.	2016-10-28 21:03:59 +08:00
Dean Herbert	74f1a9622f	Add initial game-wide beatmap flow.	2016-10-28 19:55:48 +09:00
Thomas Müller	dd04b33232	Use AddInternal instead of AddTopLevel.	2016-10-09 20:06:23 +09:00
Dean Herbert	27a26cfaaf	Ensure the correct background state is restored when skipping multiple levels	2016-10-08 15:54:09 +09:00
Dean Herbert	08728b84d1	Make sure intro can't be exited unless the main menu has displayed once.	2016-10-08 15:54:06 +09:00
Dean Herbert	c5228b63cb	Unify and smiplify exit logic. Now only OsuGame calls the final Exit.	2016-10-08 15:54:05 +09:00
Dean Herbert	c0f25a2683	Improve white-boxed game modes.	2016-10-05 20:08:58 +09:00
Dean Herbert	03aea04a00	Add BackgroundMode stack.	2016-10-05 20:06:55 +09:00