jorolf
|
2cffce805a
|
add flashlight mod
|
2018-11-07 00:48:54 +01:00 |
|
smoogipoo
|
a4caaf56ef
|
Merge remote-tracking branch 'origin/master' into fix-slider-samples
# Conflicts:
# osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
# osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
|
2018-11-05 16:38:28 +09:00 |
|
Dean Herbert
|
63cbc8e0e8
|
Merge branch 'master' into slider-placement
|
2018-11-02 19:45:34 +09:00 |
|
Dean Herbert
|
ad49dca86e
|
Merge branch 'master' into spinner-placement-2
|
2018-11-02 19:32:52 +09:00 |
|
Dean Herbert
|
e6ee3dc73e
|
Use framework helper functions for path approximation
|
2018-11-02 19:26:29 +09:00 |
|
Dean Herbert
|
7f1ee3bcb4
|
Disallow spinner movement for now
|
2018-11-02 12:06:53 +09:00 |
|
smoogipoo
|
2ac4f2b6af
|
Lock spinners to centre of screen
|
2018-11-01 19:24:58 +09:00 |
|
smoogipoo
|
d78348f178
|
Reduce duplicate code
|
2018-11-01 19:23:37 +09:00 |
|
smoogipoo
|
1aae123ff5
|
Make approximators share an interface
|
2018-11-01 19:16:44 +09:00 |
|
Dean Herbert
|
1265d5ac0b
|
Merge branch 'master' into spinner-placement-2
|
2018-11-01 18:05:44 +09:00 |
|
Dean Herbert
|
c1304eca1b
|
Merge remote-tracking branch 'upstream/master' into slider-placement
|
2018-11-01 17:59:37 +09:00 |
|
Dean Herbert
|
5fd21d35dc
|
Merge branch 'master' into spinner-selection
|
2018-11-01 17:47:59 +09:00 |
|
Dean Herbert
|
bb2f8deb18
|
ControlPoint -> PathControlPoint
Also Curve -> Path.
|
2018-11-01 03:56:51 +09:00 |
|
smoogipoo
|
ffec532079
|
Fix segment control points not changing in unison
|
2018-10-31 19:02:47 +09:00 |
|
smoogipoo
|
d2fbf05137
|
Reduce size of control point
|
2018-10-31 18:01:53 +09:00 |
|
smoogipoo
|
aec1d95f04
|
Implement spinner placement
|
2018-10-29 18:37:28 +09:00 |
|
smoogipoo
|
e04ad8357d
|
Make spinner piece respond to scale changes
|
2018-10-29 18:37:12 +09:00 |
|
smoogipoo
|
af1de01ed6
|
Add a spinner selection mask
|
2018-10-29 18:23:23 +09:00 |
|
smoogipoo
|
2ae7b42244
|
Fix control points disappearing if moved offscreen
|
2018-10-29 16:15:15 +09:00 |
|
smoogipoo
|
5998d6454b
|
Use ControlPointVisualiser instead of custom implementation
|
2018-10-29 15:56:17 +09:00 |
|
smoogipoo
|
08b16be3b8
|
Merge branch 'slider-controlpoint-masks' into slider-placement
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/Components/SliderBodyPiece.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
|
2018-10-29 15:55:38 +09:00 |
|
smoogipoo
|
c1fffde10d
|
Fix broken conditional
|
2018-10-29 15:52:28 +09:00 |
|
smoogipoo
|
acd703c27b
|
Make sliders respond to control point changes
|
2018-10-29 15:36:43 +09:00 |
|
smoogipoo
|
b0f5ace0e8
|
Implement slider control point visualisation
|
2018-10-29 15:29:34 +09:00 |
|
smoogipoo
|
660cd24750
|
Make sliders respond to scale changes
|
2018-10-29 15:26:28 +09:00 |
|
smoogipoo
|
a9f1484e8b
|
Fix some post-rebase issues
|
2018-10-29 15:26:28 +09:00 |
|
smoogipoo
|
4fa511043e
|
Use common body piece
|
2018-10-29 15:26:28 +09:00 |
|
smoogipoo
|
b28f44087d
|
Bring up to date with further placement changes
|
2018-10-29 15:26:28 +09:00 |
|
smoogipoo
|
6310c183fa
|
Modify slider position directly
|
2018-10-29 15:26:07 +09:00 |
|
smoogipoo
|
8fa783b4c5
|
Use begin/end placement methods
|
2018-10-29 15:26:07 +09:00 |
|
smoogipoo
|
a491fb42df
|
Set slider start time when head is placed
|
2018-10-29 15:26:07 +09:00 |
|
smoogipoo
|
9540e53e32
|
Initial controlpoint implementation
|
2018-10-29 15:26:07 +09:00 |
|
smoogipoo
|
2c4616dbb1
|
Adjust visual display of the placement curve
|
2018-10-29 15:26:07 +09:00 |
|
smoogipoo
|
402950b132
|
Implement path drawing
|
2018-10-29 15:26:07 +09:00 |
|
smoogipoo
|
bd915e8dca
|
Implement initial slider placement (linear)
|
2018-10-29 15:26:06 +09:00 |
|
smoogipoo
|
38ce8f8af1
|
Refactor SliderSelectionMask
|
2018-10-29 15:26:06 +09:00 |
|
smoogipoo
|
9b19050faf
|
Update with slider body changes
|
2018-10-29 15:25:20 +09:00 |
|
smoogipoo
|
619a0dfd59
|
Merge branch 'separate-slider-body' into editor-mask-placement
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs
|
2018-10-29 15:24:15 +09:00 |
|
smoogipoo
|
dd5a3ad59c
|
Fix SliderMask not working
|
2018-10-29 15:17:45 +09:00 |
|
smoogipoo
|
86e09a68f7
|
Separate slider body to bypass snaking logic
The snaking logic contains a lot of caching/optimisations and offsetting of the path which is tedious to re-compute when the path changes.
|
2018-10-29 15:15:29 +09:00 |
|
Dean Herbert
|
4f65d67e2b
|
Merge branch 'master' into skinnable-spritetext
|
2018-10-28 08:35:25 -07:00 |
|
smoogipoo
|
22c545ea8c
|
Make circle piece respond to hitobject scale
|
2018-10-26 15:26:19 +09:00 |
|
smoogipoo
|
4a507c66ee
|
Cleanup
|
2018-10-26 15:26:08 +09:00 |
|
smoogipoo
|
f674fcf2c8
|
Merge branch 'mask-separation' into editor-mask-placement
# Conflicts:
# osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
# osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
# osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
|
2018-10-26 14:05:30 +09:00 |
|
smoogipoo
|
ea3c960b5b
|
Mask -> Piece for components
|
2018-10-26 13:51:03 +09:00 |
|
smoogipoo
|
9656186b64
|
Make the hitobject masks move within their placement/selection
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/Components/HitCircleMask.cs
# osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/HitCircleSelectionMask.cs
# osu.Game.Rulesets.Osu/Edit/Masks/HitCirclePlacementMask.cs
# osu.Game/Rulesets/Edit/PlacementMask.cs
|
2018-10-26 13:45:31 +09:00 |
|
smoogipoo
|
4051864bb4
|
Re-namespace
|
2018-10-26 13:39:19 +09:00 |
|
smoogipoo
|
e1db2bbc25
|
Split visuals of HitCircleSelectionMask into HitCircleMask
|
2018-10-26 13:31:44 +09:00 |
|
smoogipoo
|
677d0d4a19
|
Renamespace ruleset masks
|
2018-10-26 13:31:38 +09:00 |
|
smoogipoo
|
8703db5cc1
|
Rename HitObjectMask -> SelectionMask
|
2018-10-26 13:31:23 +09:00 |
|