16 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	29d223dc41	Update framework and simplify some references.	2016-10-12 19:52:49 +09:00
Dean Herbert	4052a665bf	Remove all non-load Game access.	2016-10-12 15:47:08 +09:00
Dean Herbert	79b62d4373	Merge remote-tracking branch 'refs/remotes/upstream/master' ... Conflicts: osu-framework osu.Desktop.VisualTests/Program.cs	2016-10-12 15:20:23 +09:00
Thomas Müller	9ed0748d73	No need to enforce scheduling of task anymore.	2016-10-09 15:40:32 +02:00
Dean Herbert	25de055802	Merge branch 'master' into stateful-drawables ... Conflicts: osu.Game/GameModes/Menu/Intro.cs	2016-10-09 22:08:32 +09:00
Dean Herbert	926c46dbd4	Code formatting and slight changes to transitions.	2016-10-08 23:27:53 +09:00
Thomas Müller	0c793dfe69	Use own Scheduler instead of Game.Scheduler.	2016-10-08 11:33:24 +02:00
Dean Herbert	93f326bb9b	Fix welcome sound being played twice.	2016-10-08 15:54:08 +09:00
Dean Herbert	243d2cdec5	Block window closing while intro is playing.	2016-10-08 15:54:07 +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	c5ac851ba9	Add the ability to exit the game using escape.	2016-10-08 15:54:05 +09:00
Dean Herbert	b2d899feb5	Add basic intro sequence.	2016-10-08 15:54:04 +09:00
Dean Herbert	d1dfa120d1	Move BackgroundModes to their own files.	2016-10-08 15:53:57 +09:00
Dean Herbert	d6042bd689	Add intro and begin to create central logic nest.	2016-10-08 15:53:56 +09:00