Commit Graph
3105 Commits
Author SHA1 Message Date
bflatastic d178f6bfa0 Merge main into #1772; no conflicts 2026-10-30 11:19:40 +07:00
BFlat e56c916085 Merge pull request #2645 from storytold/fix/2075-stroke-width-control
Character panel: the stroke width shows its icon and a presets menu (#2075)
2026-10-30 11:07:17 +07:00
BFlat 5abef26f8d Merge pull request #2643 from storytold/fix/2102-simple-choker-test
Tests: Simple Choker keeps growing the matte down to -100 (#2102)
2026-10-30 11:07:12 +07:00
bflatastic 803837925e Merge remote-tracking branch 'origin/main' into HEAD 2026-10-30 11:06:32 +07:00
bflatastic 3f7dc9d1d1 Merge remote-tracking branch 'origin/main' into HEAD 2026-10-30 11:06:05 +07:00
bflatastic 8af1df7093 Merge remote-tracking branch 'origin/main' into HEAD 2026-10-30 11:05:29 +07:00
bflatastic d56f72d8fd Merge remote-tracking branch 'origin/main' into HEAD 2026-10-30 11:04:47 +07:00
bflatastic 06a3e82e5d Merge remote-tracking branch 'origin/main' into HEAD 2026-10-30 11:04:06 +07:00
bflatastic 876a31bd74 Merge remote-tracking branch 'origin/main' into HEAD 2026-10-30 11:03:37 +07:00
bflatastic 3a7c4fbbc7 Timeline key menu: clippy's simpler enabled condition 2026-10-30 11:02:17 +07:00
Ikki Nishihara d2bc8f862b G9: integrate current main for Japanese panel translations 2026-10-30 12:50:20 +09:00
bflatastic b04fe30bae rustfmt 2026-10-30 10:46:48 +07:00
bflatastic cdaba8cce5 rustfmt 2026-10-30 10:46:18 +07:00
bflatastic 1b3470033b Merge remote-tracking branch 'pr/2562' into HEAD
# Conflicts:
#	crates/ui-egui/src/app/frame.rs
2026-10-30 10:45:27 +07:00
bflatastic e47c9757b5 Merge remote-tracking branch 'pr/1342' into HEAD 2026-10-30 10:44:49 +07:00
bflatasticandClaude Opus 5.5 5085a1c873 Character panel: the stroke width shows its icon and a presets menu (#2075)
The stroke width was a field labelled W, which read as the width of the
text, not its stroke. It now shows the stroke-width icon (three bars,
thin to thick), sits beside the stroke order menu as before, and has a
presets menu (0.25 to 100 px) next to its value, as in After Effects;
fractional widths show their decimals.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-30 10:34:01 +07:00
bflatasticandClaude Opus 5.5 582d2c4cf3 Merge main into #1226; route main's translated Lock Aspect Ratio label and Casts Shadows automation id through labelled_checkbox, keep main's Rescan Fonts row beside the DragCheckbox filter, register both new it modules
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-30 10:32:41 +07:00
bflatasticandClaude Opus 5.5 666d929b51 Merge main into #1342; carry main's Mute/Unmute Keyframes (keys.setMuted) into the shared key_menu, gated off on locked layers like the other edits (test covers it), delete_keys keeps locked keys selected and runs main's polystar sync, keep both sides' timeline tests
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-30 10:27:51 +07:00
bflatasticandClaude Opus 5.5 b6d4090e4e Merge main into #2520; fold the PR's DefaultOutput into main's Lookup::QueueDefault (#2636) for renderQueue.add, render.preRender and file.createProxy, keep #2521's RUNS_SCRIPTS refusal with Vec<Lookup>, keep both tests, blender test expects no lookups, docs/mcp.md names all three
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-30 10:24:43 +07:00
bflatasticandClaude Opus 5.5 adff749f33 Tests: Simple Choker keeps growing the matte down to -100 (#2102)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-30 10:23:11 +07:00
bflatasticandClaude Opus 5.5 c1c6e048f4 Merge main into #2268; import both layers_or and popup_options, drop main's now-unreachable post-duplicate end_edit (the PR ends the edit first), adapt tests to main's kept empty Type-tool layer (f262e39c6)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-30 10:23:03 +07:00
bflatasticandClaude Opus 5.5 6cad825ec0 Merge main into #2562; frame.rs: keep main's color_picker::note_dialog and the PR's scope_links call
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-30 10:21:58 +07:00
bflatasticandClaude Opus 5.5 5114657519 Merge main into #1755; move ui_timeline_group_select into the tests/it binary (one integration test binary per crate)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-30 10:21:38 +07:00
Kristian Myram eef204a79e #1284: preserve maximized viewer focus when closing the queue 2026-10-30 04:20:49 +01:00
bflatasticandClaude Opus 5.5 99af8c3937 Merge main into #2638; no conflicts
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-30 10:20:16 +07:00
BFlat a934abff07 Merge pull request #2642 from storytold/fix/1961-reveal-windows
Windows: Reveal in Explorer opens File Explorer, not the browser (#1961)
2026-10-30 10:19:20 +07:00
BFlat ae56cc95b7 Merge pull request #2641 from storytold/fix/2019-sequence-folder-name
Import: a sequence of bare frame numbers is named after its folder (#2019)
2026-10-30 10:19:15 +07:00
BFlat a3f5e9dd7e Merge pull request #2637 from storytold/fix/2513-text-animate-menu
Tests: the Timeline's text Animate and Add menus add animators and properties (#2513)
2026-10-30 10:19:08 +07:00
BFlat ab5162ed95 Merge pull request #2636 from storytold/fix/2479-confined-queue-default
Automation: a confined renderQueue.add without output needs a saved project (#2479)
2026-10-30 10:19:01 +07:00
BFlat 24d5fbc0ac Merge pull request #2632 from nanox333/codex/polystar-review-followup
Polystar: synchronize inner controls after expressions and key edits
2026-10-30 10:18:56 +07:00
tylerjenningsw 7880fd0213 Merge main into enhance/audio-levels-link
# Conflicts:
#	crates/ui-egui/src/app/frame.rs
2026-10-29 22:59:39 -04:00
bflatasticandClaude Opus 5.5 b37847429c Windows: Reveal in Explorer opens File Explorer, not the browser (#1961)
Reveal in Explorer sent the folder as a file:/// URL, which egui opens
with the web browser on Windows. The frontend now opens file:// folders
in File Explorer on Windows (the engine already checks they are plain
folders); other platforms and other URLs are unchanged.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-30 09:59:01 +07:00
bflatasticandClaude Opus 5.5 f6728f2527 Import: a sequence of bare frame numbers is named after its folder (#2019)
Files named only by number (0001.png …) gave every sequence the same
name, [0001-0250].png, so five imported folders all read alike. Such a
sequence now takes its folder's name in front, plate [0001-0250].png;
named frames keep After Effects' shot_[0001-0250].png.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-30 09:58:56 +07:00
Kristian Myram bc1734f59e #1284: remove remaining double-click paint helpers 2026-10-30 03:56:25 +01:00
bflatastic baaa84ed21 Merge remote-tracking branch 'origin/main' into HEAD 2026-10-30 09:55:17 +07:00
bflatastic b766bf2fd4 Merge remote-tracking branch 'origin/main' into HEAD 2026-10-30 09:54:50 +07:00
bflatastic bf19754745 Merge remote-tracking branch 'origin/main' into HEAD 2026-10-30 09:54:28 +07:00
bflatastic 1fea0b4e3b Merge remote-tracking branch 'origin/main' into HEAD 2026-10-30 09:54:05 +07:00
bflatastic 237d1d7672 Merge remote-tracking branch 'origin/main' into HEAD 2026-10-30 09:53:42 +07:00
bflatastic 9965def87d Merge remote-tracking branch 'origin/main' into HEAD 2026-10-30 09:52:42 +07:00
Kristian Myram c51b461860 #1284: drop superseded shape tool double-click changes 2026-10-30 03:52:38 +01:00
bflatastic bdca69e6e3 Merge remote-tracking branch 'origin/main' into HEAD 2026-10-30 09:52:19 +07:00
bflatastic 8be24df08b Merge remote-tracking branch 'origin/main' into HEAD 2026-10-30 09:51:29 +07:00
Kristian Myram 2883ae9e57 #1685: discard removed property selections after undo 2026-10-30 03:27:14 +01:00
bflatastic 310068215b Merge remote-tracking branch 'pr/1328' into HEAD 2026-10-30 09:27:11 +07:00
Kristian Myram 725750eabb #1328: sample the displayed frame and guard modal ownership 2026-10-30 03:23:57 +01:00
bflatasticandClaude Opus 5.5 bd0247877c Merge main into #1601; no conflicts
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-30 09:23:46 +07:00
bflatasticandClaude Opus 5.5 9293693e9e Merge main into #2248; no conflicts
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-30 09:23:43 +07:00
bflatasticandClaude Opus 5.5 2554d3271f Merge main into #2236; no conflicts
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-30 09:23:40 +07:00
bflatasticandClaude Opus 5.5 05841f5cc6 Merge main into #1610; no conflicts
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-30 09:23:38 +07:00