Dean Herbert
ffcad6e0f1
Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake
...
# Conflicts:
# osu.Game.Rulesets.Osu.Tests/TestCaseHitCircle.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
2018-08-24 15:26:36 +09:00
smoogipoo
34b1abeca3
Remove sliderball's input override
2018-08-21 12:24:48 +09:00
smoogipoo
eb6f1ae72c
Fix spinners providing one extra combo
2018-08-17 09:16:28 +09:00
smoogipoo
31f324945e
Implement combo offsets
2018-08-15 11:47:31 +09:00
smoogipoo
3a7488767c
Make HitObject not store the judgement
2018-08-06 11:50:18 +09:00
smoogipoo
741ec0021e
Rename more judgement-related methods to "result"
2018-08-06 11:31:46 +09:00
smoogipoo
ab642b563f
CreateJudgementResult -> CreateResult
2018-08-06 11:07:41 +09:00
smoogipoo
2a4994e5ce
Make hitobjects only have one judgement + result
2018-08-03 15:38:48 +09:00
smoogipoo
4548d2c87f
Make Rulesets.Osu use the new judgement result structure
2018-08-02 20:36:38 +09:00
smoogipoo
462f1033c0
Migrate Rulesets.Osu to the new judgement system
2018-08-02 15:21:23 +09:00
Dean Herbert
51506efd1a
Merge remote-tracking branch 'upstream/master' into peppy-fix-repeat-arrow-interpolation
2018-07-31 16:49:31 +09:00
Dean Herbert
ea6cab498e
Add comment
2018-07-31 16:47:13 +09:00
Dan Balasescu
04252293a7
Merge branch 'master' into fix-repeat-arrow-interpolation
2018-07-31 16:21:15 +09:00
Dean Herbert
874b5636e4
Merge remote-tracking branch 'upstream/master' into tgi74-more-skinning
2018-07-31 16:15:27 +09:00
Dean Herbert
976653fdf9
Minor formatting fixes
2018-07-31 16:13:52 +09:00
Dean Herbert
132241424d
Apply FollowPoint alpha to inner container (should not affect legacy skins)
2018-07-31 15:59:06 +09:00
Dan Balasescu
0a7a2c83a8
Merge branch 'master' into fix-follow-circle-size
2018-07-31 15:41:15 +09:00
Dean Herbert
a98bb057e2
Fix follow circle being scaled far larger than it should be
2018-07-31 15:27:21 +09:00
tgi74000
36afae5a24
Remove the inner followcircle fade, Fade the entire followcircle instead
2018-07-30 13:43:02 +02:00
Dean Herbert
21f3ff6e77
Fix slider repeat points appearing far too late
2018-07-30 18:51:25 +09:00
Dean Herbert
f4cda695e6
Improve rotation handling in edge cases
2018-07-30 18:50:59 +09:00
tgi74000
c6aabc6d2d
Move the FollowCircle border to its own container
2018-07-30 10:52:37 +02:00
Dean Herbert
a39188f762
Merge remote-tracking branch 'upstream/master' into peppy-fix-repeat-arrow-interpolation
2018-07-30 17:29:21 +09:00
tgi74000
84135c49ca
Fix small FollowPoint rotation bug
2018-07-29 23:21:05 +02:00
tgi74000
18096490b6
Add support for followpoint skinning
2018-07-29 23:20:37 +02:00
tgi74000
4322475ad2
Add support for sliderb skinning (single frame only)
2018-07-29 22:29:07 +02:00
tgi74000
257c035f30
Add support for sliderfollowcircle skinning
2018-07-29 21:28:13 +02:00
tgi74000
52d9461f03
Add support for reversearrow skinning
2018-07-29 20:51:06 +02:00
tgi74000
2a9818a128
Add support for sliderscorepoint skinning
2018-07-29 20:42:05 +02:00
smoogipoo
ff2a3a6e92
Fix hitobjects not properly expiring if scrolling in the editor
2018-07-26 20:07:16 +09:00
Dean Herbert
10656be954
Add interpolation to repeat point during sliding
2018-07-23 16:55:38 +02:00
Dean Herbert
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
Dean Herbert
79af5cb0a0
Limit shake duration to ensure it doesn't overlap miss window
2018-07-06 17:24:30 +09:00
Dean Herbert
e041352690
Add comment regarding add/clear/remove overrides
2018-07-06 13:19:43 +09:00
Dean Herbert
48d90a67ae
xmldoc and formatting
2018-07-06 12:13:23 +09:00
Dean Herbert
aa96d91762
Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake
2018-07-06 11:57:32 +09:00
Dean Herbert
d453414070
Forward shakes from slider head objects to sliders
2018-07-06 11:52:58 +09:00
tgi74000
558b2622a7
Move the Shake logic to a new ShakeContainer
2018-07-05 15:48:54 +02:00
Dean Herbert
1d6609d9f3
Add common custom words to dotsettings dictionary
...
Also fixes some typos and reduces spelling suggestions to hints.
2018-07-05 15:54:41 +09:00
smoogipoo
45a4187923
Tidy up lookups to NestedHitObjects
2018-07-02 16:10:56 +09:00
Dan Balasescu
f35ea18755
Merge branch 'master' into hit-shake
2018-06-29 17:38:02 +09:00
tgi74000
3d50050089
Move shake duration to a constant
2018-06-29 10:36:00 +02:00
Dan Balasescu
e3317b5145
Make method protected
2018-06-29 17:31:13 +09:00
Dean Herbert
098aeabc9e
Merge branch 'master' into catch-scoring
2018-06-29 17:16:14 +09:00
Dean Herbert
cacabeb67e
Remove unused field
2018-06-29 17:00:41 +09:00
Dean Herbert
9d4bc7b630
Fix combo index being wrong
2018-06-29 01:34:47 +09:00
Dean Herbert
0a945e4709
Check whether initialised first
2018-06-28 22:44:40 +09:00
tgi74000
59e03fa528
Move Shake to DrawableOsuHitObject, Clean up Shake()
2018-06-28 15:33:59 +02:00
tgi74000
61c416dc16
Trigger Shake if HitCircles are hit too early
2018-06-28 13:41:23 +02:00
Dean Herbert
e197ebe4c5
Fix slider heads displaying in incorrect colour
2018-06-28 01:55:09 +09:00
smoogipoo
0366b0f081
The tail circle will always be the last hitobject
2018-06-27 12:09:40 +09:00
smoogipoo
80501de4b9
Add legacy slider offsets
2018-06-27 12:09:21 +09:00
Dan Balasescu
0b1b3319aa
Merge branch 'master' into update-framework
2018-06-19 20:57:19 +09:00
Dean Herbert
3819ecb2be
Update framework
2018-06-19 20:19:52 +09:00
Tom Arrow
4aa89de2d7
Fix reverse arrow displayed with incorrect angle
2018-06-18 17:22:01 +02:00
smoogipoo
f67d263596
Move ruleset-specific hitwindows to post-converted hitobjects
2018-05-17 13:35:15 +09:00
smoogipoo
0dce7a5b61
Update framework + fix CI errors
2018-04-20 18:19:17 +09:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
smoogipoo
d9c5a0c6d1
Fix position editing not working
2018-03-29 22:38:44 +09:00
smoogipoo
6d4f94756e
Rewrite the way drag + click selections happen
...
The general idea here is that we need the masks to handle mouse down events, as they need to handle the drag (mousedown -> drag immediately).
I've rewritten the editor selections to use events, as there are some 3 different components that handle/trigger selections in different ways.
1. All selections/deselections now propagate through `HitObjectMask.Select()`/`HitObjectMask.Deselect()`.
2. Components that react to changes in the selection bind to the masks' `Selected`/`Deselected` events, and track them/change their states locally.
3. Masks provide a `SingleSelectionRequested` event which is invoked on the mouse-down event. Various components bind to this event to perform state changes locally in this scenario.
4. `DragBox` now handles all drag input locally. It triggers `Select`/`Deselect` on the masks it needs to.
5. `SelectionBox` handles the display of itself locally.
6. `SelectionBox` handles movement of groups of masks locally.
7. `HitObjectMasks` handles movement of itself locally.
2018-03-29 22:07:23 +09:00
Dean Herbert
af65f2dd48
Move AccentColour changes local to rulesets which rely on it
2018-03-22 18:53:16 +09:00
Dan Balasescu
ab9505652b
Merge branch 'master' into skin--completion
2018-03-22 16:44:00 +09:00
smoogipoo
4ccaf143b5
Give sliders a default accent colour
2018-03-22 15:50:19 +09:00
Dean Herbert
78a8f60b39
IHasComboIndex -> IHasComboInformation
2018-03-22 12:35:17 +09:00
Dean Herbert
fb3d319d0e
Make fallback bool into a function
...
Allows correct handling now that beatmap skins are also a thing.
2018-03-20 16:40:11 +09:00
Dean Herbert
cb3d0db555
Move combo colours completely out of HitObjects
2018-03-20 15:50:12 +09:00
Dean Herbert
a42035f494
Make DrawableHitObject a CompositeDrawable
...
No reason for it to be a container.
2018-03-15 13:41:06 +09:00
Dean Herbert
a0691168cb
Merge remote-tracking branch 'upstream/master' into editor-hitobject-movement
2018-03-14 15:35:24 +09:00
smoogipoo
212142429f
Derive from IHasPosition
2018-03-12 17:25:34 +09:00
Dean Herbert
eb643b690a
Merge branch 'master' into more-skinning
2018-03-12 11:55:50 +09:00
Dean Herbert
d27cf16bf9
Merge remote-tracking branch 'ppy/master' into more-skinning
2018-03-12 10:46:37 +09:00
Dan Balasescu
8ba87dfdbd
Merge branch 'master' into fix-duplicate-judgements
2018-03-12 10:29:50 +09:00
smoogipoo
92b302971f
Trim whitespace
2018-03-10 01:23:53 +09:00
smoogipoo
24501c37dd
Merge branch 'drawableslider-cleanup' into editor-hitobject-movement
2018-03-10 01:15:24 +09:00
smoogipoo
8ed5fce43a
Split out the slider head into a separate drawable hitobject
2018-03-10 01:13:59 +09:00
smoogipoo
376f6eec58
SetPosition -> OffsetPosition
2018-03-10 00:02:13 +09:00
smoogipoo
4a48136e4f
Make hitobject positions adjustable
2018-03-09 23:12:34 +09:00
Dean Herbert
b62ed004f2
Remove judgements when deciding a new judgement for a HitObject
...
Generally happens when rewinding.
2018-03-07 19:14:42 +09:00
Dean Herbert
f2d7621df3
Add skin support for explode/flash layers
...
Basically to hide them for legacy skins, though.
2018-03-07 18:21:05 +09:00
Dean Herbert
05eb678654
Add skin support for judgements
2018-03-07 18:21:05 +09:00
Dean Herbert
4dfd3a61cc
Remove alpha setting
2018-03-06 18:40:39 +09:00
Dean Herbert
7cf1d4450a
SliderTick transform improvements
2018-03-06 18:28:36 +09:00
Dean Herbert
ea6e3938c0
Fix hard crash due to spinner spin requirement being zero
...
Resolves #2133 .
2018-03-04 03:01:47 +09:00
Dean Herbert
0704d823a9
Fix slider selection point not being set to new origin
2018-03-01 22:03:00 +09:00
smoogipoo
d5d4bcb558
Merge branch 'master' into editor-hitobject-overlays
2018-03-01 14:04:38 +09:00
Dean Herbert
5b4fef0180
Add bare minimum sanity checking of beatmap input values to make broken maps load
...
Resolves ppy/osu#1988 .
2018-02-28 18:12:24 +09:00
Dean Herbert
bdd88303b3
Merge branch 'master' into editor-hitobject-overlays
2018-02-26 17:53:50 +09:00
Dean Herbert
1218a75b7f
Improve vector conditional
2018-02-26 16:11:26 +09:00
Dean Herbert
9cbed461c4
Merge branch 'master' into sliderbody-rework
2018-02-26 15:00:18 +09:00
Dean Herbert
f1ddfa0581
Fix sliders never getting a correct lifetime set
2018-02-25 16:25:56 +09:00
smoogipoo
50d1183ec2
Division-by-zero safety + reference our own size
2018-02-24 02:53:02 +09:00
smoogipoo
066abfbdbc
Rename PositionAt -> CurvePositionAt to represent its new meaning
2018-02-24 02:43:36 +09:00
smoogipoo
8c90abe0dc
Make slider control points relative to start position
2018-02-23 20:59:27 +09:00
smoogipoo
08bb25347c
Make DrawableSlider contain the slider body
2018-02-23 20:27:05 +09:00
Dean Herbert
84b707f4f8
Add basic hitcircle skinning
2018-02-23 13:38:12 +09:00
smoogipoo
604b0fa20a
Fix post-merge issues
2018-02-22 14:11:06 +09:00
smoogipoo
ded2644df8
Merge branch 'master' into editor-hitobject-overlays
2018-02-22 14:08:36 +09:00
Dean Herbert
3b4e4bd110
Merge remote-tracking branch 'upstream/master' into general-slider-improvements
2018-02-22 12:28:33 +09:00
smoogipoo
08e52e8c15
Remove unnecessary schedules
2018-02-21 18:02:52 +09:00
smoogipoo
9cd9c83f2c
Allow changing accentcolour/bordercolour post-load
2018-02-21 18:00:46 +09:00
