Dan Balasescu
9b526ef61e
Merge branch 'master' into move-state-logic
2019-07-23 20:37:57 +09:00
Dean Herbert
91e21688d8
Make AccentColour a bindable ( #5420 )
...
Make AccentColour a bindable
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-07-23 20:37:47 +09:00
smoogipoo
b1a9ce85e7
Fix ticks being given an extra colour
2019-07-23 20:30:47 +09:00
Dean Herbert
c3b81bef4a
Flip default to the preferred method going forward
2019-07-22 15:55:38 +09:00
Dean Herbert
be170b4124
Naming and documentation improvements
2019-07-22 15:50:02 +09:00
Dean Herbert
6d889c8a37
Revert unintended change
2019-07-22 15:43:27 +09:00
Dean Herbert
91f86adb66
Move DrawableHitObject state management to base class
2019-07-22 15:07:12 +09:00
Dean Herbert
8327452fe1
Make AccentColour a bindable
2019-07-22 14:48:59 +09:00
Dean Herbert
74c961bcff
Add more flexible skin element confine modes
2019-07-22 14:42:56 +09:00
Dean Herbert
e50b70d615
Centralise osu! circle radius specification
2019-07-22 14:40:02 +09:00
smoogipoo
a9286fee07
Recycle slider paths when the parenting slider dies
2019-07-17 16:20:27 +09:00
smoogipoo
ed203cb0ff
Delay intial hitobject updates
2019-07-16 13:45:59 +09:00
Salman Ahmed
d11b799571
Add explaining comment
2019-06-30 18:28:20 +03:00
Salman Ahmed
f42ded3437
Move to DrawableOsuHitObject
2019-06-30 18:27:47 +03:00
Dean Herbert
60ea3d4e1a
Fix skinning support for combobreak
2019-06-30 21:58:30 +09:00
Dean Herbert
aca9289d89
Use SkinnableSprite for approach circle
2019-06-24 15:17:56 +09:00
smoogipoo
ae438213a5
Remove secondary buffered container from slider body
2019-06-06 16:32:43 +09:00
Dean Herbert
daa2786dbd
Use a constant for the default value
2019-05-12 23:08:42 +09:00
Dean Herbert
487a56549e
Fix CI issues
2019-05-12 22:53:12 +09:00
Dean Herbert
ce0e4c506e
Merge branch 'master' into dev
2019-05-12 21:45:52 +09:00
Dean Herbert
b8446fb67f
Fix fallbacks for SliderTrackOverride and SliderBall too
2019-05-12 18:51:31 +09:00
Dean Herbert
cbf126db25
Merge branch 'master' into fix-slider-border-color
2019-05-12 17:25:49 +09:00
smoogipoo
117f8bdd01
Merge remote-tracking branch 'Joehuu/master' into flashlight-dim
2019-05-08 13:25:01 +09:00
smoogipoo
d7c09e7dbd
Merge remote-tracking branch 'origin/master' into fix-new-inspections
...
# Conflicts:
# osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
# osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
# osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
# osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
# osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Graphics/OsuFont.cs
# osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
# osu.Game/Overlays/Profile/Header/BadgeContainer.cs
# osu.Game/Overlays/Profile/ProfileHeader.cs
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
David Zhao
732b0b22a3
Merge remote-tracking branch 'upstream/master' into flashlight-dim
2019-05-07 12:04:58 +09:00
Joehu
8ef6a745f7
Fix slider border not reverting to default color
2019-05-05 22:43:03 -07:00
David Zhao
664a4ba540
Implement flashlight dimming on slider slide
2019-04-12 10:47:22 +09:00
smoogipoo
772bef91fa
Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
...
# Conflicts:
# osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
2019-04-08 23:01:12 +09:00
Dean Herbert
f1952c0816
Update font awesome usage
2019-04-02 19:55:24 +09:00
smoogipoo
a56e29347f
Adjust namespaces
2019-04-02 14:51:28 +09:00
Dean Herbert
c39c37a18d
Apply more missed cases
2019-04-01 12:44:46 +09:00
Dean Herbert
612db31c38
Apply newline additions
2019-04-01 12:16:32 +09:00
Dean Herbert
176b4ecc38
Merge branch 'master' into sprite-icon-compatibility
2019-03-28 23:47:44 +09:00
Dean Herbert
8f5e769425
Fix slider ball not always receiving position in time
2019-03-28 12:42:28 +09:00
Dean Herbert
de80fc0eac
Update icon usage to match framework changes
2019-03-27 19:29:27 +09:00
Santeri Nogelainen
b624ecabde
Max = 8
2019-03-16 12:47:37 +02:00
Santeri Nogelainen
cbb7498a42
Border size to float, add min and max size, other small changes
2019-03-16 12:41:03 +02:00
Santeri Nogelainen
92595e43f6
slider border thickness
2019-03-14 21:57:39 +02:00
Jamie Taylor
5cc670cd19
Prevent ApplyTransformsAt from propogating to SliderBall children
2019-03-14 19:17:28 +09:00
Dean Herbert
1617e2a729
Merge branch 'master' into mania-judgemetns
2019-03-13 18:17:42 +09:00
David Zhao
527b77b07d
Make all inheritors of drawablejudgement use new method
2019-03-12 19:52:44 +09:00
Dean Herbert
63fea65c0c
Clarify repeat index
2019-03-11 14:53:21 +09:00
Dean Herbert
489153579a
Add xmldoc and clarify struct variables
2019-03-11 14:36:29 +09:00
Dean Herbert
93a999396e
LegacyFinalTick -> LegacyLastTick to match existing variable
2019-03-08 20:13:11 +09:00
Dean Herbert
165a353a83
Add extensive commenting about LegacyLastTick usage
2019-03-08 20:12:48 +09:00
Dean Herbert
355705f0a5
Fix legacy tick handling
2019-03-08 19:57:30 +09:00
Dean Herbert
973f29b765
Apply review
2019-03-08 15:14:57 +09:00
Dean Herbert
551380dd42
Extract slider tick creation so it can be shared with osu!catch
2019-03-08 14:46:26 +09:00
Dean Herbert
340997f505
Rename remaining usage of PathWidth naming convention
2019-03-07 20:21:59 +09:00
David Zhao
b3e046c4d1
Rename PathWidth to PathRadius
2019-03-07 17:39:19 +09:00
smoogipoo
0322bd8812
Make config nullable, removing testcase code
2019-03-05 14:40:27 +09:00
smoogipoo
78596dfe80
Merge remote-tracking branch 'origin/master' into move-osu-settings
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
# osu.Game.Rulesets.Osu.Tests/TestCaseSlider.cs
2019-03-05 13:25:03 +09:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections
2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1
Use expression body for property get/set where possible
2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9
Fix remaining issues
2019-02-28 13:31:40 +09:00
Dean Herbert
c8793911a8
Enable more stringent inspectcode style inspections
2019-02-27 21:25:40 +09:00
smoogipoo
a07d797d75
Merge remote-tracking branch 'Joehuu/master' into use-lifetime-optimization
2019-02-27 12:08:43 +09:00
smoogipoo
d06f38b3f3
Cleanup
2019-02-25 15:57:07 +09:00
Dean Herbert
7f5780c615
Simplify SliderBall and fix incorrect key up handling
...
Was not processing timeToAcceptAnyKeyAfter when cursor was outside valid tracking area, but should have been.
2019-02-23 14:38:53 +09:00
Dan Balasescu
5fdd7f9bff
Fix typo in comment
...
Co-Authored-By: peppy <pe@ppy.sh>
2019-02-23 14:14:34 +09:00
Dean Herbert
3a57ff40cd
Add comment about other cases, rewind handling
2019-02-23 14:14:34 +09:00
Dean Herbert
8e52e2330e
Add extensive commenting
2019-02-23 14:14:34 +09:00
Dean Herbert
1c75ee4e82
Add fixes
2019-02-23 14:14:34 +09:00
Dean Herbert
7566fcf536
Slider press fix
2019-02-23 14:14:34 +09:00
Dean Herbert
367bc53a06
Revert some more instances of 'e' variable names
2019-02-22 20:15:25 +09:00
smoogipoo
d61dfe888e
Fix venera fonts not being correctly specified
2019-02-22 19:42:09 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage
2019-02-22 18:09:23 +09:00
smoogipoo
d8c55bc729
Adjust namespaces
2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f
Update with framework bindable changes
2019-02-21 18:56:34 +09:00
smoogipoo
0693ab8e7d
Merge remote-tracking branch 'origin/master' into osu-fontusage
...
# Conflicts:
# osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb
Adjust sprite texts in-line with framework changes
2019-02-20 15:03:20 +09:00
Dan Balasescu
c9c8cccd68
Merge branch 'master' into use-lifetime-optimization
2019-02-18 15:22:34 +09:00
Dean Herbert
810175235d
Fix incorrect application of scaling in some cases
...
Isolates different usages of hitcircle scale so they can't ever cause regressions.
2019-02-14 18:47:05 +09:00
Dean Herbert
5b1f111922
Rollback other fallthrough regressions
2019-02-05 18:14:43 +09:00
Dean Herbert
2f8f4fac64
Fix combo colour fallbacks when skin is not providing any
2019-02-05 17:54:14 +09:00
ekrctb
504e79b968
Merge branch 'master' into use-lifetime-optimization
2019-01-29 12:15:02 +09:00
Unknown
77763fde8b
revert accidentally renamed variables
2019-01-25 11:22:05 +01:00
Unknown
8ddff673b7
revert previous rename and rename ruleset specific classes instead
2019-01-25 11:14:37 +01:00
Unknown
5446c99f22
Merge branch 'master' into move-osu-settings
2019-01-25 10:57:04 +01:00
Dean Herbert
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09:00
Unknown
cf147083cd
move osu! settings into its ruleset
2019-01-23 13:17:29 +01:00
Unknown
4a9bcf4937
rename OsuConfigManager to GameConfigManager
...
also OsuSetting to GameSetting
2019-01-23 13:17:29 +01:00
smoogipoo
e44bc57a3d
Fix minDistanceFromEnd using seconds rather than milliseconds
...
Velocity in stable is defined as distance per SECOND, while lazer defines it as distance per MILLISECOND.
2019-01-15 19:18:56 +09:00
Unknown
6eff79913b
remove blank lines
2019-01-11 10:34:56 +01:00
Dean Herbert
881b10a18f
Merge remote-tracking branch 'Dragicafit/moreOptionsFromSkin.ini' into moreOptionsFromSkin.ini
2019-01-08 11:01:04 +09:00
Dean Herbert
7eed3ffe75
Merge branch 'master' into moreOptionsFromSkin.ini
2019-01-08 10:02:06 +09:00
Dean Herbert
4cee21f356
Make skinning better
2019-01-07 20:12:39 +09:00
Dean Herbert
13b077c83b
Merge remote-tracking branch 'upstream/master' into moreOptionsFromSkin.ini
2019-01-07 18:11:17 +09:00
Roman Kapustin
4b5fc85875
Use Find instead of FirstOrDefault
2019-01-05 19:35:33 +03:00
smoogipoo
3fa5a33fb1
Inline const
2019-01-03 18:58:07 +09:00
smoogipoo
273b14b19c
Add a maximum length for slider ticks to be generated
2019-01-03 18:51:47 +09:00
smoogipoo
c56d8b75c1
Cache slider's endposition
2019-01-03 17:43:10 +09:00
ekrctb
6f8a2e6ff2
Use LifetimeManagementContainer
...
This is a significant performance boost for gameplay,
especially for long or stroyboard-heavy maps.
2018-12-13 15:23:06 +09:00
Dragicafit
ec3c87dbea
Make Slider's CustumColors skinnable
2018-12-07 22:24:24 +01:00
Dean Herbert
1a974f64de
Initial design for user registration dialog
2018-12-05 12:57:26 +09:00
smoogipoo
aea84f737b
Fix taiko hitobjects potentially disappearing before being judged
2018-11-29 12:12:29 +09:00
smoogipoo
52bc47499f
Fix spinners not having proper lifetimes
2018-11-29 12:11:45 +09:00
smoogipoo
f27bd3ef3e
OpenTK -> osuTK
2018-11-20 17:14:59 +09:00
smoogipoo
050af88be9
Fix post-merge issues
2018-11-14 14:29:22 +09:00
smoogipoo
29422345f7
Merge remote-tracking branch 'origin/master' into fix-mask-disposal
...
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
# osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
# osu.Game.Rulesets.Osu/Objects/Slider.cs
2018-11-14 14:03:25 +09:00
smoogipoo
3aba462e52
Make Path.Distance a property again
2018-11-12 14:07:48 +09:00
smoogipoo
54ab256c8e
Instantiate a new path rather than setting properties on it
...
# Conflicts:
# osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
# osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
# osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
# osu.Game/Rulesets/Objects/Legacy/Catch/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
# osu.Game/Rulesets/Objects/SliderPath.cs
2018-11-12 13:50:19 +09:00
smoogipoo
cc8531790a
Use bindables for hitobject events
2018-11-09 13:58:46 +09:00
smoogipoo
c6350c6efd
Remove IHasEditablePosition
2018-11-08 13:03:11 +09: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
7f1ee3bcb4
Disallow spinner movement for now
2018-11-02 12:06:53 +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
af1de01ed6
Add a spinner selection mask
2018-10-29 18:23:23 +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
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
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
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
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
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
ea6db8b793
Make the hitobject masks move within their placement/selection
2018-10-25 18:16:25 +09:00
Dean Herbert
cd718812b2
Merge branch 'master' into tighten-diffcalc-tolerances
2018-10-18 14:01:47 +09:00
smoogipoo
e8ce5a7e6c
Fix crashes when manually creating sliders
2018-10-16 18:27:09 +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
smoogipoo
83fd251c7b
Pass sub-controlpoints as span slices
2018-10-11 17:44:25 +09:00
Dan Balasescu
a2838d32bf
Merge branch 'master' into skinnable-spritetext
2018-10-09 16:23:43 +09:00
smoogipoo
42664f1c19
Make SliderBody use the new SmoothPath
2018-10-05 15:45:45 +09:00
smoogipoo
1cd11a6e5b
Fix StackHeight changes not causing position updates
2018-10-03 17:06:18 +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
smoogipoo
a8f156584b
Update framework with positional/non-positional changes
2018-09-26 14:01:15 +09:00
Dean Herbert
7cca990be4
Merge remote-tracking branch 'upstream/master' into framework-image-changes
2018-09-07 18:56:00 +09:00
Dean Herbert
9f67119ba9
Fix potential nullref in IsPresent override
2018-09-06 18:01:32 +09:00
Dean Herbert
4ff66bf531
Update in line with framework Image changes
2018-09-06 13:28:44 +09:00
Dean Herbert
03084aa04b
Revert async changes
2018-08-31 07:07:10 +09:00
smoogipoo
1b279d383f
Use GetAsync on all textures
2018-08-27 17:26:44 +09:00
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
smoogipoo
f903e6d241
Fix stacking not working with sliders
...
Fixes #2093 .
2018-02-21 17:46:45 +09:00
smoogipoo
f877b642da
Clean up and document better what "progress" means
2018-02-21 17:10:18 +09:00
smoogipoo
7fe0989427
Merge branch 'general-slider-improvements' into editor-hitobject-overlays
2018-02-20 23:51:47 +09:00
smoogipoo
ee055b8e5c
Allow customizing the snake-ability of sliders
2018-02-20 20:53:06 +09:00
smoogipoo
8270e4d758
Add BorderColour to SliderBody
2018-02-20 20:51:28 +09:00
smoogipoo
ad2f556133
Add hitobject overlays to selected hitobjects
2018-02-20 18:01:45 +09:00
Dean Herbert
58f20c3723
Merge branch 'master' into editor-hitobject-movement
2018-02-13 18:56:16 +09:00
smoogipoo
87baa6febd
Merge remote-tracking branch 'origin/master' into editor-pattern-adjustments
2018-02-12 19:08:13 +09:00
smoogipoo
cfb2b3f1e8
Rework SelctionLayer to support click-selections
2018-02-12 16:02:42 +09:00
Aergwyn
c3ce015869
fade slider ticks with hidden mod
2018-02-11 11:03:01 +01:00
Dean Herbert
534eb223b3
Merge branch 'master' into unified-hitwindows
2018-02-08 17:46:29 +09:00
smoogipoo
c213e58eff
Make slider tails not play hitsounds
2018-02-08 14:40:35 +09:00
smoogipoo
46284c61ae
Return HitResult.None instead of null
2018-02-08 14:25:59 +09:00
smoogipoo
beaecbafbd
Merge branch 'master' into unified-hitwindows
2018-02-08 13:22:44 +09:00
Dean Herbert
3d0ef8b3bd
Move property back to local variable
...
Never used elsewhere
2018-02-06 18:14:08 +09:00
Dean Herbert
27fd42fb17
Adjust appear animations of repeats and ticks
2018-02-06 18:10:15 +09:00
Dean Herbert
e417aaa23f
Adjust scale out effect
2018-02-06 17:46:56 +09:00
Dean Herbert
60fb78e49d
Simplify iteration code
2018-02-06 17:46:45 +09:00
ColdVolcano
bf26fc94d8
Merge branch 'master' into repeat-points
2018-02-03 23:56:40 -06:00
smoogipoo
b15f184261
Make osu! use HitWindows
2018-02-02 20:33:59 +09:00
Dan Balasescu
cf665b717f
Merge branch 'master' into starrating-fix
2018-02-01 18:44:04 +09:00
Dan Balasescu
39e626f29e
Merge branch 'master' into fix-ticks-appearing-late
2018-02-01 18:28:42 +09:00
Dean Herbert
b8f6dcffaf
Merge remote-tracking branch 'upstream/master' into repeat-points
2018-02-01 13:32:53 +09:00
ColdVolcano
06b615c474
Merge branch 'master' into repeat-points
2018-01-31 21:30:28 -06:00
smoogipoo
cd4a0612c0
Properly construct slider ends using HitObject.AddNested
2018-01-30 16:53:19 +09:00
smoogipoo
27357e100a
Simplify condition
2018-01-30 16:28:38 +09:00
smoogipoo
702c4efb88
Give Slider a tail hitobject to make slider ends counts towards score
2018-01-30 16:28:14 +09:00
smoogipoo
b293408147
Construct the head of sliders from Slider
2018-01-30 15:50:48 +09:00
Aergwyn
373b3871f9
update SliderTick calculation + more ticks in tests
...
math is hard >_<
2018-01-29 12:03:44 +01:00
Thomas Tan
33c5fdcedb
AppVeyor fix
2018-01-29 16:30:46 +08:00
Thomas Tan
c36859ea3a
Create Slider.StackedPositionAt method
2018-01-29 16:22:14 +08:00
Aergwyn
214938b98d
fix SliderTicks appearing too late
2018-01-25 10:52:03 +01:00
ColdVolcano
1f51149da8
Add xmldoc
2018-01-24 15:41:51 -06:00
ColdVolcano
cee8bb50c9
Fix reference points being wrongly selected
2018-01-24 15:34:52 -06:00
Aergwyn
52c4d22c41
review changes
...
- use doubles instead of floats
- simplify logic
2018-01-24 09:44:50 +01:00
Aergwyn
4baadfdd16
fix oversight
2018-01-23 16:44:33 +01:00
ColdVolcano
efae00c149
make repeat points look better
2018-01-23 04:31:37 -06:00
Aergwyn
24b7d91f5b
Merge branch 'master' into fix-repeats-appearing-early
2018-01-23 09:04:45 +01:00
smoogipoo
33c52ba30f
Fix off-by-ones in RepeatPoint code
2018-01-23 13:58:43 +09:00
smoogipoo
d37844c068
Clean up off-by-one offsets from repeat-related properties
2018-01-23 13:37:25 +09:00
Aergwyn
b726f90c37
remove unnecessary variable
2018-01-22 12:44:55 +01:00
Aergwyn
66176f2882
fix RepeatPoint animations
...
- FadeIn and -Out for RepeatPoints are now calculated instead of fixed values
- TimePreempt is now cut down if too long for RepeatPoints following the first one to only show up to two RepeatPoints at any given time
2018-01-22 12:36:38 +01:00
Shawdooow
29466438a3
fix values
2018-01-19 20:58:43 -05:00
Shawdooow
c29eea870d
correct values
2018-01-19 20:56:41 -05:00
Shawdooow
e109d5fe20
fix slider heads
2018-01-19 11:13:49 -05:00
Shawdooow
4d1142a0ce
overall difficulty
2018-01-19 11:11:28 -05:00
smoogipoo
6908597b95
Fix inverted ternary
...
See #1935 - repeat index 1 is at the end of the slider, not the start.
2018-01-18 23:44:00 +09:00
Dan Balasescu
46ba2cda10
Remove unused using
2018-01-18 21:19:06 +09:00
Dean Herbert
1a83770a06
Fix incorrect math
2018-01-18 21:16:15 +09:00
Dean Herbert
065d2a4887
Add licence header
2018-01-18 21:12:53 +09:00
Dean Herbert
01ff1584c2
Fix repeat points not following slider snaking correctly
2018-01-18 21:06:47 +09:00
Dean Herbert
e2965e1682
Remove unused using
2018-01-18 20:46:57 +09:00
Dean Herbert
063767e381
Prioritise hit normal
...
It's always first but not strictly guaranteed anywhere yet.
2018-01-18 20:37:46 +09:00
Dean Herbert
97884e1d05
Remove unnecessary null checks
2018-01-18 19:57:49 +09:00
Dean Herbert
b4f2bea37b
Fix slider samples playing twice when additions are present
2018-01-18 19:50:26 +09:00
Dean Herbert
9b33499fe7
Merge remote-tracking branch 'upstream/master' into RefactorInputQueues
2018-01-16 20:04:34 +09:00
