1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 10:47:24 +08:00
osu-lazer/osu.Game/Screens
Dean Herbert 471b9daa93
Merge branch 'master' into mod-overlay
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/osu.Game.csproj
2017-03-02 20:27:04 +09: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 FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00
Multiplayer GameMode -> Screen. 2017-02-17 19:23:58 +09:00
Play Merge branch 'master' into mod-overlay 2017-03-02 20:27:04 +09:00
Ranking FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00
Select Merge branch 'master' into mod-overlay 2017-03-02 20:27:04 +09:00
BackgroundScreen.cs Update framework 2017-02-26 11:22:58 +09:00
GameScreenWhiteBox.cs FlowDirection -> FillDirection 2017-03-01 20:15:38 +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