smoogipoo 577ff4cc7f Merge remote-tracking branch 'origin/master' into mania-mask-container ...

# Conflicts:
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
#	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
#	osu.Game.Rulesets.Mania/UI/ManiaStage.cs

2018-07-17 13:13:57 +09:00

..

Backgrounds

Normalize all the line endings

2018-04-13 18:26:38 +09:00

Charts

Normalize all the line endings

2018-04-13 18:26:38 +09:00

Direct

Normalize all the line endings

2018-04-13 18:26:38 +09:00

Edit

Merge remote-tracking branch 'origin/master' into mania-mask-container

2018-07-17 13:13:57 +09:00

Menu

Merge branch 'master' into update-disclaimer

2018-07-12 23:41:55 +09:00

Multi

Tidy up ReadyButton

2018-06-21 10:21:54 +09:00

Play

Update hide logic

2018-07-17 00:06:51 +09:00

Ranking

Merge branch 'master' into disallow-beatmap-change

2018-06-04 10:53:04 +09:00

Select

Fix regression in drawable rank first display

2018-07-13 19:53:29 +09:00

Tournament

Update framework

2018-07-11 17:12:01 +09:00

BackgroundScreen.cs

Change logic

2018-06-29 20:16:24 +09:00

Loader.cs

Tidy up Loader logic

2018-05-31 20:07:44 +09:00

OsuScreen.cs

Add "Select" action

2018-07-03 18:39:15 +09:00

ScreenWhiteBox.cs

Normalize all the line endings

2018-04-13 18:26:38 +09:00