smoogipoo 70f1d17b7e Merge remote-tracking branch 'origin/master' into editor-mask-placement ...

# Conflicts:
#	osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
#	osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
#	osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
#	osu.Game/Rulesets/UI/RulesetContainer.cs

70f1d17b7e · 2018-10-16 17:28:16 +09:00

History

..

CatcherArea.cs

Adjust catcher size to match stable

2018-09-21 15:53:15 +09:00

CatchPlayfield.cs

Merge remote-tracking branch 'origin/master' into playfield-scaling-rework

2018-10-05 10:40:16 +09:00

CatchRulesetContainer.cs

Merge remote-tracking branch 'origin/master' into editor-mask-placement

2018-10-16 17:28:16 +09:00

PlayfieldAdjustmentContainer.cs

PlayfieldLayer -> PlayfieldAdjustmentContainer

2018-10-05 10:39:18 +09:00