1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 11:22:55 +08:00
osu-lazer/osu.Game/Screens
smoogipooo 854212a7aa Merge branch 'master' into beatmap_parsing
Conflicts:
	osu.Desktop.VisualTests/app.config
	osu.Game.Modes.Catch/CatchRuleset.cs
	osu.Game.Modes.Mania/ManiaRuleset.cs
	osu.Game.Modes.Mania/app.config
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game.Modes.Osu/app.config
	osu.Game.Modes.Taiko/TaikoRuleset.cs
	osu.Game/Modes/Ruleset.cs
	osu.Game/app.config
	osu.Game/osu.Game.csproj
2017-03-14 13:39:19 +09:00
..
Backgrounds Reduce error count. 2017-03-09 14:24:16 +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 most warnings. 2017-03-07 13:05:57 +09:00
Menu Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09:00
Multiplayer Fix most warnings. 2017-03-07 13:05:57 +09:00
Play Merge branch 'master' into mod_application 2017-03-14 12:38:55 +09:00
Ranking Fix most warnings. 2017-03-07 13:05:57 +09:00
Select Merge branch 'master' into beatmap_parsing 2017-03-14 13:39:19 +09:00
Tournament Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09:00
BackgroundScreen.cs Fix most warnings. 2017-03-07 13:05:57 +09:00
GameScreenWhiteBox.cs Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09:00
Loader.cs Fix most warnings. 2017-03-07 13:05:57 +09:00
OsuGameScreen.cs Fix test case regression. 2017-02-27 18:09:27 +09:00