sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 08:20:00 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mask-separation' into editor-mask-placement

Browse Source 
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
#	osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
#	osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
This commit is contained in:
smoogipoo
2018-10-26 14:01:42 +09:00
parent 2f42112d87 ea3c960b5b
commit f674fcf2c8
65 changed files with 679 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
View File

@ -13,8 +13,8 @@ using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Osu;
using osu.Game.Rulesets.Osu.Edit;
using osu.Game.Rulesets.Osu.Edit.Masks.HitCircle;
using osu.Game.Rulesets.Osu.Edit.Masks.HitCircle.Components;
using osu.Game.Rulesets.Osu.Edit.Masks.HitCircleMasks;
using osu.Game.Rulesets.Osu.Edit.Masks.HitCircleMasks.Components;
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Screens.Edit.Screens.Compose;
using osu.Game.Screens.Edit.Screens.Compose.Layers;
@ -53,14 +53,12 @@ namespace osu.Game.Tests.Visual
new Slider
{
Position = new Vector2(128, 256),
ControlPoints = new List<Vector2>
ControlPoints = new[]
{
Vector2.Zero,
new Vector2(216, 0),
},
Distance = 216,
Velocity = 1,
TickDistance = 100,
Scale = 0.5f,
}
},