diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index 0820ab7c..1bc98c6f 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -16,7 +16,7 @@ jobs: build: runs-on: bigrunner container: - image: docker://kuruk/dcl-godot-android-builder:latest + image: docker://kuruk/dcl-godot-android-builder:4.2 volumes: - /home/user/.cache/devgodot:/github/home/.cache/devgodot steps: diff --git a/.gitignore b/.gitignore index abb7c502..5eadea8f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ exports/ -.bin/ +/.bin/ snapshots/ !tests/snapshots diff --git a/godot/addons/dcl_build_plugin/build.gd b/godot/addons/dcl_build_plugin/build.gd index 95d250c3..5a86c7b7 100644 --- a/godot/addons/dcl_build_plugin/build.gd +++ b/godot/addons/dcl_build_plugin/build.gd @@ -2,7 +2,7 @@ class_name DclBuildEditorPlugin extends EditorPlugin -const GODOT_XR_TOOLS_PLUGIN_NAME = "Godot XR Tools" +const GODOT_XR_TOOLS_PLUGIN_NAME = "godot-xr-tools" static func set_xr_mode(enabled: bool): if EditorInterface.is_plugin_enabled(GODOT_XR_TOOLS_PLUGIN_NAME) != enabled: @@ -18,13 +18,14 @@ class DclBuildPlugin extends EditorExportPlugin: const include_only_android: PackedStringArray = ["res://addons/GodotAndroidPluginMagicLink/"] func _export_begin(features, is_debug, path, flags): + prints("Start export, using XR is ", is_xr_export) + is_xr_export = features.has("xr") is_android_export = features.has("android") and !is_xr_export if is_xr_export: DclBuildEditorPlugin.set_xr_mode(true) - prints("Start export, using XR is ", is_xr_export) func _export_end(): if is_xr_export: diff --git a/godot/addons/godotopenxrvendors/khronos/.bin/debug/godotopenxrkhronos-debug.aar b/godot/addons/godotopenxrvendors/khronos/.bin/debug/godotopenxrkhronos-debug.aar new file mode 100644 index 00000000..61aaf31f Binary files /dev/null and b/godot/addons/godotopenxrvendors/khronos/.bin/debug/godotopenxrkhronos-debug.aar differ diff --git a/godot/addons/godotopenxrvendors/khronos/.bin/libgodotopenxrkhronos.linux.template_debug.x86_64.so b/godot/addons/godotopenxrvendors/khronos/.bin/libgodotopenxrkhronos.linux.template_debug.x86_64.so new file mode 100644 index 00000000..9528d05b Binary files /dev/null and b/godot/addons/godotopenxrvendors/khronos/.bin/libgodotopenxrkhronos.linux.template_debug.x86_64.so differ diff --git a/godot/addons/godotopenxrvendors/khronos/.bin/libgodotopenxrkhronos.linux.template_release.x86_64.so b/godot/addons/godotopenxrvendors/khronos/.bin/libgodotopenxrkhronos.linux.template_release.x86_64.so new file mode 100644 index 00000000..4a282456 Binary files /dev/null and b/godot/addons/godotopenxrvendors/khronos/.bin/libgodotopenxrkhronos.linux.template_release.x86_64.so differ diff --git a/godot/addons/godotopenxrvendors/khronos/.bin/libgodotopenxrkhronos.macos.template_debug.framework/libgodotopenxrkhronos.macos.template_debug b/godot/addons/godotopenxrvendors/khronos/.bin/libgodotopenxrkhronos.macos.template_debug.framework/libgodotopenxrkhronos.macos.template_debug new file mode 100644 index 00000000..aaa79463 Binary files /dev/null and b/godot/addons/godotopenxrvendors/khronos/.bin/libgodotopenxrkhronos.macos.template_debug.framework/libgodotopenxrkhronos.macos.template_debug differ diff --git a/godot/addons/godotopenxrvendors/khronos/.bin/libgodotopenxrkhronos.macos.template_release.framework/libgodotopenxrkhronos.macos.template_release b/godot/addons/godotopenxrvendors/khronos/.bin/libgodotopenxrkhronos.macos.template_release.framework/libgodotopenxrkhronos.macos.template_release new file mode 100644 index 00000000..e7de1e78 Binary files /dev/null and b/godot/addons/godotopenxrvendors/khronos/.bin/libgodotopenxrkhronos.macos.template_release.framework/libgodotopenxrkhronos.macos.template_release differ diff --git a/godot/addons/godotopenxrvendors/khronos/.bin/libgodotopenxrkhronos.windows.template_debug.x86_64.dll b/godot/addons/godotopenxrvendors/khronos/.bin/libgodotopenxrkhronos.windows.template_debug.x86_64.dll new file mode 100644 index 00000000..7921634c Binary files /dev/null and b/godot/addons/godotopenxrvendors/khronos/.bin/libgodotopenxrkhronos.windows.template_debug.x86_64.dll differ diff --git a/godot/addons/godotopenxrvendors/khronos/.bin/libgodotopenxrkhronos.windows.template_release.x86_64.dll b/godot/addons/godotopenxrvendors/khronos/.bin/libgodotopenxrkhronos.windows.template_release.x86_64.dll new file mode 100644 index 00000000..2ebe6623 Binary files /dev/null and b/godot/addons/godotopenxrvendors/khronos/.bin/libgodotopenxrkhronos.windows.template_release.x86_64.dll differ diff --git a/godot/addons/godotopenxrvendors/khronos/.bin/release/godotopenxrkhronos-release.aar b/godot/addons/godotopenxrvendors/khronos/.bin/release/godotopenxrkhronos-release.aar new file mode 100644 index 00000000..632ac62c Binary files /dev/null and b/godot/addons/godotopenxrvendors/khronos/.bin/release/godotopenxrkhronos-release.aar differ diff --git a/godot/addons/godotopenxrvendors/lynx/.bin/debug/godotopenxrlynx-debug.aar b/godot/addons/godotopenxrvendors/lynx/.bin/debug/godotopenxrlynx-debug.aar new file mode 100644 index 00000000..a2d37ff7 Binary files /dev/null and b/godot/addons/godotopenxrvendors/lynx/.bin/debug/godotopenxrlynx-debug.aar differ diff --git a/godot/addons/godotopenxrvendors/lynx/.bin/libgodotopenxrlynx.linux.template_debug.x86_64.so b/godot/addons/godotopenxrvendors/lynx/.bin/libgodotopenxrlynx.linux.template_debug.x86_64.so new file mode 100644 index 00000000..44f765cb Binary files /dev/null and b/godot/addons/godotopenxrvendors/lynx/.bin/libgodotopenxrlynx.linux.template_debug.x86_64.so differ diff --git a/godot/addons/godotopenxrvendors/lynx/.bin/libgodotopenxrlynx.linux.template_release.x86_64.so b/godot/addons/godotopenxrvendors/lynx/.bin/libgodotopenxrlynx.linux.template_release.x86_64.so new file mode 100644 index 00000000..2c89b802 Binary files /dev/null and b/godot/addons/godotopenxrvendors/lynx/.bin/libgodotopenxrlynx.linux.template_release.x86_64.so differ diff --git a/godot/addons/godotopenxrvendors/lynx/.bin/libgodotopenxrlynx.macos.template_debug.framework/libgodotopenxrlynx.macos.template_debug b/godot/addons/godotopenxrvendors/lynx/.bin/libgodotopenxrlynx.macos.template_debug.framework/libgodotopenxrlynx.macos.template_debug new file mode 100644 index 00000000..3d10faad Binary files /dev/null and b/godot/addons/godotopenxrvendors/lynx/.bin/libgodotopenxrlynx.macos.template_debug.framework/libgodotopenxrlynx.macos.template_debug differ diff --git a/godot/addons/godotopenxrvendors/lynx/.bin/libgodotopenxrlynx.macos.template_release.framework/libgodotopenxrlynx.macos.template_release b/godot/addons/godotopenxrvendors/lynx/.bin/libgodotopenxrlynx.macos.template_release.framework/libgodotopenxrlynx.macos.template_release new file mode 100644 index 00000000..a19e52bb Binary files /dev/null and b/godot/addons/godotopenxrvendors/lynx/.bin/libgodotopenxrlynx.macos.template_release.framework/libgodotopenxrlynx.macos.template_release differ diff --git a/godot/addons/godotopenxrvendors/lynx/.bin/libgodotopenxrlynx.windows.template_debug.x86_64.dll b/godot/addons/godotopenxrvendors/lynx/.bin/libgodotopenxrlynx.windows.template_debug.x86_64.dll new file mode 100644 index 00000000..357988f9 Binary files /dev/null and b/godot/addons/godotopenxrvendors/lynx/.bin/libgodotopenxrlynx.windows.template_debug.x86_64.dll differ diff --git a/godot/addons/godotopenxrvendors/lynx/.bin/libgodotopenxrlynx.windows.template_release.x86_64.dll b/godot/addons/godotopenxrvendors/lynx/.bin/libgodotopenxrlynx.windows.template_release.x86_64.dll new file mode 100644 index 00000000..67cafb0d Binary files /dev/null and b/godot/addons/godotopenxrvendors/lynx/.bin/libgodotopenxrlynx.windows.template_release.x86_64.dll differ diff --git a/godot/addons/godotopenxrvendors/lynx/.bin/release/godotopenxrlynx-release.aar b/godot/addons/godotopenxrvendors/lynx/.bin/release/godotopenxrlynx-release.aar new file mode 100644 index 00000000..945454b1 Binary files /dev/null and b/godot/addons/godotopenxrvendors/lynx/.bin/release/godotopenxrlynx-release.aar differ diff --git a/godot/addons/godotopenxrvendors/meta/.bin/debug/godotopenxrmeta-debug.aar b/godot/addons/godotopenxrvendors/meta/.bin/debug/godotopenxrmeta-debug.aar new file mode 100644 index 00000000..e3f8703b Binary files /dev/null and b/godot/addons/godotopenxrvendors/meta/.bin/debug/godotopenxrmeta-debug.aar differ diff --git a/godot/addons/godotopenxrvendors/meta/.bin/libgodotopenxrmeta.linux.template_debug.x86_64.so b/godot/addons/godotopenxrvendors/meta/.bin/libgodotopenxrmeta.linux.template_debug.x86_64.so new file mode 100644 index 00000000..8dfe87fc Binary files /dev/null and b/godot/addons/godotopenxrvendors/meta/.bin/libgodotopenxrmeta.linux.template_debug.x86_64.so differ diff --git a/godot/addons/godotopenxrvendors/meta/.bin/libgodotopenxrmeta.linux.template_release.x86_64.so b/godot/addons/godotopenxrvendors/meta/.bin/libgodotopenxrmeta.linux.template_release.x86_64.so new file mode 100644 index 00000000..d98ddcc5 Binary files /dev/null and b/godot/addons/godotopenxrvendors/meta/.bin/libgodotopenxrmeta.linux.template_release.x86_64.so differ diff --git a/godot/addons/godotopenxrvendors/meta/.bin/libgodotopenxrmeta.macos.template_debug.framework/libgodotopenxrmeta.macos.template_debug b/godot/addons/godotopenxrvendors/meta/.bin/libgodotopenxrmeta.macos.template_debug.framework/libgodotopenxrmeta.macos.template_debug new file mode 100644 index 00000000..a5862e3d Binary files /dev/null and b/godot/addons/godotopenxrvendors/meta/.bin/libgodotopenxrmeta.macos.template_debug.framework/libgodotopenxrmeta.macos.template_debug differ diff --git a/godot/addons/godotopenxrvendors/meta/.bin/libgodotopenxrmeta.macos.template_release.framework/libgodotopenxrmeta.macos.template_release b/godot/addons/godotopenxrvendors/meta/.bin/libgodotopenxrmeta.macos.template_release.framework/libgodotopenxrmeta.macos.template_release new file mode 100644 index 00000000..ab709aeb Binary files /dev/null and b/godot/addons/godotopenxrvendors/meta/.bin/libgodotopenxrmeta.macos.template_release.framework/libgodotopenxrmeta.macos.template_release differ diff --git a/godot/addons/godotopenxrvendors/meta/.bin/libgodotopenxrmeta.windows.template_debug.x86_64.dll b/godot/addons/godotopenxrvendors/meta/.bin/libgodotopenxrmeta.windows.template_debug.x86_64.dll new file mode 100644 index 00000000..357de7b2 Binary files /dev/null and b/godot/addons/godotopenxrvendors/meta/.bin/libgodotopenxrmeta.windows.template_debug.x86_64.dll differ diff --git a/godot/addons/godotopenxrvendors/meta/.bin/libgodotopenxrmeta.windows.template_release.x86_64.dll b/godot/addons/godotopenxrvendors/meta/.bin/libgodotopenxrmeta.windows.template_release.x86_64.dll new file mode 100644 index 00000000..7ff19a58 Binary files /dev/null and b/godot/addons/godotopenxrvendors/meta/.bin/libgodotopenxrmeta.windows.template_release.x86_64.dll differ diff --git a/godot/addons/godotopenxrvendors/meta/.bin/release/godotopenxrmeta-release.aar b/godot/addons/godotopenxrvendors/meta/.bin/release/godotopenxrmeta-release.aar new file mode 100644 index 00000000..4c050e7a Binary files /dev/null and b/godot/addons/godotopenxrvendors/meta/.bin/release/godotopenxrmeta-release.aar differ diff --git a/godot/addons/godotopenxrvendors/pico/.bin/debug/godotopenxrpico-debug.aar b/godot/addons/godotopenxrvendors/pico/.bin/debug/godotopenxrpico-debug.aar new file mode 100644 index 00000000..3407ec28 Binary files /dev/null and b/godot/addons/godotopenxrvendors/pico/.bin/debug/godotopenxrpico-debug.aar differ diff --git a/godot/addons/godotopenxrvendors/pico/.bin/libgodotopenxrpico.linux.template_debug.x86_64.so b/godot/addons/godotopenxrvendors/pico/.bin/libgodotopenxrpico.linux.template_debug.x86_64.so new file mode 100644 index 00000000..4714d724 Binary files /dev/null and b/godot/addons/godotopenxrvendors/pico/.bin/libgodotopenxrpico.linux.template_debug.x86_64.so differ diff --git a/godot/addons/godotopenxrvendors/pico/.bin/libgodotopenxrpico.linux.template_release.x86_64.so b/godot/addons/godotopenxrvendors/pico/.bin/libgodotopenxrpico.linux.template_release.x86_64.so new file mode 100644 index 00000000..dcad6d97 Binary files /dev/null and b/godot/addons/godotopenxrvendors/pico/.bin/libgodotopenxrpico.linux.template_release.x86_64.so differ diff --git a/godot/addons/godotopenxrvendors/pico/.bin/libgodotopenxrpico.macos.template_debug.framework/libgodotopenxrpico.macos.template_debug b/godot/addons/godotopenxrvendors/pico/.bin/libgodotopenxrpico.macos.template_debug.framework/libgodotopenxrpico.macos.template_debug new file mode 100644 index 00000000..62b40abc Binary files /dev/null and b/godot/addons/godotopenxrvendors/pico/.bin/libgodotopenxrpico.macos.template_debug.framework/libgodotopenxrpico.macos.template_debug differ diff --git a/godot/addons/godotopenxrvendors/pico/.bin/libgodotopenxrpico.macos.template_release.framework/libgodotopenxrpico.macos.template_release b/godot/addons/godotopenxrvendors/pico/.bin/libgodotopenxrpico.macos.template_release.framework/libgodotopenxrpico.macos.template_release new file mode 100644 index 00000000..046329e9 Binary files /dev/null and b/godot/addons/godotopenxrvendors/pico/.bin/libgodotopenxrpico.macos.template_release.framework/libgodotopenxrpico.macos.template_release differ diff --git a/godot/addons/godotopenxrvendors/pico/.bin/libgodotopenxrpico.windows.template_debug.x86_64.dll b/godot/addons/godotopenxrvendors/pico/.bin/libgodotopenxrpico.windows.template_debug.x86_64.dll new file mode 100644 index 00000000..86f0b9a9 Binary files /dev/null and b/godot/addons/godotopenxrvendors/pico/.bin/libgodotopenxrpico.windows.template_debug.x86_64.dll differ diff --git a/godot/addons/godotopenxrvendors/pico/.bin/libgodotopenxrpico.windows.template_release.x86_64.dll b/godot/addons/godotopenxrvendors/pico/.bin/libgodotopenxrpico.windows.template_release.x86_64.dll new file mode 100644 index 00000000..f7139633 Binary files /dev/null and b/godot/addons/godotopenxrvendors/pico/.bin/libgodotopenxrpico.windows.template_release.x86_64.dll differ diff --git a/godot/addons/godotopenxrvendors/pico/.bin/release/godotopenxrpico-release.aar b/godot/addons/godotopenxrvendors/pico/.bin/release/godotopenxrpico-release.aar new file mode 100644 index 00000000..443cd5d2 Binary files /dev/null and b/godot/addons/godotopenxrvendors/pico/.bin/release/godotopenxrpico-release.aar differ