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 |
|
smoogipoo
|
e14719e440
|
Mask -> Piece for non-mask components
|
2018-10-25 18:28:10 +09:00 |
|
smoogipoo
|
d19f80835b
|
Adjust namespaces
|
2018-10-25 18:26:28 +09:00 |
|
smoogipoo
|
ea6db8b793
|
Make the hitobject masks move within their placement/selection
|
2018-10-25 18:16:25 +09:00 |
|
Dean Herbert
|
a9e5a4351e
|
Merge branch 'master' into fix-diffcalc-slider-distance
|
2018-10-21 20:33:50 +09:00 |
|
Dean Herbert
|
f19cc98e6a
|
Add slightly more explanation
|
2018-10-20 23:10:33 +09:00 |
|
Dean Herbert
|
0952c20c84
|
Adjust comment slightly
|
2018-10-20 23:06:48 +09:00 |
|
Dan Balasescu
|
d284f29637
|
Add comment describing the speed multiplier
|
2018-10-18 14:16:46 +09:00 |
|
Dean Herbert
|
cd718812b2
|
Merge branch 'master' into tighten-diffcalc-tolerances
|
2018-10-18 14:01:47 +09:00 |
|
smoogipoo
|
1cf6cd10bb
|
Fix slider travel distances sometimes not being considered
|
2018-10-18 11:29:50 +09:00 |
|
smoogipoo
|
f42f9cffe3
|
Make HitCirclePlacementMask directly modify hitcircle position
|
2018-10-17 18:16:34 +09:00 |
|
smoogipoo
|
d36ac59ca2
|
Reduce complexity of creating edit ruleset containers
|
2018-10-17 18:06:00 +09:00 |
|
smoogipoo
|
08e3fe1def
|
Add PlacementStarted event, rename placement methods
|
2018-10-17 14:37:45 +09:00 |
|
smoogipoo
|
e8ce5a7e6c
|
Fix crashes when manually creating sliders
|
2018-10-16 18:27:09 +09:00 |
|
smoogipoo
|
f384c7228e
|
Fix post-merge issues
|
2018-10-16 17:28:23 +09:00 |
|
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 |
|
smoogipoo
|
47be95ce0b
|
Fix slider nodes using the wrong samples
|
2018-10-16 17:10:24 +09:00 |
|
smoogipoo
|
5095fbcdf7
|
Merge remote-tracking branch 'origin/master' into optimise-diffcalc
|
2018-10-16 10:27:18 +09:00 |
|
smoogipoo
|
657bd5e371
|
Add some xmldocs
|
2018-10-15 12:32:59 +09:00 |
|
smoogipoo
|
2f943e77aa
|
Make Velocity and TickDistance private set
|
2018-10-15 12:31:52 +09:00 |
|
smoogipoo
|
26b91c96fb
|
Fix wrong number of ticks on some legacy beatmaps
|
2018-10-15 12:27:58 +09:00 |
|
Dean Herbert
|
468f7fd1ea
|
Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework
|
2018-10-12 19:25:08 +09:00 |
|
Dean Herbert
|
8e66f9a85d
|
Merge branch 'master' into tighten-diffcalc-tolerances
|
2018-10-12 17:35:33 +09:00 |
|
smoogipoo
|
f585684038
|
Merge branch 'tighten-diffcalc-tolerances' into optimise-diffcalc
|
2018-10-12 16:51:37 +09:00 |
|
smoogipoo
|
72c8ae8705
|
Port the old stacking algorithm
|
2018-10-12 16:47:27 +09:00 |
|
Dean Herbert
|
d6043a6cd3
|
Merge remote-tracking branch 'upstream/master' into smooth-path
|
2018-10-12 16:03:36 +09:00 |
|
smoogipoo
|
e130204a3b
|
Merge remote-tracking branch 'origin/master' into optimise-diffcalc
|
2018-10-12 12:26:15 +09:00 |
|
smoogipoo
|
ec9f23ab73
|
Make IBeatmap.HitObjects an IReadOnlyList
|
2018-10-11 19:53:07 +09:00 |
|
smoogipoo
|
83fd251c7b
|
Pass sub-controlpoints as span slices
|
2018-10-11 17:44:25 +09:00 |
|
smoogipoo
|
7d20efed2c
|
Fix missing stack position
|
2018-10-11 13:53:29 +09:00 |
|
smoogipoo
|
f675c93935
|
Stably-sort hitobjects
|
2018-10-10 23:11:28 +09:00 |
|
Dean Herbert
|
aac95523ec
|
Merge branch 'master' into skinnable-spritetext
|
2018-10-10 20:26:27 +09:00 |
|
Dean Herbert
|
1b6f37f3eb
|
Merge branch 'master' into wiggle-repeat-points
|
2018-10-10 19:42:10 +09:00 |
|
Dean Herbert
|
841b2e8692
|
Merge branch 'master' into consistent-terminology-format
|
2018-10-10 19:19:36 +09:00 |
|
smoogipoo
|
4e37b5c4a7
|
50ms cap shouldn't be included in the strain decay
|
2018-10-10 18:53:54 +09:00 |
|
smoogipoo
|
d8f77feddd
|
Fix using the wrong slider's travel distance
|
2018-10-10 18:52:57 +09:00 |
|
smoogipoo
|
03a9511399
|
Apparently stable does use stacking
|
2018-10-10 18:08:46 +09:00 |
|
smoogipoo
|
b56d09c83b
|
Set hitobject placement time manually
|
2018-10-10 15:32:59 +09:00 |
|
smoogipoo
|
d6784c818e
|
Fix jump/travel distances in some scenarios
|
2018-10-10 11:49:54 +09:00 |
|
Dan Balasescu
|
a2838d32bf
|
Merge branch 'master' into skinnable-spritetext
|
2018-10-09 16:23:43 +09:00 |
|
smoogipoo
|
0a3be0d253
|
Adjust comments slightly
|
2018-10-09 12:03:47 +09:00 |
|
smoogipoo
|
9facf707be
|
Add diffcalc beatmap decoder
|
2018-10-09 11:49:24 +09:00 |
|
Fayne Aldan
|
edf87bfdd8
|
Merge branch 'master' into wiggle-repeat-points
|
2018-10-08 15:23:45 -06:00 |
|
smoogipoo
|
f8eaccddda
|
Stable doesn't use stacked positions
|
2018-10-08 18:37:49 +09:00 |
|
smoogipoo
|
0116db95d0
|
Fix progress calculation
|
2018-10-08 18:37:30 +09:00 |
|
smoogipoo
|
35f45e74dc
|
Calculate scaled positions prior to square-rooting
|
2018-10-08 17:39:10 +09:00 |
|
smoogipoo
|
1ad5090ad6
|
Separate travel distance from jump distance
|
2018-10-08 17:38:12 +09:00 |
|
smoogipoo
|
61e7ada977
|
Use ints + fix position calculation
|
2018-10-08 17:36:06 +09:00 |
|
smoogipoo
|
da97600076
|
Fix inaccurate section lengths for first hitobject
|
2018-10-08 16:46:58 +09:00 |
|
smoogipoo
|
42664f1c19
|
Make SliderBody use the new SmoothPath
|
2018-10-05 15:45:45 +09:00 |
|
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 |
|
smoogipoo
|
d0007c047a
|
PlayfieldLayer -> PlayfieldAdjustmentContainer
|
2018-10-05 10:39:18 +09:00 |
|
smoogipoo
|
e931aa3d9e
|
Move positional modifications to HitCirclePlacementMask
|
2018-10-04 13:43:50 +09:00 |
|
smoogipoo
|
6a65802528
|
Fix hitcircle selections not responding to stacking changes
|
2018-10-04 12:19:11 +09:00 |
|
smoogipoo
|
1cd11a6e5b
|
Fix StackHeight changes not causing position updates
|
2018-10-03 17:06:18 +09:00 |
|
smoogipoo
|
3420e0c7eb
|
Re-implement composition tools + implement placement masks
|
2018-10-03 16:27:26 +09:00 |
|
smoogipoo
|
540a010fbb
|
Implement an intermediary EditRulesetContainer
|
2018-10-03 15:36:24 +09:00 |
|
smoogipoo
|
28b0ab6123
|
Split visuals of HitCircleSelectionMask into HitCircleMask
|
2018-10-03 14:35:26 +09:00 |
|
smoogipoo
|
1164108a95
|
Renamespace ruleset masks
|
2018-10-03 13:45:41 +09:00 |
|
smoogipoo
|
4cdb6dcea5
|
Rename HitObjectMask -> SelectionMask
|
2018-10-03 13:28:00 +09:00 |
|
ekrctb
|
68980fc477
|
Adjust usage of Handle(Non)PositionalInput to follow framework update
|
2018-10-02 14:45:33 +09:00 |
|
ekrctb
|
50091252e2
|
Adapt signature change of event handlers
|
2018-10-02 12:02:55 +09:00 |
|
ekrctb
|
99fc04c8af
|
Change signature to new event handler
|
2018-10-02 12:02:47 +09:00 |
|
smoogipoo
|
0d8276c5f8
|
Implement skinnable sprite text
|
2018-09-27 17:40:28 +09:00 |
|
Dean Herbert
|
2ed7785cfc
|
Merge remote-tracking branch 'upstream/master' into update-framework
|
2018-09-26 19:50:48 +09:00 |
|
smoogipoo
|
a8f156584b
|
Update framework with positional/non-positional changes
|
2018-09-26 14:01:15 +09:00 |
|
Kyle Chang
|
2069467434
|
Use HitObject scale to determine judgement size
|
2018-09-24 21:18:55 -04:00 |
|
Kyle Chang
|
7a43677849
|
Make judgements scale with cs
|
2018-09-22 22:54:38 -04:00 |
|
smoogipoo
|
0bc2bcaf14
|
Remove GetAspectAdjustedSize() and PlayfieldArea
|
2018-09-21 15:14:49 +09:00 |
|
smoogipoo
|
26094ea325
|
Simplify + rename playfield layers in Osu/Catch
|
2018-09-21 15:01:58 +09:00 |
|
smoogipoo
|
a166d03ede
|
Remove duplicate implementation of the Osu playfield layer
|
2018-09-21 14:43:38 +09:00 |
|
smoogipoo
|
368ceec47c
|
Simplify creation of a playfield
|
2018-09-21 14:35:50 +09:00 |
|