Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
ca41f3a
initial commit for backend refactor
LilithSilver Jan 24, 2026
836bdd9
more refactor
LilithSilver Jan 24, 2026
cb28b85
remove old stuff
LilithSilver Jan 24, 2026
596d7a4
bunch more changes
LilithSilver Jan 26, 2026
0a96838
s
LilithSilver Jan 26, 2026
fcfd8d8
re-enable change ingestion
LilithSilver Jan 26, 2026
8e93c77
fix
LilithSilver Jan 26, 2026
fd6e894
reduce stupid design in branchdb
LilithSilver Jan 26, 2026
ce7c7d0
Buggy branch/merge
LilithSilver Jan 28, 2026
7b7431a
tokio-console support and deadlock fix
LilithSilver Jan 28, 2026
e16e6e8
make tokio-console optional
LilithSilver Jan 28, 2026
2af98a3
misc fixes
LilithSilver Jan 28, 2026
4d60129
fix bug in `parse_scene` where main resources did not have correct ty…
nikitalita Jan 28, 2026
d93f86c
Add text resource diffing (rebase)
nikitalita Jan 28, 2026
b2a2197
Working GUI text resource diff
nikitalita Jan 28, 2026
14c93e8
add GodotScene::get_ext_resource_path
nikitalita Jan 28, 2026
81c35bb
Fix for doc ID not saving to a file and changes not ingesting
LilithSilver Jan 29, 2026
c5c266b
Fix branch picker
LilithSilver Jan 29, 2026
f1c403b
add PatchworkEditor::import_and_save_resource_to_temp
nikitalita Jan 29, 2026
aac6c8f
add lazy load token
nikitalita Jan 29, 2026
727e539
refactor diff to not use variants in internal diff structs, use lazy …
nikitalita Jan 30, 2026
6805997
re-add sync functionality
LilithSilver Jan 30, 2026
7aa10db
Merge remote-tracking branch 'origin/diff-fix-remove-variant' into ba…
LilithSilver Jan 30, 2026
90ff966
add `PatchworkEditorimport_and_save_resource()`
nikitalita Jan 30, 2026
e44ad64
add `get_file_at_ref`, `get_files_at_ref` to project api
nikitalita Jan 30, 2026
13412e1
add `get_current_ref` to project api
nikitalita Jan 30, 2026
3d44e53
add PatchworkResourceLoader to load resources at arbitary history refs
nikitalita Jan 31, 2026
b26a966
remove ext resource caching and saving logic in differ, use resource …
nikitalita Jan 31, 2026
f15f37f
fix display issues with failed resource loads
nikitalita Jan 31, 2026
37a5bdd
minor HistoryRefPath fixes
nikitalita Jan 31, 2026
56adfb4
remove PatchworkEditor::import_and_save_resource_to_temp
nikitalita Jan 31, 2026
2b877e8
remove unused stuff in PatchworkEditor
nikitalita Jan 31, 2026
58fde88
Fix diff showing absolute paths for files
nikitalita Jan 31, 2026
dde6c39
fix paths in launch.json
nikitalita Feb 1, 2026
aff913b
add signing step to building macos plugin
nikitalita Feb 1, 2026
25bc629
just: bundle and sign editor on macos, point to bundle for launch
nikitalita Feb 1, 2026
8e294fc
Fix moddable_platformer/threadbare refs after godot-4.6 was merged
nikitalita Feb 1, 2026
adf5501
add `lldb-dap` launch profile to settings
nikitalita Feb 1, 2026
5a0a002
diff: move default value retrieval to ToGodot conversion
nikitalita Feb 6, 2026
2c84e86
implement variant parsing
nikitalita Feb 6, 2026
17892ed
Add variant to string
nikitalita Feb 6, 2026
2286cba
fixes
nikitalita Feb 6, 2026
e934cfb
fixes
nikitalita Feb 6, 2026
9421c04
fixes
nikitalita Feb 6, 2026
7cb85d1
Add check for Variant MAX to let us know when to update the variant p…
nikitalita Feb 7, 2026
714eef5
parser: move common defs to `parser_defs`
nikitalita Feb 7, 2026
dfdd8b8
fix float writing and negative parsing
nikitalita Feb 11, 2026
0c891af
fix launch.json
nikitalita Feb 11, 2026
e9cbf1e
fix compile
nikitalita Feb 11, 2026
a707607
sidebar: timeout if waiting for checked out branch for longer than 60…
nikitalita Feb 12, 2026
c7ccf25
Fix ignore globs in fs_watcher
nikitalita Feb 12, 2026
c936888
Merge pull request #128 from inkandswitch/fix-fs-watcher-and-sidebar
LilithSilver Feb 12, 2026
cbcf1ac
cleanup and de-warning
LilithSilver Feb 12, 2026
d0cee0d
fix more warnings
LilithSilver Feb 12, 2026
15c6e5a
fix globs on windows
nikitalita Feb 13, 2026
52656c2
use ignore::GitIgnore to properly fix ignore paths
nikitalita Feb 13, 2026
46e964d
fix warnings
nikitalita Feb 13, 2026
59af646
push test to ensure that windows-style paths get ignored properly
nikitalita Feb 13, 2026
181efe5
Merge branch 'backend-refactor' of silver:inkandswitch/patchwork-godo…
LilithSilver Feb 13, 2026
5fb89e7
binary doc handling (buggy)
LilithSilver Feb 17, 2026
1efb295
dump branch to disk
LilithSilver Feb 17, 2026
1da3f67
replace fork_at with fork, for now
LilithSilver Feb 17, 2026
53d0ca3
Revert "sidebar: timeout if waiting for checked out branch for longer…
LilithSilver Feb 18, 2026
4d9fa0f
save project on autostart
LilithSilver Feb 18, 2026
d56e92d
fix change ingestor bug
LilithSilver Feb 18, 2026
97f914f
fix threads not shutting down
LilithSilver Feb 19, 2026
2be49c9
add reconcile log
LilithSilver Feb 19, 2026
8ccc5f2
prevent assert in `should_ignore()`
nikitalita Feb 18, 2026
857e39a
scene parser: make `type_or_instance` optional
nikitalita Feb 18, 2026
8545310
scene parser: fix serializing/parsing `index` field
nikitalita Feb 19, 2026
9fefb1f
WIP fix for edited instance nodes without parent in current scene (NO…
nikitalita Feb 19, 2026
224ac50
scene: ensure blank line between connections and editable instances
nikitalita Feb 19, 2026
8d24bb4
text_diff: add to_unified and print_colorized
nikitalita Feb 19, 2026
f366884
fix edited instance nodes not serializing/parsing correctly
nikitalita Feb 19, 2026
ed9cbda
fix node path for parent path fallback if parent is root
nikitalita Feb 19, 2026
e4a8ce6
godot_parser: don't panic if we can't find a parent_id
nikitalita Feb 19, 2026
9de536f
prevent deadlock when refreshing after source change
nikitalita Feb 19, 2026
0e7146d
print error before panicking in GodotScene::hydrate_at
nikitalita Feb 19, 2026
2b9edc0
WIP diff fix (not working, signal emitting during GodotProject::proce…
nikitalita Feb 19, 2026
2e7c198
fix deadlock in resource loader
nikitalita Feb 19, 2026
38ead63
fix parse_scene() after deduping nodes
nikitalita Feb 19, 2026
7372d9d
Fix PatchworkResourceLoader importing file call
nikitalita Feb 19, 2026
24796b4
fix scene mangling after dedupe node fix
nikitalita Feb 20, 2026
d90347c
fix deduping on edited instance nodes
nikitalita Feb 20, 2026
2080a06
reorganization, refactoring, removing branchstate
LilithSilver Feb 20, 2026
0ce44f3
move tests to external files
LilithSilver Feb 20, 2026
11a85e3
decrease visibility
LilithSilver Feb 20, 2026
e6d9122
fix weird panic
LilithSilver Feb 20, 2026
8c045c0
fix change ingestion
LilithSilver Feb 21, 2026
90f282d
add reconcile to dummy commit
LilithSilver Feb 23, 2026
9abca57
remove variant parser
LilithSilver Feb 23, 2026
93ffd8f
fixes??
nikitalita Feb 23, 2026
eaa0dd1
godot_parser: Fix instanced nodes inside of other instanced nodes
nikitalita Feb 23, 2026
6d62d1c
fix create file not working
LilithSilver Feb 23, 2026
f6189fb
Change functions to use &str instead of &String in most places
nikitalita Feb 23, 2026
28e7e70
update godot ref to 4.6.1-stable
nikitalita Feb 23, 2026
9e50efe
finish removing variantval
LilithSilver Feb 23, 2026
fcebcd6
Revert "finish removing variantval"
LilithSilver Feb 23, 2026
0bee375
Revert "remove variant parser"
LilithSilver Feb 23, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
[target.armv7-unknown-linux-gnueabihf]
linker = "arm-linux-gnueabihf-gcc"
[target.aarch64-unknown-linux-gnu]
linker = "aarch64-linux-gnu-gcc"
linker = "aarch64-linux-gnu-gcc"
4 changes: 4 additions & 0 deletions .github/actions/build-plugin/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,15 @@ runs:
rustup target add ${{ inputs.arch }}
- name: Build for Windows and Linux
shell: sh
env:
CI: 1
if: ${{ inputs.arch != 'x86_64-apple-darwin'}}
run: |
just build-patchwork release ${{ inputs.arch }}
- name: Build for Mac
shell: sh
env:
CI: 1
if: ${{ inputs.arch == 'x86_64-apple-darwin'}}
run: |
just build-patchwork release "all-apple-darwin"
Expand Down
1 change: 1 addition & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"rust-lang.rust-analyzer",
"tamasfe.even-better-toml",
"nefrob.vscode-just-syntax",
"llvm-vs-code-extensions.lldb-dap"
// TODO: enable this once they implement a project picker
// "geequlim.godot-tools"
]
Expand Down
69 changes: 55 additions & 14 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
"type": "lldb",
"request": "launch",
"program": "",
"osx": { "program": "${workspaceFolder}/bin/godot.macos.editor.arm64" },
"osx": { "program": "${workspaceFolder}/build/godot/bin/godot_macos_editor.app/Contents/MacOS/Godot" },
"windows": { "program": "${workspaceFolder}/build/godot/bin/godot.windows.editor.x86_64.exe" },
"linux": { "program": "${workspaceFolder}/bin/godot.linux.editor.x86_64" },
"linux": { "program": "${workspaceFolder}/build/godot/bin/godot.linux.editor.x86_64" },
"args": [
"-e",
"--path",
Expand All @@ -41,9 +41,9 @@
"type": "lldb",
"request": "launch",
"program": "",
"osx": { "program": "${workspaceFolder}/bin/godot.macos.editor.dev.arm64" },
"osx": { "program": "build/godot/bin/godot_macos_editor_dev.app/Contents/MacOS/Godot" },
"windows": { "program": "${workspaceFolder}/build/godot/bin/godot.windows.editor.dev.x86_64.exe" },
"linux": { "program": "${workspaceFolder}/bin/godot.linux.editor.dev.x86_64" },
"linux": { "program": "${workspaceFolder}/build/godot/bin/godot.linux.editor.dev.x86_64" },
"args": [
"-e",
"--path",
Expand All @@ -61,9 +61,9 @@
"type": "cppvsdbg",
"request": "launch",
"program": "",
"osx": { "program": "${workspaceFolder}/bin/godot.macos.editor.arm64" },
"osx": { "program": "${workspaceFolder}/build/godot/bin/godot_macos_editor.app/Contents/MacOS/Godot" },
"windows": { "program": "${workspaceFolder}/build/godot/bin/godot.windows.editor.x86_64.exe" },
"linux": { "program": "${workspaceFolder}/bin/godot.linux.editor.x86_64" },
"linux": { "program": "${workspaceFolder}/build/godot/bin/godot.linux.editor.x86_64" },
"args": [
"-e",
"--path",
Expand All @@ -80,9 +80,9 @@
"type": "cppvsdbg",
"request": "launch",
"program": "",
"osx": { "program": "${workspaceFolder}/bin/godot.macos.editor.dev.arm64" },
"osx": { "program": "build/godot/bin/godot_macos_editor_dev.app/Contents/MacOS/Godot" },
"windows": { "program": "${workspaceFolder}/build/godot/bin/godot.windows.editor.dev.x86_64.exe" },
"linux": { "program": "${workspaceFolder}/bin/godot.linux.editor.dev.x86_64" },
"linux": { "program": "${workspaceFolder}/build/godot/bin/godot.linux.editor.dev.x86_64" },
"args": [
"-e",
"--path",
Expand All @@ -98,7 +98,7 @@
"name": "macOS: Launch moddable-platformer",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/bin/godot.macos.editor.arm64",
"program": "${workspaceFolder}/build/godot/bin/godot_macos_editor.app/Contents/MacOS/Godot",
"args": [
"-e",
"--path",
Expand All @@ -116,9 +116,9 @@
"type": "cppdbg",
"request": "launch",
"program": "",
"osx": { "program": "${workspaceFolder}/bin/godot.macos.editor.dev.arm64" },
"osx": { "program": "build/godot/bin/godot_macos_editor_dev.app/Contents/MacOS/Godot" },
"windows": { "program": "${workspaceFolder}/build/godot/bin/godot.windows.editor.dev.x86_64.exe" },
"linux": { "program": "${workspaceFolder}/bin/godot.linux.editor.dev.x86_64" },
"linux": { "program": "${workspaceFolder}/build/godot/bin/godot.linux.editor.dev.x86_64" },
"args": [
"-e",
"--path",
Expand All @@ -134,7 +134,7 @@
"name": "Linux: Launch moddable-platformer",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/bin/godot.macos.editor.arm64",
"program": "${workspaceFolder}/build/godot/bin/godot_macos_editor.app/Contents/MacOS/Godot",
"args": [
"-e",
"--path",
Expand All @@ -151,9 +151,9 @@
"type": "cppdbg",
"request": "launch",
"program": "",
"osx": { "program": "${workspaceFolder}/bin/godot.macos.editor.dev.arm64" },
"osx": { "program": "build/godot/bin/godot_macos_editor_dev.app/Contents/MacOS/Godot" },
"windows": { "program": "${workspaceFolder}/build/godot/bin/godot.windows.editor.dev.x86_64.exe" },
"linux": { "program": "${workspaceFolder}/bin/godot.linux.editor.dev.x86_64" },
"linux": { "program": "${workspaceFolder}/build/godot/bin/godot.linux.editor.dev.x86_64" },
"args": [
"-e",
"--path",
Expand All @@ -165,5 +165,46 @@
"preLaunchTask": "Build: Prepare moddable-platformer (Debug)",
"MIMode": "gdb"
},
{
"name": "lldb-dap: Launch moddable-platformer",
"type": "lldb-dap",
"request": "launch",
"program": "",
"osx": { "program": "${workspaceFolder}/build/godot/bin/godot_macos_editor.app/Contents/MacOS/Godot" },
"windows": { "program": "${workspaceFolder}/build/godot/bin/godot.windows.editor.x86_64.exe" },
"linux": { "program": "${workspaceFolder}/build/godot/bin/godot.linux.editor.x86_64" },
"args": [
"-e",
"--path",
"${workspaceFolder}/build/moddable-platformer",
],
"console": "integratedTerminal",
"cwd": "${workspaceFolder}",
"initCommands": [
"command script import ${workspaceFolder}/build/GodotFormatters/godot_formatters",
],
"preLaunchTask": "Build: Prepare moddable-platformer (Release)"
},
{
"name": "lldb-dap: Launch moddable-platformer (dev)",
"type": "lldb-dap",
"request": "launch",
"program": "",
"osx": { "program": "build/godot/bin/godot_macos_editor_dev.app/Contents/MacOS/Godot" },
"windows": { "program": "${workspaceFolder}/build/godot/bin/godot.windows.editor.dev.x86_64.exe" },
"linux": { "program": "${workspaceFolder}/build/godot/bin/godot.linux.editor.dev.x86_64" },
"args": [
"-e",
"--path",
"${workspaceFolder}/build/moddable-platformer",
],
"console": "integratedTerminal",
"cwd": "${workspaceFolder}",
"initCommands": [
"command script import ${workspaceFolder}/build/GodotFormatters/godot_formatters",
],
"preLaunchTask": "Build: Prepare moddable-platformer (Debug)"
},

]
}
Loading