Commit Graph
4092 Commits
Author SHA1 Message Date
bflatastic 32f2f119f9 Merge main into #2050 2026-11-07 08:57:25 +07:00
bflatastic 3b1fc77ba1 Merge main into #2018 2026-11-07 08:57:17 +07:00
bflatastic 8802f3fd49 CLI: test that plain escapes controls only 2026-11-07 08:56:32 +07:00
BFlat b186c7a686 Merge pull request #1789 from TrevorBrown-dev/fix/svg-import-stretch-and-dash-offset
M6: SVG import: a dash offset on a closed outline is kept
2026-11-07 09:56:01 +08:00
bflatastic e65c46761a Merge main into #1913 2026-11-07 08:55:12 +07:00
bflatastic 79d6335c90 Merge main into #2047 2026-11-07 08:54:47 +07:00
BFlat 3a1b698ed4 Merge pull request #2055 from aleksei-suholita/fix/effect-binding-checks
M3: a layer binds an effect's field only when its effect has it, and a bound glass light angle turns round
2026-11-07 09:53:26 +08:00
Trevor Brown 8f1a3a35ff Merge remote-tracking branch 'upstream/main' into feat/region-fills 2026-11-06 20:52:20 -05:00
Trevor Brown ad2c120191 Merge remote-tracking branch 'upstream/main' into feat/region-fills
# Conflicts:
#	crates/ui-egui/src/panels/right/paints.rs
#	docs/ui-parity.md
2026-11-06 20:52:20 -05:00
BFlat 7522c39ba5 Merge pull request #1760 from Silvertree2010/fix/1745-pen-tool-undo-cmd-z-bug
Make undo while drawing with the pen remove only the last anchor
2026-11-07 09:50:33 +08:00
bflatastic 5f417b201b Merge main into #2009 2026-11-07 08:49:46 +07:00
bflatastic acbc988225 Schema test: its field ids no longer repeat, now that repeats are refused 2026-11-07 08:48:40 +07:00
BFlat 5762212ced Merge pull request #2006 from JonRC/fix/jpeg-quality-srgb-icc
M6: JPG exports take a quality and embed the sRGB profile (#2004)
2026-11-07 09:47:15 +08:00
bflatastic dfa6b858c8 Merge remote-tracking branch 'origin/main' into landb/1798 2026-11-07 08:45:50 +07:00
bflatastic a170ca7e3e Merge main into #1913 2026-11-07 08:45:02 +07:00
Trevor BrownandClaude Fable 5.1 aae6f55592 Merge upstream/main into fix/ui-script-fallbacks-2014
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-06 20:44:15 -05:00
BFlat cbe6c414b8 Merge pull request #2064 from storytold/carry/1932
perf(format): index the lookups that made style-heavy files quadratic
2026-11-07 09:43:25 +08:00
bflatastic 7e9a853da6 Merge main into #2047 2026-11-07 08:43:16 +07:00
Trevor Brown 546f4843f5 Merge the maintainer's merge of main (origin/fix/place-crosshair) into the local branch 2026-11-06 20:42:57 -05:00
Trevor Brown 67d5706d3a Merge the maintainer's merge of main (origin/feat/text-style-paragraph) into the local branch 2026-11-06 20:42:55 -05:00
Trevor Brown c0a27b90ad Merge the maintainer's merge of main (origin/feat/pick-select) into the local branch 2026-11-06 20:42:52 -05:00
Trevor Brown b4b4cb718a Merge the maintainer's merge of main (origin/feat/text-direction-1830) into the local branch 2026-11-06 20:42:50 -05:00
Trevor Brown c6c857bda1 Merge the maintainer's merge of main (origin/fix/ui-script-fallbacks-2014) into the local branch 2026-11-06 20:42:48 -05:00
Trevor Brown 52ba2d31f9 Merge the maintainer's merge of main (origin/feat/suggest-auto-layout-1823) into the local branch 2026-11-06 20:42:46 -05:00
Trevor Brown 6703b46671 Merge the maintainer's merge of main (origin/feat/variables-multi-select-2002) into the local branch 2026-11-06 20:42:43 -05:00
BFlat 6bbaa27f97 Merge pull request #2007 from JonRC/fix/stroke-cap-error-values
fix(engine): an unknown stroke cap lists the caps node.set takes (#2005)
2026-11-07 09:42:05 +08:00
bflatastic 22abeefae2 Merge main into #2048 2026-11-07 08:41:38 +07:00
bflatastic aa9aee4ec5 Merge main into #2010 2026-11-07 08:41:25 +07:00
bflatastic 8523dd43b4 Merge main into #2050 2026-11-07 08:41:04 +07:00
Trevor BrownandClaude Fable 5.1 08958b47ba Merge upstream/main into fix/control-arrows-pan
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-06 20:40:54 -05:00
Trevor BrownandClaude Fable 5.1 fccefb1f39 Merge upstream/main into fix/field-alt-scrub
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-06 20:40:52 -05:00
bflatastic 55c6d214f5 Merge main into #2020 2026-11-07 08:40:50 +07:00
Trevor BrownandClaude Fable 5.1 8a7414e3b0 Merge upstream/main into fix/text-mixed-fill-section
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-06 20:40:49 -05:00
Trevor BrownandClaude Fable 5.1 d7f9ef953a Merge upstream/main into fix/padding-all-sides
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-06 20:40:47 -05:00
Trevor BrownandClaude Fable 5.1 c838f2f587 Merge upstream/main into fix/place-crosshair
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-06 20:40:45 -05:00
Trevor BrownandClaude Fable 5.1 6876caff7f Merge upstream/main into fix/scrub-speed
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-06 20:40:42 -05:00
Trevor BrownandClaude Fable 5.1 1ba0e1d62a Merge upstream/main into feat/text-style-paragraph
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-06 20:40:40 -05:00
Trevor BrownandClaude Fable 5.1 973b43c1e2 Merge upstream/main into feat/pick-select
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-06 20:40:37 -05:00
Trevor BrownandClaude Fable 5.1 2a51a47e24 Merge upstream/main into fix/layers-component-contrast
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-06 20:40:34 -05:00
Trevor BrownandClaude Fable 5.1 180437539a Merge upstream/main into feat/layers-horizontal-scroll
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-06 20:40:31 -05:00
bflatastic 468cab6b2b Merge main into #2055 2026-11-07 08:40:31 +07:00
Trevor BrownandClaude Fable 5.1 0df97a91bb Merge upstream/main into fix/justify-cjk
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-06 20:40:26 -05:00
Trevor BrownandClaude Fable 5.1 171fcd2d8b Merge upstream/main into fix/vector-rounded-fill
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-06 20:40:23 -05:00
Trevor BrownandClaude Fable 5.1 5a63c08a78 Merge upstream/main into feat/text-direction-1830
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-06 20:40:21 -05:00
Trevor BrownandClaude Fable 5.1 f66b51c7f7 Merge upstream/main into fix/ui-script-fallbacks-2014
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-06 20:40:19 -05:00
Trevor BrownandClaude Fable 5.1 dd8b8ffac5 Merge upstream/main into feat/suggest-auto-layout-1823
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-06 20:40:17 -05:00
bflatastic 1b4cc8d366 Merge main into #2025 2026-11-07 08:40:16 +07:00
Trevor BrownandClaude Fable 5.1 7aad58cf2d Merge upstream/main into feat/variables-multi-select-2002
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-11-06 20:40:15 -05:00
bflatastic 593a689280 Merge main into #2049 2026-11-07 08:39:43 +07:00
BFlat 401db4beb0 Merge pull request #2046 from StrajnarFilip/claude/fix-2026-merge-layout-conflicts
M9: one auto layout edit on each side of a branch is one conflict (#2026)
2026-11-07 09:39:12 +08:00