1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 16:12:57 +08:00
osu-lazer/osu.Game.Rulesets.Osu/Edit
smoogipoo ff559a3a1b Merge remote-tracking branch 'origin/master' into playfield-scaling-rework
# Conflicts:
#	osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
#	osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-10-05 10:40:16 +09:00
..
Layers/Selection/Overlays Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
OsuEditRulesetContainer.cs Remove GetAspectAdjustedSize() and PlayfieldArea 2018-09-21 15:14:49 +09:00
OsuHitObjectComposer.cs PlayfieldLayer -> PlayfieldAdjustmentContainer 2018-10-05 10:39:18 +09:00