1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 11:22:57 +08:00
osu-lazer/osu.Game/Rulesets/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
..
Tools Remove more unnecessary changes 2018-07-19 18:25:28 +09:00
Types Remove more unnecessary changes 2018-07-19 18:25:28 +09:00
HitObjectComposer.cs Make Playfield not a ScalableContainer 2018-09-21 14:02:32 +09:00
HitObjectMask.cs Adapt signature change of event handlers 2018-10-02 12:02:55 +09:00
ToolboxGroup.cs Normalize all the line endings 2018-04-13 18:26:38 +09:00