1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 21:27:24 +08:00
osu-lazer/osu.Game.Rulesets.Mania/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
ManiaEditPlayfield.cs Remove more unnecessary changes 2018-07-19 18:25:28 +09:00
ManiaEditRulesetContainer.cs Remove GetAspectAdjustedSize() and PlayfieldArea 2018-09-21 15:14:49 +09:00
ManiaHitObjectComposer.cs Correctly give note masks a scrolling info 2018-07-17 16:55:50 +09:00