1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 02:33:20 +08:00
osu-lazer/osu.Game/Screens
Thomas Müller d46e68b36b Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor
# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
2017-03-01 18:05:58 +01:00
..
Backgrounds Removed unused variables and parameters 2017-02-27 17:32:32 +03:00
Charts GameMode -> Screen. 2017-02-17 19:23:58 +09:00
Direct GameMode -> Screen. 2017-02-17 19:23:58 +09:00
Edit GameMode -> Screen. 2017-02-17 19:23:58 +09:00
Menu Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor 2017-03-01 18:05:58 +01:00
Multiplayer GameMode -> Screen. 2017-02-17 19:23:58 +09:00
Play Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor 2017-03-01 18:05:58 +01:00
Ranking Update References to FlowStrategies 2017-02-27 16:55:55 +01:00
Select Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor 2017-03-01 18:05:58 +01:00
BackgroundScreen.cs Update framework 2017-02-26 11:22:58 +09:00
GameScreenWhiteBox.cs Update References to FlowStrategies 2017-02-27 16:55:55 +01:00
Loader.cs Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01:00
OsuGameScreen.cs Fix test case regression. 2017-02-27 18:09:27 +09:00