Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 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
65b1019
wip implement variant-val
nikitalita Feb 11, 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