FredApps
d4d786e63c
Merge branch 'codex/dng-capture-info' into codex/dng-opcode-interpreter
2026-11-16 15:04:42 +01:00
FredApps
33098a9c77
Merge branch 'codex/dng-metadata' into codex/dng-capture-info
2026-11-16 15:04:25 +01:00
FredApps
da1fa1fb8c
Merge branch 'codex/filmcraft-shared-dng-opcodes' into codex/dng-metadata
2026-11-16 15:04:08 +01:00
FredApps
1ccd567a59
dng: stage opcode encoding with fallible allocations; make the parity GainMap fixture valid
2026-11-16 15:04:04 +01:00
FredApps
a509410b90
Merge branch 'codex/dng-capture-info' into codex/dng-opcode-interpreter
2026-11-16 14:09:37 +01:00
FredApps
a99d28ee3d
Merge branch 'codex/dng-metadata' into codex/dng-capture-info
2026-11-16 14:09:23 +01:00
FredApps
025e07a649
Merge codex/filmcraft-shared-dng-opcodes in (craft-tiff and craft-raw at craft-libs main 402dfe46, #1857 )
2026-11-16 14:09:09 +01:00
FredApps
a3fa27cbbe
Merge branch 'codex/filmcraft-shared-dng-raw' into codex/filmcraft-shared-dng-opcodes
2026-11-16 14:08:38 +01:00
FredApps
d5f95243aa
Pin craft-tiff and craft-raw to craft-libs main 402dfe46 ( #1857 : short lossy JPEG strips)
2026-11-16 14:08:24 +01:00
FredApps
8c8c4fc215
Merge remote-tracking branch 'origin/main' into codex/filmcraft-shared-dng-raw
2026-11-16 14:07:33 +01:00
Dylan M. Taylor
baeca9db89
Merge pull request #4837 from gmrmad1/fix/4774-ruler-press-stop-count
...
tests: a ruler press while stopped is not counted across the scrub linger (#4774 )
2026-11-16 08:07:31 -05:00
Dylan M. Taylor
9bac134d95
Merge pull request #4856 from storytold/codex/filmcraft-shared-omf
...
interchange: use shared OMF schema reader and writer
2026-11-16 07:23:11 -05:00
FredApps
50092c2193
Merge pull request #4899 from storytold/codex/filmcraft-ale-shared
...
interchange: read and write ALE through craft-timeline
2026-11-16 12:45:40 +01:00
FredApps
e48e905715
Merge pull request #4876 from storytold/codex/filmcraft-edl-report-limit
...
Preserve the diagnostic limit in shared EDL parsing
2026-11-16 12:44:10 +01:00
FredApps
837165d66d
Merge the DNG capture-info cutover in (craft-tiff and craft-raw at craft-libs main eafb50af)
2026-11-16 12:13:57 +01:00
FredApps
467674fb5a
Merge the DNG metadata cutover in (craft-tiff and craft-raw at craft-libs main eafb50af)
2026-11-16 12:13:26 +01:00
FredApps
59e7e25c4d
Merge the DNG opcode cutover in and pin craft-tiff and craft-raw to craft-libs main eafb50af ( #1647 , #1648 , #1653 )
2026-11-16 12:12:45 +01:00
FredApps
abb5a7d259
interchange: keep the extension helper test-only now OMF writing is shared
2026-11-16 11:29:29 +01:00
FredApps
5d16257156
Merge remote-tracking branch 'origin/main' into codex/filmcraft-shared-omf
2026-11-16 11:27:28 +01:00
FredApps
fc21200cdf
Merge remote-tracking branch 'origin/main' into codex/filmcraft-edl-report-limit
2026-11-16 11:26:26 +01:00
FredApps
8e001ff875
Merge pull request #4874 from storytold/codex/filmcraft-fcp7-shared
...
Route FCP7 XML through shared timeline interchange
2026-11-16 11:26:13 +01:00
FredApps
2fd8883dee
interchange: read and write ALE through craft-timeline (craft-libs #778 )
2026-11-16 11:25:06 +01:00
FredApps
b004028b84
Merge pull request #4873 from storytold/codex/filmcraft-fcpxml-shared
...
Route FCPXML through shared timeline interchange
2026-11-16 11:15:36 +01:00
FredApps
ed4ceeb0c0
Merge branch 'codex/filmcraft-shared-dng-raw' into codex/filmcraft-shared-dng-opcodes
2026-11-16 10:55:28 +01:00
FredApps
bc10a454d7
Merge branch 'main' into codex/filmcraft-shared-omf
...
# Conflicts:
# Cargo.lock
2026-11-16 10:55:11 +01:00
FredApps
4f8bad4bde
Merge branch 'main' into codex/filmcraft-shared-dng-raw
2026-11-16 10:54:47 +01:00
FredApps
c9fc3b1227
dng: keep the public raw::unpack, delegating to craft-raw
2026-11-16 10:54:47 +01:00
FredApps
90d2cfe631
Merge pull request #4881 from storytold/codex/filmcraft-sfnt-shared
...
Use shared bounded SFNT metadata discovery
2026-11-16 10:53:58 +01:00
FredApps
74dbe5818d
Merge pull request #4872 from storytold/codex/filmcraft-otio-conversion
...
Route OTIO through shared timeline interchange
2026-11-16 10:48:11 +01:00
FredApps
4b40db56b6
Merge branch 'codex/filmcraft-fcp7-shared' into codex/filmcraft-edl-report-limit; pin craft-timeline and craft-captions to craft-libs main ( #1693 )
2026-11-16 10:38:21 +01:00
FredApps
793a753638
Merge branch 'codex/filmcraft-fcpxml-shared' into codex/filmcraft-fcp7-shared; pin craft-timeline and craft-captions to craft-libs main ( #1685 )
2026-11-16 10:27:38 +01:00
FredApps
6616b471fa
Merge branch 'codex/filmcraft-otio-conversion' into codex/filmcraft-fcpxml-shared
...
# Conflicts:
# Cargo.lock
2026-11-16 10:24:37 +01:00
Zinadin Zidan
92bea95646
Properties panel: a text property change applies to every selected text clip ( #4625 ) ( #4793 )
...
With several text clips selected, the Properties panel shows the first
one, and every property it changed was sent as `graphics.set` with that
clip alone, so Font, Font Size and the other properties changed only the
first clip.
`graphics.set` can take `clips` in place of `clip`: the same props on
that layer of each listed graphic clip, in one undo step (the merge key
names every target, so a drag stays one step), and an error on any clip
changes none. The graphic editor sends the clip it shows plus every other
selected graphic clip whose layer at the same place is the same kind of
layer, leaving out clips on locked tracks. Character styles of a Type-tool
selection still go to the clip being edited.
2026-11-16 10:23:12 +01:00
FredApps
1100c97715
Merge branch 'codex/filmcraft-shared-dng-raw' into codex/filmcraft-shared-dng-opcodes
...
# Conflicts:
# Cargo.lock
# Cargo.toml
2026-11-16 10:12:49 +01:00
FredApps
ca96c24ef8
Merge branch 'main' into codex/filmcraft-shared-dng-raw; pin craft-tiff and craft-raw to craft-libs main ( #1644 , #1645 )
2026-11-16 10:12:14 +01:00
FredApps
412c0fae73
Resolve the Cargo.toml merge conflict left in the previous commit
2026-11-16 10:10:35 +01:00
FredApps
dec26d938e
Merge branch 'main' into codex/filmcraft-sfnt-shared
...
# Conflicts:
# Cargo.toml
2026-11-16 10:10:17 +01:00
FredApps
7ec9eba7dd
Merge branch 'main' into codex/filmcraft-otio-conversion
...
# Conflicts:
# Cargo.lock
2026-11-16 10:10:01 +01:00
FredApps
925f451030
Merge pull request #4853 from storytold/codex/filmcraft-shared-bento
...
interchange: use shared Bento container for OMF
2026-11-16 09:59:25 +01:00
FredApps
379a04e137
Merge pull request #4883 from storytold/codex/filmcraft-control-shared
...
Use shared authenticated control protocol
2026-11-16 09:58:11 +01:00
FredApps
219c376e6f
interchange: merge shared report counts in one step per entry
2026-11-16 09:57:42 +01:00
Dylan M. Taylor
f67bc20b3f
Merge pull request #4276 from nuclearspike/codex/perf-harness-clock-20261104
...
test(ui): align performance harness clock with worker yields
2026-11-16 03:46:21 -05:00
FredApps
59636fcfa5
Merge branch 'codex/filmcraft-shared-bento' into codex/filmcraft-shared-omf
...
# Conflicts:
# Cargo.lock
2026-11-16 09:39:27 +01:00
FredApps
9481cf2900
dng tests: parity reuses the equivalence test's sample generator
2026-11-16 09:29:00 +01:00
FredApps
ae61ca2ab3
interchange: one shared-timeline import and export path for FCPXML and FCP7 XML
2026-11-16 09:28:06 +01:00
FredApps
b2667aa018
Merge branch 'codex/filmcraft-fcpxml-shared' into codex/filmcraft-fcp7-shared
...
# Conflicts:
# Cargo.lock
# Cargo.toml
# crates/interchange/src/lib.rs
2026-11-16 09:27:14 +01:00
FredApps
d97f9b909e
Merge branch 'main' into codex/filmcraft-shared-bento
...
# Conflicts:
# Cargo.lock
# Cargo.toml
2026-11-16 09:26:00 +01:00
FredApps
f513752851
Merge pull request #4847 from storytold/refactor/shared-tga
...
refactor(media): cut TGA decoding over to craft-libs
2026-11-16 09:25:30 +01:00
FredApps
f781d419de
Merge branch 'main' into codex/filmcraft-control-shared
...
# Conflicts:
# Cargo.toml
2026-11-16 09:15:15 +01:00
FredApps
7220f42241
Merge branch 'main' into codex/filmcraft-sfnt-shared
...
# Conflicts:
# Cargo.lock
# Cargo.toml
2026-11-16 09:15:14 +01:00