1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 09:07:25 +08:00
osu-lazer/osu.Game/Screens
Dean Herbert df65443f07 Merge branch 'master'
Conflicts:
	osu-framework
	osu.Game/Screens/Play/Player.cs
2018-01-30 18:31:03 +09:00
..
Backgrounds remove unnecessary empty lines 2018-01-12 19:30:34 +01:00
Charts Update licence headers 2018-01-05 20:21:19 +09:00
Direct Update licence headers 2018-01-05 20:21:19 +09:00
Edit Update licence headers 2018-01-05 20:21:19 +09:00
Menu Apply conditionals directly rather than using an in-between property 2018-01-16 20:34:40 +09:00
Multiplayer remove unnecessary empty lines 2018-01-12 19:30:34 +01:00
Play Merge branch 'master' 2018-01-30 18:31:03 +09:00
Ranking Update licence headers 2018-01-05 20:21:19 +09:00
Select Merge branch 'master' into global-mod-binding 2018-01-29 15:18:11 +09:00
Tournament Add database-based configuration for rulesets 2018-01-24 17:45:28 +09:00
BackgroundScreen.cs Update licence headers 2018-01-05 20:21:19 +09:00
Loader.cs Update licence headers 2018-01-05 20:21:19 +09:00
OsuScreen.cs Fix cursor being displayed on intro/disclaimer 2018-01-12 19:34:55 +09:00
ScreenWhiteBox.cs Update licence headers 2018-01-05 20:21:19 +09:00