1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 02:27:25 +08:00
osu-lazer/osu.Game/Screens
smoogipooo 27132958c8 Merge remote-tracking branch 'origin/master' into taiko-drawable-generation
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs
	osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
	osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-04-03 14:19:31 +09:00
..
Backgrounds Update async load usage to new style. 2017-04-02 15:56:12 +09:00
Charts Fix most warnings. 2017-03-07 13:05:57 +09:00
Direct Fix most warnings. 2017-03-07 13:05:57 +09:00
Edit Fix CI issues. 2017-03-14 22:27:24 +08:00
Menu Update async load usage to new style. 2017-04-02 15:56:12 +09:00
Multiplayer Fix most warnings. 2017-03-07 13:05:57 +09:00
Play Merge remote-tracking branch 'origin/master' into taiko-drawable-generation 2017-04-03 14:19:31 +09:00
Ranking Update references. 2017-03-28 21:26:20 +09:00
Select Container->Wrapper. 2017-04-02 16:17:13 +09:00
Tournament Fix custom transform. 2017-03-30 22:28:51 +09:00
BackgroundScreen.cs Remove unnecessary using. 2017-04-02 17:11:31 +09:00
GameScreenWhiteBox.cs Update references. 2017-03-28 21:26:20 +09:00
Loader.cs Update async load usage to new style. 2017-04-02 15:56:12 +09:00
OsuGameScreen.cs Merge branch 'master' into leaderboards 2017-03-17 18:23:01 -03:00