Brandon Thomas 54e62c0c88 Merge branch 'worktree-agent-a70a415ce57f73911' ...

# Conflicts:
#	crates/engine/src/commands/mod.rs
#	crates/engine/src/lib.rs
#	crates/ui-egui/src/panels/effect_controls.rs
#	crates/ui-egui/src/panels/mod.rs
#	crates/ui-egui/src/state.rs

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

..

anim.rs

Merge main into menu-parity branch; point AE menu entries at main's real commands

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

animation.rs

Merge main (engine menu tree) into M9.6; wire text animation menus

2026-10-02 00:44:20 -04:00

comp_more.rs

M3.4: After Effects menu-bar parity (engine menu tree, ~190 new commands, menu dialogs)

2026-10-01 22:36:31 -04:00

comp.rs

Merge main into menu-parity branch; point AE menu entries at main's real commands

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

edit.rs

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

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

effect.rs

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

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

file_more.rs

M3.4: After Effects menu-bar parity (engine menu tree, ~190 new commands, menu dialogs)

2026-10-01 22:36:31 -04:00

file.rs

M3.4: After Effects menu-bar parity (engine menu tree, ~190 new commands, menu dialogs)

2026-10-01 22:36:31 -04:00

frontend.rs

Merge main (layer styles, engine menu tree) into time/audio branch

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

help.rs

M3.4: After Effects menu-bar parity (engine menu tree, ~190 new commands, menu dialogs)

2026-10-01 22:36:31 -04:00

layer_menu.rs

Merge main into menu-parity branch; point AE menu entries at main's real commands

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

layer_time.rs

Merge main into menu-parity branch; point AE menu entries at main's real commands

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

layer.rs

Merge main (engine menu tree) into M9.6; wire text animation menus

2026-10-02 00:44:20 -04:00

link.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

mask.rs

Merge main into menu-parity branch; point AE menu entries at main's real commands

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

mod.rs

Merge branch 'worktree-agent-a70a415ce57f73911'

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

paint.rs

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

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

prop.rs

Merge main into menu-parity branch; point AE menu entries at main's real commands

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

puppet.rs

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

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

query.rs

M14.1: MCP server + agent CLI

2026-10-01 21:40:31 -04:00

render_queue.rs

Merge branch 'worktree-agent-acb4c3cd3f5057c6a' (M15.1 web build)

2026-10-02 00:41:56 -04:00

stubs.rs

M12.3: tracker core

2026-10-02 08:28:44 -04:00

styles.rs

M9.4: layer styles render + commands

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

text_anim.rs

Merge main (engine menu tree) into M9.6; wire text animation menus

2026-10-02 00:44:20 -04:00

three_d.rs

Merge main into menu-parity branch; point AE menu entries at main's real commands

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

time.rs

M3.4: After Effects menu-bar parity (engine menu tree, ~190 new commands, menu dialogs)

2026-10-01 22:36:31 -04:00

track.rs

M12.3: tracker core

2026-10-02 08:28:44 -04:00

view.rs

M3.4: After Effects menu-bar parity (engine menu tree, ~190 new commands, menu dialogs)

2026-10-01 22:36:31 -04:00