1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 15:47:26 +08:00
Commit Graph

2733 Commits

Author SHA1 Message Date
smoogipoo
1e05fd48e2 Fix hidden mod crash 2020-11-13 23:08:27 +09:00
kamp
742a140462
Merge branch 'master' into allow-reversing-spinners 2020-11-13 11:08:56 +01:00
smoogipoo
f7f70d41df Add osu! editor pooling support 2020-11-13 17:28:26 +09:00
smoogipoo
3c91626132 Merge branch 'pooling-editor-support' into osu-editor-pooling 2020-11-13 17:27:00 +09:00
smoogipoo
942ecde0e1 Merge branch 'master' into pooling-editor-support 2020-11-13 17:23:35 +09:00
smoogipoo
4ef2e9548c Pass HitObjectComposer to BlueprintContainer via ctor 2020-11-13 16:59:37 +09:00
smoogipoo
beb6bbd2a1 Implement now abstract method 2020-11-13 14:58:32 +09:00
smoogipoo
7085b25898 Merge branch 'hitobject-pooling-base' into osu-hitobject-pooling 2020-11-13 14:57:59 +09:00
Dean Herbert
38105ed6a2
Merge branch 'master' into hitobject-pooling-base 2020-11-13 11:27:32 +09:00
Dean Herbert
030df8234a
Merge pull request #10805 from bdach/fix-osu-hd-mod-part-2
Fix slider ends not fading out after a rewind with hidden mod
2020-11-13 11:27:15 +09:00
kamp
66544544d3
Merge branch 'master' into allow-reversing-spinners 2020-11-13 00:40:49 +01:00
kamp
45ce6cc82d Allow spinners to be reversed 2020-11-13 00:36:47 +01:00
kamp
1439c0f392 Prevent SelectionBox handles from appearing when a stack of circles is selected 2020-11-12 23:19:29 +01:00
Dan Balasescu
2840fd0f8f
Merge branch 'master' into hitobject-pooling-base 2020-11-12 23:17:36 +09:00
smoogipoo
3f0a127196 Fix slider/spinner samples not being disposed 2020-11-12 18:51:58 +09:00
smoogipoo
7548db7ecc Fix hitobjects sometimes not fading in completely with HD mod 2020-11-12 18:29:22 +09:00
Bartłomiej Dach
0ae6f82291 Fix incorrect fade of slider ends after a rewind 2020-11-12 09:33:39 +01:00
smoogipoo
3f78d81386 Add nested osu! hitobject pooling 2020-11-12 15:59:48 +09:00
smoogipoo
1ea526b5ef Adjust pooling implementation with branch changes 2020-11-12 15:39:02 +09:00
smoogipoo
bf72961959 Add top-level osu! hitobject pooling 2020-11-12 15:39:02 +09:00
smoogipoo
606cfacedf Fix state update exception in a better way 2020-11-11 19:01:12 +09:00
smoogipoo
5d55af5818 Fix hitobjects sometimes not fading in completely with HD mod 2020-11-11 16:35:48 +09:00
Dean Herbert
a82291f31f
Merge pull request #10776 from smoogipoo/fix-possible-nullref
Fix possible nullref with non-attached hitobjects
2020-11-11 11:14:57 +09:00
smoogipoo
81844878b0 Fix possible nullref with non-attached hitobjects 2020-11-11 00:29:34 +09:00
smoogipoo
0bab5605d1 Merge branch 'master' into dho-apply 2020-11-10 01:30:45 +09:00
kamp
42c543472d Remove unnecessary null coalesce 2020-11-07 01:56:41 +01:00
kamp
b47a2a03d5 Fix nullref when quickdeleting slider that hasn't been selected yet 2020-11-07 01:53:14 +01:00
Dean Herbert
d93cf08570
Merge branch 'master' into dho-apply 2020-11-07 01:18:46 +09:00
smoogipoo
b1e039bcec Prevent overrides from messing with application/freeing 2020-11-07 00:40:26 +09:00
smoogipoo
3a4bd73823 Fix DHOs being freed when not expected 2020-11-07 00:25:26 +09:00
smoogipoo
e190afbfed Remove initial value changed invocations 2020-11-07 00:00:25 +09:00
smoogipoo
33b629a87a Make top-level osu! objects use new methods 2020-11-06 23:09:23 +09:00
Dan Balasescu
f230250faf
Merge branch 'master' into editor-slider-control-point-quick-delete 2020-11-06 21:47:37 +09:00
Dan Balasescu
cf9acca78a
Merge pull request #10676 from peppy/fix-hitcircle-glow-on-skin-change
Fix skin changes resulting in incorrectly applied transforms in MainCirclePiece
2020-11-06 21:09:22 +09:00
Dean Herbert
e0ef777e87
Merge branch 'master' into fix-hitcircle-glow-on-skin-change 2020-11-06 16:47:56 +09:00
Dan Balasescu
5d7fa42d90
Merge branch 'master' into add-spinner-clear 2020-11-06 16:14:15 +09:00
Dan Balasescu
44c6457c85
Merge branch 'master' into add-spinner-spin 2020-11-06 15:40:40 +09:00
Dan Balasescu
41dc3a7abd
Merge branch 'master' into add-spinner-glow 2020-11-06 14:37:54 +09:00
Dan Balasescu
71a1165209
Merge branch 'master' into drawable-hit-object-hit-state-fix 2020-11-06 13:19:25 +09:00
Dean Herbert
d7a912a0d2 Match stable's transform 1:1 2020-11-05 19:44:34 +09:00
Dean Herbert
71253cb5e9 Add support for spinner "clear" text in legacy skins 2020-11-05 19:35:32 +09:00
Dean Herbert
5e387e92cd Add positional offset to avoid the SPM counter 2020-11-05 19:16:47 +09:00
Dean Herbert
901102918e Centralise scale and apply to SPIN text 2020-11-05 19:05:59 +09:00
Dean Herbert
3ec813da03 Add "spin" sprite 2020-11-05 18:48:47 +09:00
Dean Herbert
2bbdbfda5c
Merge pull request #10696 from smoogipoo/visibility-adjustment-mod 2020-11-05 18:18:57 +09:00
Dean Herbert
5ec6011340 Apply new style spinner scale to only local sprites 2020-11-05 18:14:49 +09:00
Dean Herbert
11c18952e3 Allow children to be added in base class 2020-11-05 18:12:06 +09:00
Dean Herbert
64e3325b41 Abstract out common part of legacy spinner implementations
Some elements going forward will be shared, so it makes sense to have a
common base class to add these shared elements.
2020-11-05 18:00:27 +09:00
Dean Herbert
82d8c1bbea Add support for spinner glow 2020-11-05 17:27:41 +09:00
Dean Herbert
0cadb31947 Merge branch 'master' into drawable-hit-object-hit-state-fix 2020-11-05 17:07:52 +09:00
Dean Herbert
4a4fa96fef
Merge pull request #10692 from smoogipoo/followpointrenderer-hitobject 2020-11-05 16:39:05 +09:00
Dean Herbert
54775ccacf
Merge pull request #10690 from smoogipoo/osu-remove-hitobject-references 2020-11-05 16:22:13 +09:00
smoogipoo
d1fa391d25 Make OsuModHidden apply fadein adjustment on custom state update 2020-11-05 16:12:55 +09:00
smoogipoo
f513c95ab2 Use class with transform and wiggle mods 2020-11-05 16:04:42 +09:00
smoogipoo
cc518feca7 Make methods abstract 2020-11-05 16:03:10 +09:00
smoogipoo
77a618dd71 Use class with other osu! mods 2020-11-05 15:52:06 +09:00
Dean Herbert
a43166e8a9
Merge branch 'master' into followpointrenderer-hitobject 2020-11-05 15:42:09 +09:00
Dean Herbert
54f927ee11 Move casts to DrawableHitObject instead 2020-11-05 15:41:55 +09:00
smoogipoo
628b8be15d Implement ModWithVisibilityAdjustment 2020-11-05 15:40:25 +09:00
Dean Herbert
c26fd4dc3d
Merge pull request #10691 from smoogipoo/osu-lighting-colour-reuse
Remove AccentColour binding from judgement lighting
2020-11-05 15:37:28 +09:00
Dean Herbert
e2d028908a Fix one more case of local variable preference 2020-11-05 15:25:20 +09:00
Dean Herbert
4457e363d3 Bring back local variables to reduce two-level-deep variable access 2020-11-05 15:22:40 +09:00
Dean Herbert
3f24fabb57 Add change handler support for contorl point deletion 2020-11-05 15:05:43 +09:00
smoogipoo
9c1c9945af Make FollowPointRenderer use hitobject models 2020-11-05 15:01:45 +09:00
Dean Herbert
242ec1ca82 Don't override PathControlPointVisualiser's positional handling
It turns out it was relying on this to deselect control points on
clicking away from them.
2020-11-05 14:58:30 +09:00
smoogipoo
9ac822beed Remove AccentColour binding from judgement lighting 2020-11-05 14:49:15 +09:00
smoogipoo
400fcedf0f Remove stored hitobject references from skinnable components 2020-11-05 14:40:48 +09:00
Dean Herbert
eed9894d3a Remove usage of case-when (caught me off-gaurd) 2020-11-05 13:58:41 +09:00
smoogipoo
9a7fcadabc Use BDL for top-level osu! DHOs 2020-11-05 13:51:46 +09:00
Dean Herbert
f9fc58c45c Apply same fix to LegacyMainCirclePiece 2020-11-04 17:30:23 +09:00
Dean Herbert
65fb8628e0 Use HitStateUpdateTime 2020-11-04 17:30:11 +09:00
Dean Herbert
e5a5c3713d Merge branch 'drawable-hit-object-hit-state-fix' into fix-hitcircle-glow-on-skin-change 2020-11-04 17:15:20 +09:00
Dean Herbert
a3dc1d5730 Update existing implementations 2020-11-04 17:14:23 +09:00
Dean Herbert
9f333ac58a Add the ability to delete slider control points using shift+right click
Closes https://github.com/ppy/osu/issues/10672.

In two minds about how this should be implemented but went in this
direction initially. The other way would be to add local handling of
Shift-Right Click inside PathControlPointPiece (which is already doing
mouse handling itself).
2020-11-03 20:46:33 +09:00
Dean Herbert
b069372b29 Fix skin changes resulting in incorrectly applied transforms in MainCirclePiece 2020-11-03 17:49:48 +09:00
Bartłomiej Dach
164370bc7d Resolve more CA1805 inspections 2020-11-01 20:51:23 +01:00
Dean Herbert
606a4304a8 Remove unused usings 2020-10-27 14:33:16 +09:00
Dean Herbert
9cfb81589e Use bindable flow instead 2020-10-27 14:10:12 +09:00
Bartłomiej Dach
5ef1b5dcb5 Remove unused locals 2020-10-25 23:55:22 +01:00
Bartłomiej Dach
0a23e994e2 Hide sliderend & repeat circles in traceable mod 2020-10-25 23:30:26 +01:00
Dean Herbert
267b399f9f Add some simple border styles 2020-10-20 13:59:03 +09:00
Bartłomiej Dach
7c388f1132 Move editor playfield border locally to osu! composer 2020-10-19 21:20:13 +02:00
Bartłomiej Dach
bca0539735 Move setting to osu! ruleset subsection 2020-10-19 21:05:21 +02:00
Bartłomiej Dach
4267d23d59 Move border to more appropriate namespace 2020-10-19 20:56:34 +02:00
Bartłomiej Dach
4af3fd1ed6 Allow toggling border on & off during gameplay 2020-10-19 20:41:45 +02:00
Bartłomiej Dach
053c7a69a6 Fix code style issues & compilation failures 2020-10-19 20:22:48 +02:00
Dean Herbert
22bde43106
Merge branch 'master' into visible-playfield-boundary 2020-10-19 18:05:28 +09:00
Bartłomiej Dach
f41879ee7c Show current hit circle placement in timeline 2020-10-10 17:54:37 +02:00
Bartłomiej Dach
146b15371d
Merge branch 'master' into fix-slider-sample-parsing 2020-10-10 14:02:33 +02:00
Dean Herbert
681e88af40
Merge branch 'master' into editor-fix-button-states-after-paste 2020-10-09 20:51:09 +09:00
smoogipoo
696e3d53af Fix slider samples being overwritten by the last node 2020-10-09 20:50:09 +09:00
Dan Balasescu
ecfb7e94c5
Merge branch 'master' into fix-editor-batch-handling 2020-10-09 20:06:06 +09:00
Dan Balasescu
93f5ea57a5
Merge pull request #10427 from peppy/fix-hidden-first-object
Fix first hitobject in osu! hidden mod not getting correct fade applied
2020-10-09 19:23:47 +09:00
Dan Balasescu
62690e4873
Merge pull request #10432 from peppy/editor-reverse-pattern
Add "reverse pattern" support to editor selection handler
2020-10-09 19:19:24 +09:00
Dean Herbert
3838f405dd Fix missed usages 2020-10-09 18:50:05 +09:00
Dean Herbert
febfe9cdd0 Don't fade the approach circle on increased visibility 2020-10-09 18:43:16 +09:00
Dan Balasescu
6572ce5f36
Merge pull request #10441 from peppy/editor-selection-blueprint-performance
Improve performance of slider blueprints
2020-10-09 18:01:25 +09:00
Dean Herbert
a0af2eb6c8 Private protect setters 2020-10-09 16:54:43 +09:00
Dean Herbert
6b9e94ae93 Avoid retaining slider selection blueprints FBO backing textures after deselection 2020-10-09 14:05:00 +09:00
Dean Herbert
34d1439f8e Only update slider selection blueprints paths when visible 2020-10-09 14:04:26 +09:00
Dean Herbert
07558b5bc0 Merge branch 'master' into ruleset-result-types 2020-10-09 13:17:05 +09:00
Dean Herbert
2a790c76d5 Add reverse implementation for osu! 2020-10-09 06:32:33 +09:00
Dean Herbert
2d0275ba95 Fix first hitobject in osu! hidden mod not getting correct fade applied 2020-10-09 03:07:01 +09:00
Dean Herbert
afed832b19 Tidy up EditorBeatmap slightly 2020-10-08 18:06:49 +09:00
Dean Herbert
f1a3b6d0ba Merge branch 'master' into perf-calculator-remove-working-beatmap 2020-10-07 17:43:17 +09:00
Dean Herbert
6020ec9ca3 Add valid result types for all rulesets 2020-10-07 15:43:52 +09:00
Dan Balasescu
c803be2dd2
Merge pull request #10385 from peppy/fix-slider-end-circle-fallback-case
Fix incorrect sliderendcircle fallback logic
2020-10-06 20:10:51 +09:00
Dan Balasescu
e1b5c83ae6
Merge pull request #10386 from peppy/fix-stacked-circles-visibility
Make stacked hitcircles more visible when using default skin
2020-10-06 19:48:07 +09:00
Dean Herbert
9d7880afda Make SettingsItem conform to IHasCurrentValue 2020-10-06 17:18:54 +09:00
Dean Herbert
048507478e Join declaration and specification 2020-10-06 14:12:46 +09:00
Dean Herbert
ed982e8dd1 Make stacked hitcircles more visible when using default skin 2020-10-06 14:09:31 +09:00
Dean Herbert
767a2a10bd Fix incorrect sliderendcircle fallback logic
Correctly handle the case where a skin has "sliderendcircle.png" but not
"sliderendcircleoverlay.png".
2020-10-06 13:56:42 +09:00
Dan Balasescu
6d50a1ed7d
Merge branch 'master' into osu-selection-flip-rotate-buttons 2020-10-05 19:17:33 +09:00
Dan Balasescu
08f7b18dbe
Merge pull request #10294 from peppy/osu-selection-scaling
Add selection scale and rotate support
2020-10-05 19:17:19 +09:00
Dan Balasescu
cbf697336f
Merge pull request #10323 from peppy/skin-slider-end-circle-support
Add legacy skin "sliderendcircle" support
2020-10-05 19:02:38 +09:00
Dan Balasescu
b20dc793cc
Merge pull request #10321 from LittleEndu/trail-density
Try to match stable's cursor trail density
2020-10-05 19:02:28 +09:00
Dan Balasescu
2df5ea8ba8
Merge branch 'master' into osu-selection-scaling 2020-10-05 18:47:17 +09:00
Dean Herbert
f0b5ba9534
Merge branch 'master' into skin-slider-end-circle-support 2020-10-05 17:45:51 +09:00
Dan Balasescu
692ca87bec
Merge branch 'master' into fix-spinner-rewind-crash 2020-10-05 15:32:52 +09:00
Dean Herbert
5dea37792c
Merge branch 'master' into health-adjustments 2020-10-04 21:38:40 +09:00
Bartłomiej Dach
a366591d6d
Merge branch 'master' into osu-selection-scaling 2020-10-04 13:28:59 +02:00
Bartłomiej Dach
26eff0120d Apply same fix for miss-triggering case
See 5888ecd - the same fix is applied here, but in the miss case.
2020-10-03 21:11:34 +02:00
Dean Herbert
5888ecdeb1 Fix spinner crashing on rewind 2020-10-04 01:08:24 +09:00
Lucas A
27cc6c5046 Rename HitCirclesCount -> HitCircleCount. 2020-10-03 16:52:33 +02:00
Lucas A
d7747ebb2d Remove unused WorkingBeatmap argument. 2020-10-03 16:51:22 +02:00
Bartłomiej Dach
db31280671 Award health for completed slider tails 2020-10-03 12:16:22 +02:00
Bartłomiej Dach
1f0620ffd4 Replace assignment references to HitResult.Miss with Judgement.MinResult 2020-10-02 23:31:24 +02:00
Bartłomiej Dach
2b1ef16f89 Replace comparison references to HitResult.Miss with IsHit 2020-10-02 23:31:24 +02:00
Lucas A
abd395a030 Remove unecessary using references. 2020-10-02 19:41:24 +02:00
Lucas A
cb2f695fdd Calculate hit circle count in OsuPerformanceCalculator. 2020-10-02 19:34:41 +02:00
Lucas A
0163688a17 Remove IBeatmap from PerformanceCalculator. 2020-10-02 19:24:30 +02:00
Endrik Tombak
676f58c3bf Merge branch 'master' of https://github.com/ppy/osu into trail-density 2020-10-02 19:36:40 +03:00
Endrik Tombak
8cd13729ee Actually multiply by the multiplier 2020-10-02 19:34:49 +03:00
Endrik Tombak
16f331cf6d Move implementation to LegacyCursorTrail 2020-10-02 19:34:06 +03:00
Dean Herbert
b1e7a5113e
Merge pull request #10328 from smoogipoo/fix-spinner-transforms
Fix spinners not transforming correctly
2020-10-02 23:51:09 +09:00
Dean Herbert
a3ecc6c5a4 Remove redundant array type specification 2020-10-02 19:56:24 +09:00
Dean Herbert
5a6c45e2ff Fix hidden mod support for sliderendcircle 2020-10-02 18:41:28 +09:00
smoogipoo
fe818a020a Fix spinners not transforming correctly 2020-10-02 16:17:57 +09:00
Dean Herbert
dde7f706aa Avoid rapid triangle repositioning during editor slider placement 2020-10-02 15:51:14 +09:00
Dean Herbert
ad4cac13ac Add preempt adjustment and fade in first end circle with slider to match stable 2020-10-02 15:21:52 +09:00
Dean Herbert
2975ea9210 Adjust repeat/tail fade in to match stable closer 2020-10-02 14:50:03 +09:00
Dean Herbert
2427ae43da Share fade in logic with repeats 2020-10-02 14:50:03 +09:00
Dean Herbert
5d2a8ec764 Add final sliderendcircle display support 2020-10-02 14:50:03 +09:00
Dean Herbert
fc7f3173e1 Add the ability to use LegacyMainCirclePiece with no combo number displayed 2020-10-02 14:50:03 +09:00
Dean Herbert
fce3eacd7d Move tail circle to display beneath ticks etc. 2020-10-02 14:50:03 +09:00
Endrik Tombak
fa1903cd03 Get bound copy instead 2020-10-01 23:41:24 +03:00
Endrik Tombak
abf1afd3f1 Do not decrease density 2020-10-01 23:27:57 +03:00
Endrik Tombak
9e52f9c858 Consider cursor size in trail interval 2020-10-01 23:23:28 +03:00
Dean Herbert
3069428efe
Merge pull request #10316 from smoogipoo/fix-spinner-flicker
Fix default spinner flashing yellow glow before completion
2020-10-01 22:29:48 +09:00
Dean Herbert
94996f2cc0
Merge branch 'master' into osu-selection-scaling 2020-10-01 21:09:52 +09:00