Brandon Thomas 0631ef29dc Merge branch 'worktree-agent-ae879257b39393c25' ...

# Conflicts:
#	docs/parity.md

2026-10-02 22:56:18 -04:00

..

anim_tools.rs

M6.6: mask tracking + mask interpolation; M12.5: Warp Stabilizer

2026-10-02 21:14:29 -04:00

comp_settings.rs

M3.1: AE Composition Settings dialog (Basic/Advanced/3D Renderer, AE presets, pixel aspect, start timecode, resize anchor)

2026-10-01 21:57:08 -04:00

dialogs_3d.rs

M7.2: 3D viewer — 3D views, camera tools, camera/light wireframes, Camera/Light Settings dialogs

2026-10-01 22:01:37 -04:00

dialogs.rs

ANM-6, CMP-5, CMP-3: Wiggler/Smoother/Motion Sketch, marker dialog + timeline markers, pre-compose options + comp navigator

2026-10-02 10:47:02 -04:00

effect_controls.rs

M6.7: refine edge + freeze + UI

2026-10-02 22:27:22 -04:00

effects_presets.rs

M9.8: effects & presets panel (favourites, recently used, animation presets, search highlight, contents menu)

2026-10-02 09:05:18 -04:00

flowchart.rs

CMP-6: Flowchart panel

2026-10-02 22:30:04 -04:00

forms.rs

IO-2/SHP-5/PRV-2: PSD import, SVG import + vector/text conversions, persistent disk cache

2026-10-02 22:10:48 -04:00

fx_widgets.rs

M9.7: effect controls widgets (EFF-1/EFF-2)

2026-10-02 09:05:17 -04:00

graph_tools.rs

M5.8: motion paths + graph transform box

2026-10-02 10:22:51 -04:00

graph.rs

M5.8: motion paths + graph transform box

2026-10-02 10:22:51 -04:00

home.rs

UI-7: Home screen with recent projects, thumbnails and community links

2026-10-02 22:26:14 -04:00

info.rs

M12.2: viewer on gpu

2026-10-02 11:06:05 -04:00

key_dialogs.rs

M5.2–M5.5: keyframe clipboard, easy ease, velocity/interpolation dialogs, roving, time remap/stretch/reverse/freeze, graph editor, separate dimensions, pick-whip

2026-10-01 21:47:29 -04:00

layer_panel.rs

M6.7: refine edge + freeze + UI

2026-10-02 22:27:22 -04:00

markers_ui.rs

ANM-6, CMP-5, CMP-3: Wiggler/Smoother/Motion Sketch, marker dialog + timeline markers, pre-compose options + comp navigator

2026-10-02 10:47:02 -04:00

misc.rs

CMP-6: Flowchart panel

2026-10-02 22:30:04 -04:00

mod.rs

Merge branch 'worktree-agent-af1868dabbf03697e'

2026-10-02 22:49:26 -04:00

paint_panels.rs

M13.1/M13.2: paint (Brush, Clone Stamp, Eraser) and puppet pins

2026-10-02 09:12:10 -04:00

precomp.rs

ANM-6, CMP-5, CMP-3: Wiggler/Smoother/Motion Sketch, marker dialog + timeline markers, pre-compose options + comp navigator

2026-10-02 10:47:02 -04:00

project.rs

Merge branch 'main' into worktree-agent-aba3d925078471ad6

2026-10-02 22:18:29 -04:00

properties.rs

M9.10: on-canvas text editing

2026-10-02 10:34:13 -04:00

puppet_tool.rs

M13.1/M13.2: paint (Brush, Clone Stamp, Eraser) and puppet pins

2026-10-02 09:12:10 -04:00

render_queue.rs

OUT-2: WebM export (VP9 intra encoder + alpha, Opus), WAV/AIFF audio-only outputs

2026-10-02 22:28:15 -04:00

roto_tool.rs

M6.7: refine edge + freeze + UI

2026-10-02 22:27:22 -04:00

script_console.rs

M14.4: scripting with an After Effects-style JavaScript object model

2026-10-02 22:13:09 -04:00

settings.rs

M3.7: auto-save + crash recovery

2026-10-02 09:15:04 -04:00

shortcut_editor.rs

M14.3: keyboard shortcut editor

2026-10-02 09:14:54 -04:00

text_panels.rs

M9.10: on-canvas text editing

2026-10-02 10:34:13 -04:00

timeline.rs

Merge branch 'worktree-agent-ae879257b39393c25'

2026-10-02 22:56:18 -04:00

tracker.rs

M6.6: mask tracking + mask interpolation; M12.5: Warp Stabilizer

2026-10-02 21:14:29 -04:00

viewer_overlays.rs

M0.13: viewer snapping, rulers, channels, snapshots, ROI

2026-10-02 10:16:05 -04:00

viewer_text.rs

Merge main into text editing (M9.10)

2026-10-02 10:46:31 -04:00

viewer_tools.rs

M0.13: viewer snapping, rulers, channels, snapshots, ROI

2026-10-02 10:16:05 -04:00

viewer.rs

M6.6: mask tracking + mask interpolation; M12.5: Warp Stabilizer

2026-10-02 21:14:29 -04:00

waveform.rs

M11.2: audio playback + waveforms + audio effects

2026-10-02 00:16:34 -04:00