Dean Herbert 25de055802 Merge branch 'master' into stateful-drawables ...

Conflicts:
	osu.Game/GameModes/Menu/Intro.cs

2016-10-09 22:08:32 +09:00

..

Backgrounds

Move BackgroundModes to their own files.

2016-10-08 15:53:57 +09:00

Charts

Basic white-boxing of all game modes.

2016-09-29 23:51:17 +09:00

Direct

Basic white-boxing of all game modes.

2016-09-29 23:51:17 +09:00

Edit

Make sure intro can't be exited unless the main menu has displayed once.

2016-10-08 15:54:06 +09:00

Menu

Merge branch 'master' into stateful-drawables

2016-10-09 22:08:32 +09:00

Multiplayer

Make sure intro can't be exited unless the main menu has displayed once.

2016-10-08 15:54:06 +09:00

Play

Fix event not being unbound.

2016-10-08 19:12:31 +09:00

BackgroundMode.cs

BackgroundModes shouldn't handle the escape key themselves.

2016-10-08 15:54:07 +09:00

GameModeWhiteBox.cs

Make sure intro can't be exited unless the main menu has displayed once.

2016-10-08 15:54:06 +09:00

OsuGameMode.cs

Use AddInternal instead of AddTopLevel.

2016-10-09 20:06:23 +09:00