Dean Herbert 77558abf58 Merge branch 'master' into more-beatmap-info ... # Conflicts: # osu.Game/Screens/Select/BeatmapInfoWedge.cs		2017-01-29 14:47:42 +09:00
..
Backgrounds	Fix depth values.	2016-11-29 20:50:12 +01:00
Charts	Rename GameModes namespace to Screens.	2016-11-14 17:23:33 +09:00
Direct	Rename GameModes namespace to Screens.	2016-11-14 17:23:33 +09:00
Edit	Initial implementation of a beatmap carousell and various minor improvements to song select.	2016-11-20 20:34:16 +01:00
Menu	Move Intro logic to OnEntering in line with framework changes.	2017-01-20 16:30:24 +08:00
Multiplayer	Initial implementation of a beatmap carousell and various minor improvements to song select.	2016-11-20 20:34:16 +01:00
Play	Add fail dialog and flow.	2017-01-27 00:41:34 +09:00
Ranking	Add *very* basic ranking screen.	2016-11-29 23:59:56 +09:00
Select	Merge branch 'master' into more-beatmap-info	2017-01-29 14:47:42 +09:00
BackgroundMode.cs	Rename GameModes namespace to Screens.	2016-11-14 17:23:33 +09:00
GameModeWhiteBox.cs	Hardcoded button size, fixed input handling, fixed flash not being visible	2016-11-27 18:56:05 +03:00
OsuGameMode.cs	Add null check when popping backgrounds from the mode stack.	2017-01-27 00:41:34 +09:00