1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-09 09:37:42 +08:00
Commit Graph

5 Commits

Author SHA1 Message Date
smoogipoo
b7721edc80 Remove more unnecessary changes 2018-07-19 18:25:28 +09:00
smoogipoo
6437fdd9db Merge remote-tracking branch 'origin/master' into mania-mask-container
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-07-17 16:46:48 +09:00
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
AlFasGD
a178c44b60 Remove snap line dependencies 2018-05-22 09:12:51 +03:00
AlFasGD
bbe7765a95 Add files to not require dependencies from #2534 2018-05-22 09:03:47 +03:00