1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 13:27:23 +08:00
osu-lazer/osu.Game/Screens
Dean Herbert 16a01abc4d Merge remote-tracking branch 'upstream/master' into options-refactor
# Conflicts:
#	osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
#	osu.Game/Graphics/UserInterface/BackButton.cs
#	osu.Game/Screens/Play/KeyCounter.cs
2017-02-03 13:16:07 +09:00
..
Backgrounds Update null background handling 2017-01-30 09:44:02 -05: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 Merge remote-tracking branch 'upstream/master' into options-refactor 2017-02-03 13:16:07 +09:00
Multiplayer Initial implementation of a beatmap carousell and various minor improvements to song select. 2016-11-20 20:34:16 +01:00
Play Merge remote-tracking branch 'upstream/master' into options-refactor 2017-02-03 13:16:07 +09:00
Ranking Global shadows and more sane font size setting. 2017-01-31 18:53:52 +09:00
Select Merge remote-tracking branch 'upstream/master' into options-refactor 2017-02-03 13:16:07 +09:00
BackgroundMode.cs Rename GameModes namespace to Screens. 2016-11-14 17:23:33 +09:00
GameModeWhiteBox.cs Global shadows and more sane font size setting. 2017-01-31 18:53:52 +09:00
OsuGameMode.cs Add null check when popping backgrounds from the mode stack. 2017-01-27 00:41:34 +09:00