bump to Godot 4.3

.github/actions/import-assets/action.yml

@@ -9,7 +9,7 @@ runs:
       uses: actions/cache@v3
       with:
         path: godot/.godot
-        key: ${{ runner.os }}-godot-assets-cache
+        key: ${{ runner.os }}-godot-assets-cache-4.3-bump
 
     # Step 2: Run the command that generates/uses the assets
     - name: Import assets
@@ -21,4 +21,4 @@ runs:
       uses: actions/cache@v3
       with:
         path: godot/.godot
-        key: ${{ runner.os }}-godot-assets-cache
+        key: ${{ runner.os }}-godot-assets-cache-4.3-bump

.github/workflows/android_builds.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: bigrunner
     container:
       # image generated at: https://github.com/decentraland/godot-docker-builder
-      image: docker://kuruk/dcl-godot-android-builder:4.2
+      image: quay.io/decentraland/dcl-godot-android-builder:02ee2c576f49c1397710a6b90098549725bad4a5
       volumes:
         - /home/user/.cache/devgodot:/github/home/.cache/devgodot
     steps:

.github/workflows/docker_build_test.yml

@@ -80,5 +80,5 @@ jobs:
         with:
           name: docker-snapshots
           path: |
-            ${{ github.workspace }}/avatar-output/**/*
+            ${{ github.workspace }}/avatars-output/**/*
             ${{ github.workspace }}/scenes-output/**/*

.vscode/launch.json

@@ -33,7 +33,7 @@
       "type": "cppvsdbg",
       "request": "launch",
       "program": "${workspaceFolder}/.bin/godot/godot4_bin",
-      "args": ["--path", "${workspaceFolder}/godot", "--test"],
+      "args": ["--path", "${workspaceFolder}/godot", "--test-runner"],
       "stopAtEntry": false,
       "cwd": "${workspaceRoot}/godot",
       "environment": [
@@ -100,7 +100,7 @@
       "type": "cppdbg",
       "request": "launch",
       "program": "${workspaceFolder}/.bin/godot/godot4_bin",
-      "args": ["--path", "${workspaceFolder}/godot", "--test"],
+      "args": ["--path", "${workspaceFolder}/godot", "--test-runner"],
       "stopAtEntry": false,
       "cwd": "${workspaceRoot}/godot",
       "environment": [],

build-android-apk.sh

@@ -7,7 +7,12 @@ EXPLORER_PATH=$(pwd)
 if [ ! -d ${EXPLORER_PATH}/godot/android/ ]
 then
     echo "Checkout godot android template"
-    git clone https://github.com/decentraland/godot-explorer-android-template ${EXPLORER_PATH}/godot/android
+    git clone -b bump-4.3 https://github.com/decentraland/godot-explorer-android-template ${EXPLORER_PATH}/godot/android
+fi
+
+# temp workaround: check if JAVA_HOME is not set
+if [ -z "$JAVA_HOME" ]; then
+  export JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64"
 fi
 
 echo "Build for Linux x86_64"
@@ -18,7 +23,7 @@ cargo run -- run --only-build
 echo "Link export templates"
 mkdir -p ${HOME}/.local/share/godot/export_templates/
 cd ${HOME}/.local/share/godot/export_templates/
-ln -sf ${EXPLORER_PATH}/.bin/godot/templates/templates/ 4.2.1.stable
+ln -sf ${EXPLORER_PATH}/.bin/godot/templates/templates/ 4.3.stable
 
 set -e 
 
@@ -46,7 +51,25 @@ cd ${EXPLORER_PATH}/godot/
 
 # Build the .aab without x86_64 architecture
 echo "Export Godot android.apk"
-${EXPLORER_PATH}/.bin/godot/godot4_bin -e --headless --export-debug Android ${EXPLORER_PATH}/android.apk || true
+
+# Define the command to be executed
+COMMAND="${EXPLORER_PATH}/.bin/godot/godot4_bin -e --headless --export-debug Android ${EXPLORER_PATH}/android.apk"
+
+# Try executing the command
+if ! $COMMAND; then
+    echo "First attempt failed, retrying in 5 seconds..."
+    sleep 5 # Wait for 5 seconds before retrying
+
+    # Retry executing the command
+    if ! $COMMAND; then
+        echo "Second attempt failed."
+    else
+        echo "Second attempt succeeded."
+    fi
+else
+    echo "First attempt succeeded."
+fi
+
 ${EXPLORER_PATH}/.bin/godot/godot4_bin -e --headless --export-debug Quest ${EXPLORER_PATH}/meta-quest.apk || true
 
 

godot/addons/godot-xr-tools/hands/model/Hand_Glove_L.gltf.import

@@ -17,6 +17,7 @@ nodes/root_type="Node3D"
 nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=0

godot/addons/godot-xr-tools/hands/model/Hand_Glove_R.gltf.import

@@ -17,6 +17,7 @@ nodes/root_type="Node3D"
 nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=0

godot/addons/godot-xr-tools/hands/model/Hand_Glove_low_L.gltf.import

@@ -17,6 +17,7 @@ nodes/root_type="Node3D"
 nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=0

godot/addons/godot-xr-tools/hands/model/Hand_Glove_low_R.gltf.import

@@ -17,6 +17,7 @@ nodes/root_type="Node3D"
 nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=0

godot/addons/godot-xr-tools/hands/model/Hand_Nails_L.gltf.import

@@ -17,6 +17,7 @@ nodes/root_type="Node3D"
 nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=0

godot/addons/godot-xr-tools/hands/model/Hand_Nails_R.gltf.import

@@ -17,6 +17,7 @@ nodes/root_type="Node3D"
 nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=0

godot/addons/godot-xr-tools/hands/model/Hand_Nails_low_L.gltf.import

@@ -17,6 +17,7 @@ nodes/root_type="Node3D"
 nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=0

godot/addons/godot-xr-tools/hands/model/Hand_Nails_low_R.gltf.import

@@ -17,6 +17,7 @@ nodes/root_type="Node3D"
 nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=0

godot/addons/godot-xr-tools/hands/model/Hand_low_L.gltf.import

@@ -17,6 +17,7 @@ nodes/root_type="Node3D"
 nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=0

godot/addons/godot-xr-tools/hands/model/Hand_low_R.gltf.import

@@ -17,6 +17,7 @@ nodes/root_type="Node3D"
 nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=0

godot/addons/godot-xr-tools/hands/model/hand_l.gltf.import

@@ -17,6 +17,7 @@ nodes/root_type="Node3D"
 nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=0

godot/addons/godot-xr-tools/hands/model/hand_r.gltf.import

@@ -17,6 +17,7 @@ nodes/root_type="Node3D"
 nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=0

godot/addons/godotopenxrvendors/.gitignore

@@ -0,0 +1,2 @@
+# Ignore copies of the binaries Godot makes at startup
+.bin/windows/*/*/~*.dll

godot/addons/godotopenxrvendors/GodotOpenXRVendors_CHANGES.md

@@ -1,8 +1,27 @@
 # Change history for the Godot OpenXR loaders asset
 
-## 2.0.4
-- Fix misc crash when reloading project on Godot 4.3
-- Fix issue with only the first permission being requested
+## 3.0.1
+- Fixed hand tracking issue
+
+## 3.0.0
+- Merge GDExtension into a single implementation
+- Upgrade Android, Gradle, Godot and Kotlin dependencies
+- Add XR_FB_face_tracking support
+- Update to OpenXR 1.0.34 headers
+- Add XR_FB_render_model extension wrapper and OpenXRFBRenderModel node
+- Add XR_FB_passthrough extension wrapper
+- Add XR_FB_hand_tracking_mesh extension wrapper and OpenXRFbHandTrackingMesh node
+- Add XR_FB_hand_tracking_aim support
+- Update Meta OpenXR mobile SDK to version 62
+- Add a developer-facing API for interacting with scene anchors
+- Add support for developer-created spatial anchors via XR_FB_spatial_entity
+- Add XR_FB_hand_tracking_capsules extension wrapper
+- Add OpenXRFbPassthroughGeometry node
+- Add OpenXRMetaPassthroughColorLut
+- Add feature flags to Khronos loader for HTC
+- Add XR_HTC_passthrough extension wrapper
+- Add manifest entries to Pico and switch Pico to using the Khronos Loader
+- Add Meta Passthrough tutorial doc
 
 ## 2.0.3
 - Migrate the export scripts from gdscript to C++ via gdextension