pshock13/lightcraft
1
0 Fork 0
mirror of https://github.com/storytold/lightcraft.git synced 2026-10-14 19:27:01 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,765 Commits 74 Branches 9 Tags
5ce115a5057d3a9f27657cdbc76322945792d4c2
Commit Graph
1765 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Claude 5ce115a505 Merge PR #959 2026-10-11 11:51:56 +00:00
Claude 62ece65ac9 Merge PR #664 
# Conflicts:
#	crates/engine/src/tests_export.rs
#	crates/mcp/src/headless.rs
#	crates/mcp/src/tools.rs
 2026-10-11 11:50:59 +00:00
Claude 44acde3a41 Merge PR #666 
# Conflicts:
#	apps/lightcraft/src/main.rs
#	crates/engine/src/config.rs
 2026-10-11 11:50:35 +00:00
Claude c04eec3f9d Merge PR #721 
# Conflicts:
#	apps/lightcraft/src/main.rs
 2026-10-11 11:50:22 +00:00
Claude b6ad706aa6 Merge PR #712 
# Conflicts:
#	crates/engine/src/export.rs
 2026-10-11 11:50:06 +00:00
Claude 31734dea86 Merge PR #689 
# Conflicts:
#	crates/engine/src/media.rs
#	crates/raw/src/vendor/arw.rs
 2026-10-11 11:50:05 +00:00
Claude 76cf8ca4c9 Merge PR #694 
# Conflicts:
#	crates/gpu/src/backend.rs
#	docs/parity-checklist.md
 2026-10-11 11:49:53 +00:00
Claude 4e6cd5d7b9 Merge PR #704 
# Conflicts:
#	docs/parity-checklist.md
 2026-10-11 11:49:37 +00:00
Claude 9dc0d0b62b Merge PR #685 
# Conflicts:
#	crates/ui-egui/src/panels/grid.rs
#	crates/ui-egui/src/tests_panels.rs
#	docs/parity-checklist.md
 2026-10-11 11:49:25 +00:00
Claude efd29ef21a Merge branch 'claude/integrate-batch-27' into claude/integrate-batch-28 2026-10-11 11:48:59 +00:00
Claude 72d77d7b41 Batch 27: close two tests in tests_masking.rs (the merges of #884 and #766 dropped their braces) 
Co-Authored-By: Claude Opus 5.5 <[email protected]>
Claude-Session: https://claude.ai/code/session_01BKWB9TCnvzJHV6xMLAj2J4
 2026-10-11 11:48:59 +00:00
Claude 2fedd92077 Batch 28: close the faces-toggle test (the merge of #690 dropped its brace) 
Co-Authored-By: Claude Opus 5.5 <[email protected]>
Claude-Session: https://claude.ai/code/session_01BKWB9TCnvzJHV6xMLAj2J4
 2026-10-11 11:48:32 +00:00
Claude 40492d238e Merge PR #690 
# Conflicts:
#	crates/ui-egui/locales/de.json
#	crates/ui-egui/locales/es.json
#	crates/ui-egui/locales/fr.json
#	crates/ui-egui/locales/ja.json
#	crates/ui-egui/locales/pt-br.json
#	crates/ui-egui/locales/ru.json
#	crates/ui-egui/locales/uk.json
#	crates/ui-egui/locales/zh-hans.json
#	crates/ui-egui/locales/zh-hant.json
#	crates/ui-egui/src/tests_panels.rs
#	docs/parity-checklist.md
 2026-10-11 11:48:06 +00:00
Claude 8d319563ca Merge PR #710 
# Conflicts:
#	docs/parity-checklist.md
#	docs/whats-new.md
 2026-10-11 11:48:05 +00:00
Claude edb95894b4 Merge PR #695 
# Conflicts:
#	crates/engine/src/media.rs
 2026-10-11 11:47:51 +00:00
Claude 16bbaff14c Merge PR #700 
# Conflicts:
#	crates/engine/src/media.rs
#	docs/parity-checklist.md
 2026-10-11 11:47:50 +00:00
Claude db8b82c6d7 Merge PR #703 2026-10-11 11:47:28 +00:00
Claude 7c4fd3abaa Merge PR #686 2026-10-11 11:47:28 +00:00
Claude 7afbc3ecb3 Merge PR #687 2026-10-11 11:47:28 +00:00
Claude 0f9415b320 Merge PR #688 2026-10-11 11:47:28 +00:00
Claude 27d2bfda86 Merge PR #663 
# Conflicts:
#	docs/gaps.md
 2026-10-11 11:47:28 +00:00
Claude d098ffac42 Merge PR #665 2026-10-11 11:47:27 +00:00
Claude ae2d936c4d Merge PR #679 2026-10-11 11:47:27 +00:00
Claude 96988afe6d Merge PR #696 2026-10-11 11:47:26 +00:00
Claude 1f3bfbdb25 Merge PR #698 2026-10-11 11:47:26 +00:00
Claude 9847383bf2 Merge PR #711 
# Conflicts:
#	docs/parity-checklist.md
 2026-10-11 11:47:26 +00:00
Claude ab86ed7c84 Merge PR #716 
# Conflicts:
#	docs/gaps.md
 2026-10-11 11:47:26 +00:00
Claude b46adf0640 Merge PR #720 
# Conflicts:
#	docs/parity-checklist.md
 2026-10-11 11:47:25 +00:00
Claude c97b2790d3 Merge PR #843 
# Conflicts:
#	crates/engine/src/export.rs
#	docs/parity-checklist.md
 2026-10-11 11:46:15 +00:00
Claude 82f74e31fd Merge PR #727 
# Conflicts:
#	crates/raw/src/vendor/nef.rs
#	docs/parity-checklist.md
 2026-10-11 11:46:01 +00:00
Claude 1d11e5bd89 Merge PR #739 
# Conflicts:
#	crates/ui-egui/src/panels/detail.rs
#	docs/parity-checklist.md
 2026-10-11 11:45:30 +00:00
Claude 06ef27bb37 Merge PR #751 
# Conflicts:
#	docs/parity-checklist.md
 2026-10-11 11:44:45 +00:00
Claude f7730b5877 View: end_frame keeps its doc comment (#945 put lights_out under it) 
Co-Authored-By: Claude Opus 5.5 <[email protected]>
Claude-Session: https://claude.ai/code/session_01BKWB9TCnvzJHV6xMLAj2J4
 2026-10-11 11:44:33 +00:00
Claude 34b55101fe Merge PR #786 
# Conflicts:
#	crates/ui-egui/src/lib.rs
#	crates/ui-egui/src/panels/dialogs.rs
 2026-10-11 11:44:25 +00:00
Claude 3ac2b21d9e Merge PR #900 
# Conflicts:
#	docs/gaps.md
#	docs/parity-checklist.md
 2026-10-11 11:44:12 +00:00
Claude 5ced33fd9a Merge PR #951 
# Conflicts:
#	apps/lightcraft/src/main.rs
 2026-10-11 11:44:01 +00:00
Claude 0d022b7506 Merge PR #938 
# Conflicts:
#	crates/engine/src/camera_preview.rs
#	crates/engine/src/media.rs
#	docs/gaps.md
#	docs/parity-checklist.md
 2026-10-11 11:43:40 +00:00
Claude 38f16ff1b4 Merge PR #945 2026-10-11 11:43:08 +00:00
Claude 33a29dcdc3 Merge PR #907 2026-10-11 11:43:08 +00:00
Claude 36cd72bb33 Merge PR #925 2026-10-11 11:43:08 +00:00
Claude 605641ab04 Merge PR #952 2026-10-11 11:43:07 +00:00
Claude 9efc0950cf Merge PR #887 2026-10-11 11:43:07 +00:00
Claude fbc7ba042b Merge PR #890 2026-10-11 11:43:07 +00:00
Claude 4e473b2b37 Merge PR #923 2026-10-11 11:43:07 +00:00
Claude 63059a4303 Merge PR #961 2026-10-11 11:43:07 +00:00
Claude 0ea19a8a62 Merge batch 26 fmt 2026-10-11 11:43:06 +00:00
Claude 47fe7f70be Batch 26: cargo fmt over the merged PRs 
Co-Authored-By: Claude Opus 5.5 <[email protected]>
Claude-Session: https://claude.ai/code/session_01BKWB9TCnvzJHV6xMLAj2J4
 2026-10-11 11:42:57 +00:00
Claude cb5cd22bd3 Merge PR #723 
# Conflicts:
#	docs/whats-new.md
 2026-10-11 11:42:45 +00:00
Claude cba621e55c Merge PR #854 
# Conflicts:
#	crates/engine/src/media.rs
 2026-10-11 11:42:42 +00:00
Claude 4f9b77cad9 Merge PR #766 
# Conflicts:
#	crates/pipeline/src/masks.rs
#	crates/ui-egui/src/tests_masking.rs
#	docs/parity-checklist.md
 2026-10-11 11:42:20 +00:00