h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-03 10:12:54 +08:00
Code Issues Releases Wiki Activity
70f1d17b7e
osu-lazer/osu.Game.Rulesets.Osu/Edit
History
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
2018-10-16 17:28:16 +09:00
..
Masks Set hitobject placement time manually 2018-10-10 15:32:59 +09:00
HitCircleCompositionTool.cs Re-implement composition tools + implement placement masks 2018-10-03 16:27:26 +09:00
OsuEditRulesetContainer.cs Merge remote-tracking branch 'origin/master' into editor-mask-placement 2018-10-16 17:28:16 +09:00
OsuHitObjectComposer.cs Merge remote-tracking branch 'origin/master' into editor-mask-placement 2018-10-16 17:28:16 +09:00