ruchirguitar and Cursor
ef176385dd
#4943 : keep the language-list note in the UI parity status line
...
The new conflict was only that status line. Upstream's longer change list is kept, with the #4943 language-list clause in front.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-11-09 12:24:58 +05:30
ruchirguitar and Cursor
6fd8385bf4
#4943 : keep upstream parity notes with the language-list rows
...
Conflicts were only the status lines and revision history in the type and UI parity docs. Both sides are kept. Language entries, catalogs and tests merged cleanly, so local CI was not rerun.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-11-09 12:09:49 +05:30
ruchirguitar and Cursor
7690e2e0ad
M2.1: merge main again and keep path-deletion evidence ( #3380 )
...
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-11-09 11:25:37 +05:30
BFlat
fbf43fccf0
Merge pull request #5200 from dotCooCoo/fix/ai-os23-3678
...
.ai import: objects with a centered variable-width stroke come in as their drawn outline
2026-11-09 13:48:39 +08:00
BFlat
d90cc305fa
Merge pull request #6148 from magyarb/fix/ai-right-aligned-tabs
...
.ai/EPS import: type keeps its tab stops, and right-aligned lines with tabs lay out as the file's page
2026-11-09 13:18:23 +08:00
BFlat
cc02f7b35e
Merge pull request #4379 from dotCooCoo/fix/shape-builder-merge-off-ui-thread
...
Shape Builder: a large selection merges on another thread
2026-11-09 13:10:54 +08:00
BFlat
1b8f273255
Merge pull request #6277 from dotCooCoo/fix/titlebar-variable-doc
...
Linux: docs say which VECTORCRAFT_TITLEBAR values take precedence
2026-11-09 13:06:49 +08:00
dotCooCoo
d3d56f01ce
Merge main into fix/ai-os23-3678
2026-11-08 20:58:09 -08:00
BFlat
a32bd3dc92
Merge pull request #6234 from dotCooCoo/fix/save-screens-unknown-options
...
Save: the save commands and Export for Screens refuse an unknown option key
2026-11-09 12:49:37 +08:00
BFlat
baa7248e76
Merge pull request #5158 from dotCooCoo/fix/ai-os23-2831
...
.ai import: names that aren't UTF-8 can be read in a legacy code page
2026-11-09 12:46:30 +08:00
M Balazs PC
68133cc731
Merge remote-tracking branch 'origin/main' into fix/ai-right-aligned-tabs
...
# Conflicts:
# docs/file-format-parity.md
2026-11-09 05:45:48 +01:00
BFlat
5402f17f15
Merge pull request #6276 from dotCooCoo/fix/plugin-last-error-origin
...
Plug-ins: lastError keeps a failed run's error, and hit tests follow swatch changes
2026-11-09 12:26:56 +08:00
dotCooCoo
09cbf2b8f9
Merge main into fix/ai-os23-3678
2026-11-08 20:24:23 -08:00
dotCooCoo
05e3b99bf7
Linux: comments say which VECTORCRAFT_TITLEBAR values take precedence
2026-11-08 20:24:12 -08:00
dotCooCoo
fc728b909e
Merge main into fix/shape-builder-merge-off-ui-thread
2026-11-08 20:23:21 -08:00
dotCooCoo
0b19003214
Merge main into fix/save-screens-unknown-options
2026-11-08 20:13:09 -08:00
BFlat
6b978fea4f
Merge pull request #6223 from dotCooCoo/feat/plugin-filter-inputs
...
Plug-ins: filters can ask to read type, images and symbol instances
2026-11-09 12:09:05 +08:00
M Balazs PC
b64cfed610
Merge remote-tracking branch 'origin/main' into fix/ai-right-aligned-tabs
...
# Conflicts:
# crates/text/src/layout/flow.rs
# docs/file-format-parity.md
# docs/roadmap.md
# docs/target-app-parity.md
2026-11-09 04:48:48 +01:00
dotCooCoo
3258785476
Merge main into fix/ai-os23-2831
2026-11-08 19:44:24 -08:00
BFlat
cc369817fd
Merge pull request #6273 from dotCooCoo/fix/tool-options-reload-keep-drag
...
Tools: setting another tool's option leaves a drag's options alone
2026-11-09 11:43:23 +08:00
dotCooCoo
89b61de7f1
Merge main into fix/ai-os23-3678
2026-11-08 19:39:45 -08:00
dotCooCoo
df100e978f
Merge main into fix/ai-os23-3678
...
Only a Stroke Style filter's widths written as one centered array come in as the drawn look. A Stroke Offset stroke and widths written for each side stay live with their profile.
2026-11-08 19:39:44 -08:00
dotCooCoo
5d715a5051
Plug-ins: an effect that paints nothing clears a refused reference's error
...
Only a painted effect's references are checked, so a refusal recorded for a painted effect stayed in plugin.info after an effect that paints nothing replaced it under the same id.
2026-11-08 19:35:50 -08:00
dotCooCoo
5cb09720a4
Merge main into feat/plugin-filter-inputs
2026-11-08 19:34:12 -08:00
ruchirguitar and Cursor
3deac491ca
M2.1: merge current main and keep path-deletion evidence ( #3380 )
...
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-11-09 09:03:17 +05:30
ruchirguitar and Cursor
48fa6179b4
M2.1: keep the stronger Pen Cut split checks while merging the fork ( #3380 )
...
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-11-09 09:02:03 +05:30
BFlat
8eb3d4166a
Merge pull request #2552 from dotCooCoo/feat/print-copies-per-sheet
...
Print: Copies per Sheet prints as many copies of each artboard as fit the sheet
2026-11-09 11:17:48 +08:00
BFlat
0089e494f5
Merge pull request #6269 from dotCooCoo/fix/plugin-storage-kept-settings
...
Plug-ins: settings and the cache total stay in memory between storage calls
2026-11-09 11:13:41 +08:00
dotCooCoo
3123b4af74
Plug-ins: a passed reference check keeps a failed run's error
...
A painted effect's cached result passed its swatch and pattern check and cleared the error of a failed run, so plugin.info reported none while the effect still failed on another object. A run and a reference check now record their errors separately, and each clears only its own.
2026-11-08 19:13:37 -08:00
dotCooCoo
67e3d6f13f
Merge main into fix/save-screens-unknown-options
2026-11-08 19:13:11 -08:00
dotCooCoo
529dcb5c64
Merge main into feat/plugin-filter-inputs
2026-11-08 19:06:11 -08:00
dotCooCoo
d3a323284c
Merge main into fix/ai-os23-2831
2026-11-08 18:52:59 -08:00
BFlat
3b92bef27c
Merge pull request #2606 from dotCooCoo/feat/jxl-import
...
File formats: JPEG XL (.jxl) images open and place
2026-11-09 10:50:56 +08:00
BFlat
c5c1913f48
Merge pull request #6265 from dotCooCoo/feat/plugin-effect-paint
...
Plug-ins: live effects at API level 2 can paint the pieces they return
2026-11-09 10:50:46 +08:00
dotCooCoo
36622feda4
Tools: setting another tool's option leaves a drag's options alone
...
tool.setOption on another tool reloaded every saved option of the active tool. During a shape drag that reload rewrote the options Escape restores, so Escape kept a side count an arrow key had changed. The active tool now reloads only the stores it shares with the tool that was set.
2026-11-08 18:48:41 -08:00
BFlat
8ace539ac8
Merge pull request #5042 from dotCooCoo/fix/issue-3526-docs
...
Fix #3526 : the bounding box follows a resize drag
2026-11-09 10:46:34 +08:00
BFlat
bf0ceb661f
Merge pull request #2780 from dotCooCoo/feat/visibility-variables-drive-locked-art
...
Variables: a visibility variable shows and hides locked art
2026-11-09 10:25:00 +08:00
dotCooCoo
9f2fb7a915
Print: test that print presets keep Copies per Sheet and older presets leave it off
2026-11-08 18:22:12 -08:00
dotCooCoo
bf4ec4253d
Merge main into fix/save-screens-unknown-options
2026-11-08 18:13:32 -08:00
BFlat
c09c597e75
Merge pull request #4536 from dotCooCoo/feat/recolor-reports-skipped-art
...
Recolor: report the locked and hidden art a recolor of everything left out
2026-11-09 10:12:57 +08:00
BFlat
04aedc87e5
Merge pull request #6268 from dotCooCoo/fix/freeform-mixes-in-point-model
...
Gradients: freeform points that share a color model mix in that model
2026-11-09 10:08:22 +08:00
dotCooCoo
d56a598c88
Merge main into fix/issue-3526-docs
2026-11-08 18:05:41 -08:00
ruchirguitar and Cursor
8782c14e59
M2.1: expect a cut Pen segment to leave independent path pieces ( #3380 )
...
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-11-09 07:35:23 +05:30
dotCooCoo
0fc62c2cf3
Merge main into feat/jxl-import
2026-11-08 18:04:51 -08:00
dotCooCoo
e064698086
Merge main into feat/jxl-import
2026-11-08 18:04:45 -08:00
dotCooCoo
ec3f0a2288
Merge main into feat/plugin-effect-paint
2026-11-08 17:59:42 -08:00
dotCooCoo
bd5ea2a1bf
Merge main into feat/plugin-effect-paint
2026-11-08 17:59:33 -08:00
BFlat
f6b29a6e72
Merge pull request #5213 from dotCooCoo/fix/shape-escape-restores-options
...
Drawing tools: Escape on a polygon, star or rounded rectangle drag puts back the option it changed
2026-11-09 09:52:16 +08:00
dotCooCoo
e82ed4642e
Merge main into feat/plugin-filter-inputs
2026-11-08 17:50:28 -08:00
dotCooCoo
e1798597f3
Fix as_png calls after merging main
2026-11-08 17:43:33 -08:00