1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 20:47:25 +08:00
osu-lazer/osu.Game/Screens
Dean Herbert abdfe42388 Merge branch 'refs/heads/master' into better-anchors
# Conflicts:
#	osu.Game.Mode.Osu/UI/OsuComboCounter.cs
#	osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs
2016-11-15 14:33:13 +09:00
..
Backgrounds Rename GameModes namespace to Screens. 2016-11-14 17:23:33 +09: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 Rename GameModes namespace to Screens. 2016-11-14 17:23:33 +09:00
Menu Merge branch 'refs/heads/master' into better-anchors 2016-11-15 14:33:13 +09:00
Multiplayer Rename GameModes namespace to Screens. 2016-11-14 17:23:33 +09:00
Play Move DrawableHitObject. 2016-11-14 19:49:29 +09:00
Ranking Rename GameModes namespace to Screens. 2016-11-14 17:23:33 +09:00
BackgroundMode.cs Rename GameModes namespace to Screens. 2016-11-14 17:23:33 +09:00
GameModeWhiteBox.cs Rename GameModes namespace to Screens. 2016-11-14 17:23:33 +09:00
OsuGameMode.cs Rename GameModes namespace to Screens. 2016-11-14 17:23:33 +09:00