diff --git a/.github/workflows/deployment-pr.yml b/.github/workflows/deployment-pr.yml index 33655a73..848f9745 100644 --- a/.github/workflows/deployment-pr.yml +++ b/.github/workflows/deployment-pr.yml @@ -24,7 +24,7 @@ jobs: editor-binary-name: MirrorGodotEditorWindows.exe editor-binary-download: MirrorGodotEditorWindows.exe editor-binary-branch: dev - editor-template-directory: ~/AppData/Roaming/Godot/export_templates/4.3.beta + editor-template-directory: ~/AppData/Roaming/Godot/export_templates/4.3.stable template-binary-workflow: deployment.yml template-binary-name: windows_release_x86_64.exe template-binary-branch: themirror @@ -35,8 +35,8 @@ jobs: bucket-name: no-bucket os: ${{ github.event.repository.name != 'the-mirror' && 'windows-mirror' || 'windows-latest' }} # TODO: This will be dynamic in future and we can't do that immediately as we have to focus on the deployment side. - editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/a6443c6c/MirrorGodotEditorWindows.exe - template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/a6443c6c/windows_release_x86_64.exe + editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/2ed330c2/MirrorGodotEditorWindows.exe + template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/2ed330c2/windows_release_x86_64.exe build-macos-client: name: 🍎 Build MacOS Dev PR uses: ./.github/workflows/client-build-tool.yml @@ -50,7 +50,7 @@ jobs: editor-binary-download: MirrorGodotEditorMac.app.zip editor-binary-name: MirrorGodotEditorMac.app/Contents/MacOS/Godot editor-binary-branch: themirror - editor-template-directory: ~/Library/Application\ Support/Godot/export_templates/4.3.beta + editor-template-directory: ~/Library/Application\ Support/Godot/export_templates/4.3.stable template-binary-workflow: deployment.yml template-binary-name: macos_template.app.zip template-binary-branch: dev @@ -61,8 +61,8 @@ jobs: bucket-name: no-bucket os: ${{ github.event.repository.name != 'the-mirror' && 'macos-mirror' || 'macos-latest' }} # TODO: This will be dynamic in future and we can't do that immediately as we have to focus on the deployment side. - editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/a6443c6c/MirrorGodotEditorMac.app.zip - template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/a6443c6c/macos_template.app.zip + editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/2ed330c2/MirrorGodotEditorMac.app.zip + template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/2ed330c2/macos_template.app.zip build-linux-client: name: 🐧 Build Linux Dev PR uses: ./.github/workflows/client-build-tool.yml @@ -74,7 +74,7 @@ jobs: editor-binary-name: MirrorGodotEditorLinux.x86_64 editor-binary-download: MirrorGodotEditorLinux.x86_64 editor-binary-branch: dev - editor-template-directory: ~/.local/share/godot/export_templates/4.3.beta + editor-template-directory: ~/.local/share/godot/export_templates/4.3.stable template-binary-workflow: deployment.yml template-binary-name: linux_release.x86_64 template-binary-branch: themirror @@ -85,5 +85,5 @@ jobs: bucket-name: no-bucket os: ${{ github.event.repository.name != 'the-mirror' && 'linux-mirror' || 'ubuntu-22.04' }} # TODO: This will be dynamic in future and we can't do that immediately as we have to focus on the deployment side. - editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/a6443c6c/MirrorGodotEditorLinux.x86_64 - template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/a6443c6c/linux_release.x86_64 + editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/2ed330c2/MirrorGodotEditorLinux.x86_64 + template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/2ed330c2/linux_release.x86_64 diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index e35d565c..c312aadc 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -37,7 +37,7 @@ jobs: editor-binary-name: MirrorGodotEditorWindows.exe editor-binary-download: MirrorGodotEditorWindows.exe editor-binary-branch: dev - editor-template-directory: ~/AppData/Roaming/Godot/export_templates/4.3.beta + editor-template-directory: ~/AppData/Roaming/Godot/export_templates/4.3.stable template-binary-workflow: deployment.yml template-binary-name: windows_release_x86_64.exe template-binary-branch: themirror @@ -65,7 +65,7 @@ jobs: editor-binary-download: MirrorGodotEditorMac.app.zip editor-binary-name: MirrorGodotEditorMac.app/Contents/MacOS/Godot editor-binary-branch: themirror - editor-template-directory: ~/Library/Application\ Support/Godot/export_templates/4.3.beta + editor-template-directory: ~/Library/Application\ Support/Godot/export_templates/4.3.stable template-binary-workflow: deployment.yml template-binary-name: macos_template.app.zip template-binary-branch: dev @@ -91,7 +91,7 @@ jobs: editor-binary-name: MirrorGodotEditorLinux.x86_64 editor-binary-download: MirrorGodotEditorLinux.x86_64 editor-binary-branch: dev - editor-template-directory: ~/.local/share/godot/export_templates/4.3.beta + editor-template-directory: ~/.local/share/godot/export_templates/4.3.stable template-binary-workflow: deployment.yml template-binary-name: linux_release.x86_64 template-binary-branch: themirror diff --git a/README.md b/README.md index 9d05399b..bf592683 100644 --- a/README.md +++ b/README.md @@ -60,9 +60,9 @@ This repo is The Mirror's source code: the Godot app (client/server), the web se 1. Git clone the repository (you do **not** need to clone with submodules; they are optional) 2. Download the precompiled Mirror fork of Godot engine (required to use) -- Windows: [Download](https://storage.googleapis.com/mirror_native_client_builds/Engine/a6443c6c/MirrorGodotEditorWindows.exe) -- Mac: **v buggy**; taking contributions for fixes :) [Download](https://storage.googleapis.com/mirror_native_client_builds/Engine/a6443c6c/MirrorGodotEditorMac.app.zip). On Mac you will see a zip file; extract it and open the editor binary with CMD + Right-Click then select the Open option. -- Linux: [Download](https://storage.googleapis.com/mirror_native_client_builds/Engine/a6443c6c/MirrorGodotEditorLinux.x86_64) +- Windows: [Download](https://storage.googleapis.com/mirror_native_client_builds/Engine/2ed330c2/MirrorGodotEditorWindows.exe) +- Mac: **v buggy**; taking contributions for fixes :) [Download](https://storage.googleapis.com/mirror_native_client_builds/Engine/2ed330c2/MirrorGodotEditorMac.app.zip). On Mac you will see a zip file; extract it and open the editor binary with CMD + Right-Click then select the Open option. +- Linux: [Download](https://storage.googleapis.com/mirror_native_client_builds/Engine/2ed330c2/MirrorGodotEditorLinux.x86_64) 1. Open the Godot editor (The Mirror fork), click import, and choose the `project.godot` from the `/mirror-godot-app` folder. Note that if you see this popup, you can safely ignore it and proceed. diff --git a/godot-engine b/godot-engine index a6443c6c..2ed330c2 160000 --- a/godot-engine +++ b/godot-engine @@ -1 +1 @@ -Subproject commit a6443c6c0fbc4cd2c72f4e1aa822fcd548308e63 +Subproject commit 2ed330c2b86131def435b1f809e52b003f026c7e diff --git a/mirror-godot-app/addons/godotopenxrvendors/.bin/android/debug/godotopenxrkhronos-debug.aar b/mirror-godot-app/addons/godotopenxrvendors/.bin/android/debug/godotopenxrkhronos-debug.aar index 11e87e07..d3ebbb4f 100644 Binary files a/mirror-godot-app/addons/godotopenxrvendors/.bin/android/debug/godotopenxrkhronos-debug.aar and b/mirror-godot-app/addons/godotopenxrvendors/.bin/android/debug/godotopenxrkhronos-debug.aar differ diff --git a/mirror-godot-app/addons/godotopenxrvendors/.bin/android/debug/godotopenxrlynx-debug.aar b/mirror-godot-app/addons/godotopenxrvendors/.bin/android/debug/godotopenxrlynx-debug.aar index 9d16df10..f432aa23 100644 Binary files a/mirror-godot-app/addons/godotopenxrvendors/.bin/android/debug/godotopenxrlynx-debug.aar and b/mirror-godot-app/addons/godotopenxrvendors/.bin/android/debug/godotopenxrlynx-debug.aar differ diff --git a/mirror-godot-app/addons/godotopenxrvendors/.bin/android/debug/godotopenxrmeta-debug.aar b/mirror-godot-app/addons/godotopenxrvendors/.bin/android/debug/godotopenxrmeta-debug.aar index e0c5609c..e28037ba 100644 Binary files a/mirror-godot-app/addons/godotopenxrvendors/.bin/android/debug/godotopenxrmeta-debug.aar and b/mirror-godot-app/addons/godotopenxrvendors/.bin/android/debug/godotopenxrmeta-debug.aar differ diff --git a/mirror-godot-app/addons/godotopenxrvendors/.bin/android/debug/godotopenxrpico-debug.aar b/mirror-godot-app/addons/godotopenxrvendors/.bin/android/debug/godotopenxrpico-debug.aar index 9d25228e..cc5e2942 100644 Binary files a/mirror-godot-app/addons/godotopenxrvendors/.bin/android/debug/godotopenxrpico-debug.aar and b/mirror-godot-app/addons/godotopenxrvendors/.bin/android/debug/godotopenxrpico-debug.aar differ diff --git a/mirror-godot-app/addons/godotopenxrvendors/.bin/android/release/godotopenxrkhronos-release.aar b/mirror-godot-app/addons/godotopenxrvendors/.bin/android/release/godotopenxrkhronos-release.aar index d5e4bafe..16c1242a 100644 Binary files a/mirror-godot-app/addons/godotopenxrvendors/.bin/android/release/godotopenxrkhronos-release.aar and b/mirror-godot-app/addons/godotopenxrvendors/.bin/android/release/godotopenxrkhronos-release.aar differ diff --git a/mirror-godot-app/addons/godotopenxrvendors/.bin/android/release/godotopenxrlynx-release.aar b/mirror-godot-app/addons/godotopenxrvendors/.bin/android/release/godotopenxrlynx-release.aar index bcad37b4..e98daf6e 100644 Binary files a/mirror-godot-app/addons/godotopenxrvendors/.bin/android/release/godotopenxrlynx-release.aar and b/mirror-godot-app/addons/godotopenxrvendors/.bin/android/release/godotopenxrlynx-release.aar differ diff --git a/mirror-godot-app/addons/godotopenxrvendors/.bin/android/release/godotopenxrmeta-release.aar b/mirror-godot-app/addons/godotopenxrvendors/.bin/android/release/godotopenxrmeta-release.aar index d2e7ca85..3cb5a1eb 100644 Binary files a/mirror-godot-app/addons/godotopenxrvendors/.bin/android/release/godotopenxrmeta-release.aar and b/mirror-godot-app/addons/godotopenxrvendors/.bin/android/release/godotopenxrmeta-release.aar differ diff --git a/mirror-godot-app/addons/godotopenxrvendors/.bin/android/release/godotopenxrpico-release.aar b/mirror-godot-app/addons/godotopenxrvendors/.bin/android/release/godotopenxrpico-release.aar index bf4606b8..8157a6bd 100644 Binary files a/mirror-godot-app/addons/godotopenxrvendors/.bin/android/release/godotopenxrpico-release.aar and b/mirror-godot-app/addons/godotopenxrvendors/.bin/android/release/godotopenxrpico-release.aar differ diff --git a/mirror-godot-app/addons/godotopenxrvendors/.bin/android/template_debug/arm64/libgodotopenxrvendors.so b/mirror-godot-app/addons/godotopenxrvendors/.bin/android/template_debug/arm64/libgodotopenxrvendors.so index 1cb56461..5faad700 100644 Binary files a/mirror-godot-app/addons/godotopenxrvendors/.bin/android/template_debug/arm64/libgodotopenxrvendors.so and b/mirror-godot-app/addons/godotopenxrvendors/.bin/android/template_debug/arm64/libgodotopenxrvendors.so differ diff --git a/mirror-godot-app/addons/godotopenxrvendors/.bin/android/template_release/arm64/libgodotopenxrvendors.so b/mirror-godot-app/addons/godotopenxrvendors/.bin/android/template_release/arm64/libgodotopenxrvendors.so index cda814b2..704d3834 100644 Binary files a/mirror-godot-app/addons/godotopenxrvendors/.bin/android/template_release/arm64/libgodotopenxrvendors.so and b/mirror-godot-app/addons/godotopenxrvendors/.bin/android/template_release/arm64/libgodotopenxrvendors.so differ diff --git a/mirror-godot-app/addons/godotopenxrvendors/.bin/linux/template_debug/x86_64/libgodotopenxrvendors.so b/mirror-godot-app/addons/godotopenxrvendors/.bin/linux/template_debug/x86_64/libgodotopenxrvendors.so index 1ca1dd9f..98b31765 100644 Binary files a/mirror-godot-app/addons/godotopenxrvendors/.bin/linux/template_debug/x86_64/libgodotopenxrvendors.so and b/mirror-godot-app/addons/godotopenxrvendors/.bin/linux/template_debug/x86_64/libgodotopenxrvendors.so differ diff --git a/mirror-godot-app/addons/godotopenxrvendors/.bin/linux/template_release/x86_64/libgodotopenxrvendors.so b/mirror-godot-app/addons/godotopenxrvendors/.bin/linux/template_release/x86_64/libgodotopenxrvendors.so index eb17b834..f95286e0 100644 Binary files a/mirror-godot-app/addons/godotopenxrvendors/.bin/linux/template_release/x86_64/libgodotopenxrvendors.so and b/mirror-godot-app/addons/godotopenxrvendors/.bin/linux/template_release/x86_64/libgodotopenxrvendors.so differ diff --git a/mirror-godot-app/addons/godotopenxrvendors/.bin/macos/template_debug/libgodotopenxrvendors.macos.framework/libgodotopenxrvendors.macos b/mirror-godot-app/addons/godotopenxrvendors/.bin/macos/template_debug/libgodotopenxrvendors.macos.framework/libgodotopenxrvendors.macos index 3ab6e975..736996df 100644 Binary files a/mirror-godot-app/addons/godotopenxrvendors/.bin/macos/template_debug/libgodotopenxrvendors.macos.framework/libgodotopenxrvendors.macos and b/mirror-godot-app/addons/godotopenxrvendors/.bin/macos/template_debug/libgodotopenxrvendors.macos.framework/libgodotopenxrvendors.macos differ diff --git a/mirror-godot-app/addons/godotopenxrvendors/.bin/macos/template_release/libgodotopenxrvendors.macos.framework/libgodotopenxrvendors.macos b/mirror-godot-app/addons/godotopenxrvendors/.bin/macos/template_release/libgodotopenxrvendors.macos.framework/libgodotopenxrvendors.macos index 7c171817..824ca510 100644 Binary files a/mirror-godot-app/addons/godotopenxrvendors/.bin/macos/template_release/libgodotopenxrvendors.macos.framework/libgodotopenxrvendors.macos and b/mirror-godot-app/addons/godotopenxrvendors/.bin/macos/template_release/libgodotopenxrvendors.macos.framework/libgodotopenxrvendors.macos differ diff --git a/mirror-godot-app/addons/godotopenxrvendors/.bin/windows/template_debug/x86_64/libgodotopenxrvendors.dll b/mirror-godot-app/addons/godotopenxrvendors/.bin/windows/template_debug/x86_64/libgodotopenxrvendors.dll index 2490bdc0..fe482c62 100644 Binary files a/mirror-godot-app/addons/godotopenxrvendors/.bin/windows/template_debug/x86_64/libgodotopenxrvendors.dll and b/mirror-godot-app/addons/godotopenxrvendors/.bin/windows/template_debug/x86_64/libgodotopenxrvendors.dll differ diff --git a/mirror-godot-app/addons/godotopenxrvendors/.bin/windows/template_release/x86_64/libgodotopenxrvendors.dll b/mirror-godot-app/addons/godotopenxrvendors/.bin/windows/template_release/x86_64/libgodotopenxrvendors.dll index e837eb06..6309669d 100644 Binary files a/mirror-godot-app/addons/godotopenxrvendors/.bin/windows/template_release/x86_64/libgodotopenxrvendors.dll and b/mirror-godot-app/addons/godotopenxrvendors/.bin/windows/template_release/x86_64/libgodotopenxrvendors.dll differ diff --git a/mirror-godot-app/addons/godotopenxrvendors/GodotOpenXRVendors_CHANGES.md b/mirror-godot-app/addons/godotopenxrvendors/GodotOpenXRVendors_CHANGES.md index d8030b31..5e9d812c 100644 --- a/mirror-godot-app/addons/godotopenxrvendors/GodotOpenXRVendors_CHANGES.md +++ b/mirror-godot-app/addons/godotopenxrvendors/GodotOpenXRVendors_CHANGES.md @@ -1,5 +1,8 @@ # Change history for the Godot OpenXR loaders asset +## 3.0.1 +- Fixed hand tracking issue + ## 3.0.0 - Merge GDExtension into a single implementation - Upgrade Android, Gradle, Godot and Kotlin dependencies @@ -18,6 +21,7 @@ - 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 diff --git a/mirror-godot-app/addons/godotopenxrvendors/meta/LICENSE.txt b/mirror-godot-app/addons/godotopenxrvendors/meta/LICENSE.txt index c2c569e9..6516fa3b 100644 --- a/mirror-godot-app/addons/godotopenxrvendors/meta/LICENSE.txt +++ b/mirror-godot-app/addons/godotopenxrvendors/meta/LICENSE.txt @@ -1,3 +1,3 @@ Copyright © Facebook Technologies, LLC and its affiliates. All rights reserved. -Your use of this SDK or tool is subject to the Oculus SDK License Agreement, available at https://developer.oculus.com/licenses/oculussdk/ +Your use of this SDK or tool is subject to the Oculus SDK License Agreement, available at https://developer.oculus.com/licenses/oculussdk/ \ No newline at end of file diff --git a/mirror-godot-app/creator/asset_inventory/browser/file_search_theme.tres b/mirror-godot-app/creator/asset_inventory/browser/file_search_theme.tres index b4285d5d..d908f491 100644 --- a/mirror-godot-app/creator/asset_inventory/browser/file_search_theme.tres +++ b/mirror-godot-app/creator/asset_inventory/browser/file_search_theme.tres @@ -1,8 +1,5 @@ -[gd_resource type="Theme" load_steps=8 format=3 uid="uid://iixsh1y7xih1"] +[gd_resource type="Theme" load_steps=5 format=3 uid="uid://iixsh1y7xih1"] -[ext_resource type="Texture2D" uid="uid://cf0ttxyympec2" path="res://ui/art/arrow_backward/light.png" id="1_2w3ie"] -[ext_resource type="Texture2D" uid="uid://cxhv0vxb5q0lh" path="res://ui/art/arrow_forward/light.png" id="2_yrnax"] -[ext_resource type="Texture2D" uid="uid://xt1vcp0ji5k4" path="res://ui/art/arrow_up/light.png" id="3_iiaw6"] [ext_resource type="StyleBox" uid="uid://bbs54ft14uu3q" path="res://ui/common/buttons/gray/gray_normal.stylebox.tres" id="4_1r451"] [ext_resource type="FontVariation" uid="uid://cjhnx2nsio76o" path="res://ui/common/fonts/montserrat/montserrat_regular_letter_spaced.tres" id="4_5rqby"] @@ -24,9 +21,9 @@ expand_margin_top = 40.0 [resource] Button/styles/hover = SubResource("StyleBoxEmpty_e3ljp") -FileDialog/icons/back_folder = ExtResource("1_2w3ie") -FileDialog/icons/forward_folder = ExtResource("2_yrnax") -FileDialog/icons/parent_folder = ExtResource("3_iiaw6") +FileDialog/icons/back_folder = null +FileDialog/icons/forward_folder = null +FileDialog/icons/parent_folder = null MarginContainer/constants/margin_bottom = 20 MarginContainer/constants/margin_left = 20 MarginContainer/constants/margin_right = 20 diff --git a/mirror-godot-app/creator/creator_ui.theme.tres b/mirror-godot-app/creator/creator_ui.theme.tres index a3d65858..c314892c 100644 --- a/mirror-godot-app/creator/creator_ui.theme.tres +++ b/mirror-godot-app/creator/creator_ui.theme.tres @@ -1,15 +1,10 @@ -[gd_resource type="Theme" load_steps=46 format=3 uid="uid://d1qd6ity2mdpl"] +[gd_resource type="Theme" load_steps=41 format=3 uid="uid://d1qd6ity2mdpl"] [ext_resource type="FontVariation" uid="uid://bwp6hb31ol8la" path="res://ui/new_player_ui/inventory/title_font_bold.tres" id="1_qhqot"] [ext_resource type="StyleBox" uid="uid://biwid7pf726cm" path="res://ui/new_player_ui/inventory/panel_light_blue_rounded.tres" id="2_qkk8i"] [ext_resource type="StyleBox" uid="uid://d0agfj0dkjits" path="res://ui/new_player_ui/inventory/panel_light_blue_rounded_hover.tres" id="3_608lk"] [ext_resource type="StyleBox" uid="uid://bxdufxik1y0yu" path="res://ui/new_player_ui/inventory/panel_light_blue_rounded_pressed.tres" id="4_7gl5v"] -[ext_resource type="FontFile" uid="uid://dhpbqmk3ulim4" path="res://ui/common/fonts/montserrat/montserrat_bold.ttf" id="5_6nu1u"] -[ext_resource type="FontFile" uid="uid://bjwepurchoc75" path="res://ui/ui_rect_and_font/montserrat/static/montserrat_semi_bold.ttf" id="5_51sdf"] -[ext_resource type="FontFile" uid="uid://bpw8ywxvp8ctj" path="res://ui/common/fonts/montserrat/montserrat_regular.ttf" id="6_3wysr"] -[ext_resource type="FontFile" uid="uid://cgyrixnr8bppj" path="res://ui/common/fonts/montserrat/montserrat_medium.ttf" id="7_lkgfu"] [ext_resource type="StyleBox" uid="uid://dcdx4uxyjvmqv" path="res://ui/new_player_ui/inventory/panel_transparent_bg.tres" id="8_54h55"] -[ext_resource type="FontFile" uid="uid://cyqoty8fo8udu" path="res://ui/ui_rect_and_font/montserrat/static/montserrat_regular.ttf" id="9_fj6hh"] [ext_resource type="StyleBox" uid="uid://uqa5bs2gkql3" path="res://creator/common/theme/panel_slot_active.stylebox.tres" id="11_1dgo2"] [ext_resource type="StyleBox" uid="uid://bd8ph5tqojh8w" path="res://creator/common/theme/panel_slot_hover.stylebox.tres" id="12_6n06b"] @@ -256,7 +251,6 @@ corner_radius_bottom_right = 13 corner_radius_bottom_left = 13 [sub_resource type="FontVariation" id="FontVariation_0g3hl"] -base_font = ExtResource("7_lkgfu") spacing_top = 6 spacing_bottom = 6 @@ -360,7 +354,7 @@ Button/colors/font_color_hover = Color(0.94, 0.94, 0.94, 1) Button/colors/font_color_pressed = Color(1, 1, 1, 1) Button/constants/hseparation = 2 Button/font_sizes/font_size = 11 -Button/fonts/font = ExtResource("7_lkgfu") +Button/fonts/font = null Button/styles/disabled = SubResource("StyleBoxFlat_xvxpf") Button/styles/focus = ExtResource("2_qkk8i") Button/styles/hover = ExtResource("3_608lk") @@ -398,11 +392,11 @@ CheckBox/styles/normal = SubResource("StyleBoxEmpty_7qqml") CheckBox/styles/pressed = SubResource("StyleBoxEmpty_6hx7e") HSeparator/styles/separator = SubResource("StyleBoxLine_wh0xl") Label/font_sizes/font_size = 11 -Label/fonts/font = ExtResource("5_6nu1u") +Label/fonts/font = null LabelRegular/base_type = &"Label" -LabelRegular/fonts/font = ExtResource("6_3wysr") +LabelRegular/fonts/font = null LineEdit/font_sizes/font_size = 11 -LineEdit/fonts/font = ExtResource("5_51sdf") +LineEdit/fonts/font = null LineEdit/styles/focus = SubResource("StyleBoxFlat_j44l2") LineEdit/styles/normal = SubResource("StyleBoxFlat_1nv1v") LineEditSearch/base_type = &"LineEdit" @@ -411,12 +405,12 @@ LineEditSearch/colors/font_color = Color(1, 1, 1, 1) LineEditSearch/colors/font_placeholder_color = Color(0.505882, 0.517647, 0.568627, 1) LineEditSearch/colors/font_selected_color = Color(1, 1, 1, 1) LineEditSearch/font_sizes/font_size = 11 -LineEditSearch/fonts/font = ExtResource("7_lkgfu") +LineEditSearch/fonts/font = null LineEditSearch/styles/focus = ExtResource("8_54h55") LineEditSearch/styles/normal = ExtResource("8_54h55") LineEditSearch/styles/read_only = ExtResource("8_54h55") OptionButton/constants/arrow_margin = 8 -OptionButton/fonts/font = ExtResource("6_3wysr") +OptionButton/fonts/font = null OptionButton/styles/hover = SubResource("StyleBoxFlat_i2qij") OptionButton/styles/normal = SubResource("StyleBoxFlat_1mtcs") OptionButton/styles/pressed = SubResource("StyleBoxFlat_1mtcs") @@ -445,7 +439,7 @@ TabContainer/styles/tab_unselected = SubResource("StyleBoxEmpty_yh1yp") TextEdit/styles/focus = SubResource("StyleBoxFlat_l5bl3") TextEdit/styles/normal = SubResource("StyleBoxFlat_3jtke") TooltipLabel/colors/font_color = Color(1, 1, 1, 1) -TooltipLabel/fonts/font = ExtResource("6_3wysr") +TooltipLabel/fonts/font = null TooltipPanel/styles/panel = SubResource("StyleBoxFlat_nwu4w") VSeparator/styles/separator = SubResource("StyleBoxLine_brdol") WindowDialog/colors/title_color = Color(1, 1, 1, 1) @@ -453,7 +447,7 @@ WindowDialog/constants/close_h_ofs = 18 WindowDialog/constants/close_v_ofs = 18 WindowDialog/constants/scaleborder_size = 4 WindowDialog/constants/title_height = 20 -WindowDialog/fonts/title_font = ExtResource("9_fj6hh") +WindowDialog/fonts/title_font = null WindowDialog/icons/close = null WindowDialog/icons/close_highlight = null WindowDialog/styles/panel = SubResource("StyleBoxFlat_jcfy7") diff --git a/mirror-godot-app/creator/selection/scene_hierarchy/scene_hierarchy_main.theme.tres b/mirror-godot-app/creator/selection/scene_hierarchy/scene_hierarchy_main.theme.tres index 90ec3b24..bb4c7372 100644 --- a/mirror-godot-app/creator/selection/scene_hierarchy/scene_hierarchy_main.theme.tres +++ b/mirror-godot-app/creator/selection/scene_hierarchy/scene_hierarchy_main.theme.tres @@ -1,13 +1,8 @@ -[gd_resource type="Theme" load_steps=28 format=3 uid="uid://cmn57tuwfayaa"] +[gd_resource type="Theme" load_steps=23 format=3 uid="uid://cmn57tuwfayaa"] -[ext_resource type="FontFile" uid="uid://cgyrixnr8bppj" path="res://ui/common/fonts/montserrat/montserrat_medium.ttf" id="1_l5u5o"] [ext_resource type="StyleBox" uid="uid://biwid7pf726cm" path="res://ui/new_player_ui/inventory/panel_light_blue_rounded.tres" id="2_hirdd"] [ext_resource type="StyleBox" uid="uid://d0agfj0dkjits" path="res://ui/new_player_ui/inventory/panel_light_blue_rounded_hover.tres" id="3_00lpo"] [ext_resource type="StyleBox" uid="uid://bxdufxik1y0yu" path="res://ui/new_player_ui/inventory/panel_light_blue_rounded_pressed.tres" id="4_ci6um"] -[ext_resource type="FontFile" uid="uid://dhpbqmk3ulim4" path="res://ui/common/fonts/montserrat/montserrat_bold.ttf" id="7_arrhg"] -[ext_resource type="FontFile" uid="uid://bpw8ywxvp8ctj" path="res://ui/common/fonts/montserrat/montserrat_regular.ttf" id="8_k3pt8"] -[ext_resource type="Texture2D" uid="uid://d31drr4014mav" path="res://creator/selection/scene_hierarchy/icons/down_arrow_padding.svg" id="12_a7uh6"] -[ext_resource type="Texture2D" uid="uid://b5fnwwbi3gbuf" path="res://creator/selection/scene_hierarchy/icons/right_arrow_padding.svg" id="13_hg215"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_gwi6x"] bg_color = Color(0.254902, 0.254902, 0.254902, 1) @@ -161,7 +156,7 @@ Button/colors/font_color_hover = Color(0.94, 0.94, 0.94, 1) Button/colors/font_color_pressed = Color(1, 1, 1, 1) Button/constants/hseparation = 2 Button/font_sizes/font_size = 11 -Button/fonts/font = ExtResource("1_l5u5o") +Button/fonts/font = null Button/styles/disabled = SubResource("StyleBoxFlat_gwi6x") Button/styles/focus = ExtResource("2_hirdd") Button/styles/hover = ExtResource("3_00lpo") @@ -180,9 +175,9 @@ ButtonLarge/styles/normal = SubResource("StyleBoxFlat_2eqk7") ButtonLarge/styles/pressed = SubResource("StyleBoxFlat_xjomr") HSeparator/styles/separator = SubResource("StyleBoxLine_vxl3u") Label/font_sizes/font_size = 11 -Label/fonts/font = ExtResource("7_arrhg") +Label/fonts/font = null LabelRegular/base_type = &"Label" -LabelRegular/fonts/font = ExtResource("8_k3pt8") +LabelRegular/fonts/font = null Panel/styles/panel = SubResource("StyleBoxFlat_p74sg") PanelContainer/styles/panel = SubResource("StyleBoxEmpty_6d6jx") PanelContainerPopup/base_type = &"PanelContainer" @@ -192,7 +187,7 @@ PanelSlotActive/styles/panel = SubResource("StyleBoxFlat_4aegr") PanelSlotHover/base_type = &"Panel" PanelSlotHover/styles/panel = SubResource("StyleBoxFlat_re17b") TooltipLabel/colors/font_color = Color(1, 1, 1, 1) -TooltipLabel/fonts/font = ExtResource("8_k3pt8") +TooltipLabel/fonts/font = null TooltipPanel/styles/panel = SubResource("StyleBoxFlat_2emhc") Tree/colors/font_color = Color(1, 1, 1, 1) Tree/colors/guide_color = Color(0, 0, 0, 0.333333) @@ -203,9 +198,9 @@ Tree/constants/scrollbar_h_separation = 0 Tree/constants/scrollbar_margin_right = 2 Tree/constants/v_separation = 11 Tree/font_sizes/font_size = 11 -Tree/fonts/font = ExtResource("1_l5u5o") -Tree/icons/arrow = ExtResource("12_a7uh6") -Tree/icons/arrow_collapsed = ExtResource("13_hg215") +Tree/fonts/font = null +Tree/icons/arrow = null +Tree/icons/arrow_collapsed = null Tree/styles/button_pressed = SubResource("StyleBoxEmpty_ugmvp") Tree/styles/cursor = SubResource("StyleBoxEmpty_lsmgx") Tree/styles/cursor_unfocused = SubResource("StyleBoxEmpty_x6iuc") diff --git a/mirror-godot-app/creator/tools/build_bar/build_bar.theme.tres b/mirror-godot-app/creator/tools/build_bar/build_bar.theme.tres index 3411ff7b..e3dd4fb2 100644 --- a/mirror-godot-app/creator/tools/build_bar/build_bar.theme.tres +++ b/mirror-godot-app/creator/tools/build_bar/build_bar.theme.tres @@ -1,8 +1,4 @@ -[gd_resource type="Theme" load_steps=11 format=3 uid="uid://dqjg12tafkeu2"] - -[ext_resource type="FontFile" uid="uid://bjwepurchoc75" path="res://ui/ui_rect_and_font/montserrat/static/montserrat_semi_bold.ttf" id="1_01mxr"] -[ext_resource type="Texture2D" uid="uid://dcxshtwsv4wbm" path="res://ui/art/checkbox_checked.svg" id="2_u0i3h"] -[ext_resource type="Texture2D" uid="uid://ctucqgbgww85m" path="res://ui/art/checkbox_unchecked.svg" id="3_lgfr8"] +[gd_resource type="Theme" load_steps=8 format=3 uid="uid://dqjg12tafkeu2"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_y1lmj"] content_margin_left = 4.0 @@ -74,16 +70,16 @@ bg_color = Color(0, 0, 0, 1) [resource] Button/font_sizes/font_size = 11 -Button/fonts/font = ExtResource("1_01mxr") +Button/fonts/font = null Button/styles/disabled = SubResource("StyleBoxFlat_y1lmj") Button/styles/focus = SubResource("StyleBoxEmpty_g10io") Button/styles/hover = SubResource("StyleBoxFlat_sb54j") Button/styles/normal = SubResource("StyleBoxFlat_lj6cp") Button/styles/pressed = SubResource("StyleBoxFlat_5bpis") -CheckBox/icons/checked = ExtResource("2_u0i3h") -CheckBox/icons/unchecked = ExtResource("3_lgfr8") +CheckBox/icons/checked = null +CheckBox/icons/unchecked = null Label/font_sizes/font_size = 11 -Label/fonts/font = ExtResource("1_01mxr") -LineEdit/fonts/font = ExtResource("1_01mxr") +Label/fonts/font = null +LineEdit/fonts/font = null LineEdit/styles/normal = SubResource("StyleBoxFlat_tr7k2") PanelContainer/styles/panel = SubResource("StyleBoxFlat_ii6xw") diff --git a/mirror-godot-app/creator/tools/build_bar/build_bar_big_button.theme.tres b/mirror-godot-app/creator/tools/build_bar/build_bar_big_button.theme.tres index 17f1b739..c0e1e990 100644 --- a/mirror-godot-app/creator/tools/build_bar/build_bar_big_button.theme.tres +++ b/mirror-godot-app/creator/tools/build_bar/build_bar_big_button.theme.tres @@ -1,8 +1,4 @@ -[gd_resource type="Theme" load_steps=11 format=3 uid="uid://d0fkg8nosw1bd"] - -[ext_resource type="FontFile" uid="uid://bjwepurchoc75" path="res://ui/ui_rect_and_font/montserrat/static/montserrat_semi_bold.ttf" id="1_01mxr"] -[ext_resource type="Texture2D" uid="uid://dcxshtwsv4wbm" path="res://ui/art/checkbox_checked.svg" id="2_u0i3h"] -[ext_resource type="Texture2D" uid="uid://ctucqgbgww85m" path="res://ui/art/checkbox_unchecked.svg" id="3_lgfr8"] +[gd_resource type="Theme" load_steps=8 format=3 uid="uid://d0fkg8nosw1bd"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_y1lmj"] content_margin_left = 8.0 @@ -74,16 +70,16 @@ bg_color = Color(0, 0, 0, 1) [resource] Button/font_sizes/font_size = 11 -Button/fonts/font = ExtResource("1_01mxr") +Button/fonts/font = null Button/styles/disabled = SubResource("StyleBoxFlat_y1lmj") Button/styles/focus = SubResource("StyleBoxEmpty_g10io") Button/styles/hover = SubResource("StyleBoxFlat_sb54j") Button/styles/normal = SubResource("StyleBoxFlat_lj6cp") Button/styles/pressed = SubResource("StyleBoxFlat_5bpis") -CheckBox/icons/checked = ExtResource("2_u0i3h") -CheckBox/icons/unchecked = ExtResource("3_lgfr8") +CheckBox/icons/checked = null +CheckBox/icons/unchecked = null Label/font_sizes/font_size = 11 -Label/fonts/font = ExtResource("1_01mxr") -LineEdit/fonts/font = ExtResource("1_01mxr") +Label/fonts/font = null +LineEdit/fonts/font = null LineEdit/styles/normal = SubResource("StyleBoxFlat_tr7k2") PanelContainer/styles/panel = SubResource("StyleBoxFlat_ii6xw") diff --git a/mirror-godot-app/creator/tools/build_bar/build_bar_social_button.theme.tres b/mirror-godot-app/creator/tools/build_bar/build_bar_social_button.theme.tres index 3ed523bd..25816ac8 100644 --- a/mirror-godot-app/creator/tools/build_bar/build_bar_social_button.theme.tres +++ b/mirror-godot-app/creator/tools/build_bar/build_bar_social_button.theme.tres @@ -1,6 +1,4 @@ -[gd_resource type="Theme" load_steps=6 format=3 uid="uid://b2jbwic4wjvr0"] - -[ext_resource type="FontFile" uid="uid://cv5tkor0qdxqq" path="res://ui/common/fonts/fontawesome-free-6/Font Awesome 6 Free-Solid-900.otf" id="1_hxu1k"] +[gd_resource type="Theme" load_steps=5 format=3 uid="uid://b2jbwic4wjvr0"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_4wgjg"] @@ -17,7 +15,7 @@ corner_radius_bottom_left = 4 [resource] Button/font_sizes/font_size = 23 -Button/fonts/font = ExtResource("1_hxu1k") +Button/fonts/font = null Button/styles/focus = SubResource("StyleBoxEmpty_4wgjg") Button/styles/hover = SubResource("StyleBoxEmpty_1honx") Button/styles/normal = SubResource("StyleBoxEmpty_dljkk") diff --git a/mirror-godot-app/creator/tools/build_bar/social_container.theme.tres b/mirror-godot-app/creator/tools/build_bar/social_container.theme.tres index 9fe1e597..95324293 100644 --- a/mirror-godot-app/creator/tools/build_bar/social_container.theme.tres +++ b/mirror-godot-app/creator/tools/build_bar/social_container.theme.tres @@ -1,6 +1,4 @@ -[gd_resource type="Theme" load_steps=4 format=3 uid="uid://kdr0mkqddh65"] - -[ext_resource type="FontFile" uid="uid://dh4xtfcbcu8ur" path="res://ui/common/fonts/TheMirrorIcons.otf" id="1_i5i0m"] +[gd_resource type="Theme" load_steps=3 format=3 uid="uid://kdr0mkqddh65"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_h5rd2"] @@ -12,7 +10,6 @@ corner_radius_bottom_right = 6 corner_radius_bottom_left = 6 [resource] -default_font = ExtResource("1_i5i0m") default_font_size = 21 Button/styles/focus = SubResource("StyleBoxEmpty_h5rd2") Button/styles/hover = SubResource("StyleBoxFlat_oj0oq") diff --git a/mirror-godot-app/creator/tools/theme/creator_ui_button_large.theme.tres b/mirror-godot-app/creator/tools/theme/creator_ui_button_large.theme.tres index 3466c899..6cc8d38a 100644 --- a/mirror-godot-app/creator/tools/theme/creator_ui_button_large.theme.tres +++ b/mirror-godot-app/creator/tools/theme/creator_ui_button_large.theme.tres @@ -1,6 +1,4 @@ -[gd_resource type="Theme" load_steps=7 format=3 uid="uid://dcdayhoxjwduq"] - -[ext_resource type="FontFile" uid="uid://cgyrixnr8bppj" path="res://ui/common/fonts/montserrat/montserrat_medium.ttf" id="7_lkgfu"] +[gd_resource type="Theme" load_steps=6 format=3 uid="uid://dcdayhoxjwduq"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_5lk6h"] content_margin_left = 6.0 @@ -110,7 +108,7 @@ Button/colors/icon_normal_color = Color(0.145098, 0.419608, 0.984314, 1) Button/colors/icon_pressed_color = Color(1, 1, 1, 1) Button/constants/hseparation = 2 Button/font_sizes/font_size = 12 -Button/fonts/font = ExtResource("7_lkgfu") +Button/fonts/font = null Button/styles/disabled = SubResource("StyleBoxFlat_5lk6h") Button/styles/focus = SubResource("StyleBoxFlat_p48so") Button/styles/hover = SubResource("StyleBoxFlat_08h8l") diff --git a/mirror-godot-app/dummy.md b/mirror-godot-app/dummy.md index 75ea9812..0a813b71 100644 --- a/mirror-godot-app/dummy.md +++ b/mirror-godot-app/dummy.md @@ -1 +1 @@ -This file is used to force a rebuild in github actions... +This file is used to force a rebuild in github actions.... diff --git a/mirror-godot-app/gameplay/space_object/heightmap/heightmap_material.tres b/mirror-godot-app/gameplay/space_object/heightmap/heightmap_material.tres index 237c86ee..bfbcc1d7 100644 --- a/mirror-godot-app/gameplay/space_object/heightmap/heightmap_material.tres +++ b/mirror-godot-app/gameplay/space_object/heightmap/heightmap_material.tres @@ -1,8 +1,6 @@ -[gd_resource type="ShaderMaterial" load_steps=7 format=3 uid="uid://bl3v1c1r23n63"] +[gd_resource type="ShaderMaterial" load_steps=5 format=3 uid="uid://bl3v1c1r23n63"] [ext_resource type="Shader" path="res://gameplay/space_object/heightmap/heightmap_shader.gdshader" id="1_upstu"] -[ext_resource type="Texture2D" uid="uid://db7lrvdglwiw4" path="res://gameplay/space_object/heightmap/checker-texture.png" id="2_fxoc6"] -[ext_resource type="CompressedTexture3D" uid="uid://7qq35u8ac45t" path="res://art/textures/perlworlnoise.png" id="2_igqjo"] [sub_resource type="Gradient" id="Gradient_2h1ui"] offsets = PackedFloat32Array(0.344444, 0.608333) @@ -30,15 +28,12 @@ shader_parameter/colormap_strength = 0.5 shader_parameter/colormap_present = false shader_parameter/offset_normal = Vector2(1, 0) shader_parameter/texture_noise = SubResource("NoiseTexture2D_084j2") -shader_parameter/texture_noise_3d = ExtResource("2_igqjo") shader_parameter/albedo_top = Color(1, 1, 1, 1) shader_parameter/uv_scale_top = 0.1 shader_parameter/normal_strength_top = 1.5 shader_parameter/roughness_offset_top = 0.1 shader_parameter/layer_height_top = 0.5 -shader_parameter/texture_albedo_top = ExtResource("2_fxoc6") shader_parameter/albedo_side = Color(1, 1, 1, 1) shader_parameter/uv_scale_side = 0.1 shader_parameter/normal_strength_side = 1.5 shader_parameter/layer_height_side = 0.0 -shader_parameter/texture_albedo_side = ExtResource("2_fxoc6") diff --git a/mirror-godot-app/player/animations/humanoid/running_backward_right.tres b/mirror-godot-app/player/animations/humanoid/running_backward_right.tres index 67364b34..e6ce93ba 100644 --- a/mirror-godot-app/player/animations/humanoid/running_backward_right.tres +++ b/mirror-godot-app/player/animations/humanoid/running_backward_right.tres @@ -66,7 +66,7 @@ tracks/8/enabled = true tracks/8/path = NodePath("Armature/Skeleton3D:LeftArm") tracks/8/interp = 1 tracks/8/loop_wrap = true -tracks/8/keys = PackedFloat32Array(0, 1, 0.559988, 0.162752, -0.306184, 0.752447, 0.0333333, 1, 0.559988, 0.162752, -0.306184, 0.752447, 0.0666667, 1, 0.54606, 0.148412, -0.269379, 0.779248, 0.1, 1, 0.504481, 0.144176, -0.266332, 0.808566, 0.133333, 1, 0.443873, 0.118886, -0.27443, 0.844708, 0.166667, 1, 0.376758, 0.0594835, -0.254539, 0.888665, 0.2, 1, 0.321703, -0.00616479, -0.202588, 0.924893, 0.233333, 1, 0.302289, -0.0377999, -0.163657, 0.938301, 0.266667, 1, 0.313941, -0.017181, -0.16093, 0.935546, 0.3, 1, 0.337715, 0.0454168, -0.164932, 0.925572, 0.333333, 1, 0.375605, 0.119068, -0.15769, 0.905471, 0.366667, 1, 0.416467, 0.183249, -0.163769, 0.875302, 0.4, 1, 0.436281, 0.238278, -0.202785, 0.843659, 0.433333, 1, 0.438487, 0.277266, -0.266867, 0.812179, 0.466667, 1, 0.434667, 0.294355, -0.349294, 0.776153, 0.5, 1, 0.431092, 0.296981, -0.423927, 0.739086, 0.533333, 1, 0.440079, 0.287024, -0.446623, 0.724207, 0.566667, 1, 0.463027, 0.264283, -0.421589, 0.7335, 0.6, 1, 0.49908, 0.231978, -0.383202, 0.741796, 0.633333, 1, 0.540841, 0.194499, -0.345009, 0.742045, 0.666667, 1, 0.559988, 0.162753, -0.306184, 0.752447) +tracks/8/keys = PackedFloat32Array(0, 1, 0.559988, 0.162752, -0.306184, 0.752447, 0.0333333, 1, 0.559988, 0.162752, -0.306184, 0.752447, 0.0666667, 1, 0.54606, 0.148412, -0.269379, 0.779248, 0.1, 1, 0.504481, 0.144176, -0.266332, 0.808566, 0.133333, 1, 0.443873, 0.118886, -0.27443, 0.844708, 0.166667, 1, 0.376759, 0.0594835, -0.254539, 0.888665, 0.2, 1, 0.321703, -0.00616479, -0.202588, 0.924893, 0.233333, 1, 0.302289, -0.0377999, -0.163657, 0.938301, 0.266667, 1, 0.313941, -0.017181, -0.16093, 0.935546, 0.3, 1, 0.337715, 0.0454168, -0.164932, 0.925572, 0.333333, 1, 0.375605, 0.119068, -0.15769, 0.905471, 0.366667, 1, 0.416467, 0.183249, -0.163769, 0.875302, 0.4, 1, 0.436281, 0.238278, -0.202785, 0.843659, 0.433333, 1, 0.438487, 0.277266, -0.266867, 0.812179, 0.466667, 1, 0.434667, 0.294355, -0.349294, 0.776153, 0.5, 1, 0.431092, 0.296981, -0.423927, 0.739086, 0.533333, 1, 0.440079, 0.287024, -0.446623, 0.724207, 0.566667, 1, 0.463027, 0.264283, -0.421589, 0.7335, 0.6, 1, 0.49908, 0.231978, -0.383202, 0.741796, 0.633333, 1, 0.540841, 0.194499, -0.345009, 0.742045, 0.666667, 1, 0.559988, 0.162753, -0.306184, 0.752447) tracks/9/type = "rotation_3d" tracks/9/imported = true tracks/9/enabled = true @@ -332,7 +332,7 @@ tracks/46/enabled = true tracks/46/path = NodePath("Armature/Skeleton3D:LeftLeg") tracks/46/interp = 1 tracks/46/loop_wrap = true -tracks/46/keys = PackedFloat32Array(0, 1, -0.680409, -0.0688022, 0.0647643, 0.726716, 0.0333333, 1, -0.680409, -0.0688022, 0.0647643, 0.726716, 0.0666667, 1, -0.724937, -0.0600767, 0.0595114, 0.683605, 0.1, 1, -0.728465, -0.0381687, 0.0508795, 0.682124, 0.133333, 1, -0.711528, -0.00794492, 0.0396278, 0.701495, 0.166667, 1, -0.674698, 0.0279593, 0.0221553, 0.737231, 0.2, 1, -0.618441, 0.049654, 0.0127131, 0.784158, 0.266667, 1, -0.50466, 0.021406, 0.0447375, 0.861892, 0.3, 1, -0.516523, -0.0175026, 0.0625139, 0.853809, 0.333333, 1, -0.549526, -0.0442642, 0.062063, 0.831992, 0.366667, 1, -0.563978, -0.050498, 0.0539388, 0.822478, 0.4, 1, -0.536177, -0.0585698, 0.0523282, 0.840444, 0.433333, 1, -0.465304, -0.0589332, 0.0463232, 0.881971, 0.466667, 1, -0.312201, -0.0451399, 0.034962, 0.948299, 0.5, 1, -0.162161, -0.0541882, 0.0367852, 0.984588, 0.533333, 1, -0.139187, -0.0705918, 0.044581, 0.98674, 0.566667, 1, -0.297555, -0.0623216, 0.0555642, 0.951047, 0.6, 1, -0.462653, -0.0713482, 0.0656706, 0.88122, 0.633333, 1, -0.588491, -0.0706336, 0.0649248, 0.802791, 0.666667, 1, -0.680409, -0.0687977, 0.0647607, 0.726717) +tracks/46/keys = PackedFloat32Array(0, 1, -0.680409, -0.0688022, 0.0647643, 0.726716, 0.0333333, 1, -0.680409, -0.0688022, 0.0647643, 0.726716, 0.0666667, 1, -0.724937, -0.0600767, 0.0595114, 0.683605, 0.1, 1, -0.728465, -0.0381687, 0.0508795, 0.682124, 0.133333, 1, -0.711528, -0.00794492, 0.0396278, 0.701495, 0.166667, 1, -0.674698, 0.0279593, 0.0221553, 0.737231, 0.2, 1, -0.618441, 0.049654, 0.0127131, 0.784158, 0.266667, 1, -0.50466, 0.021406, 0.0447375, 0.861892, 0.3, 1, -0.516523, -0.0175026, 0.0625139, 0.853809, 0.333333, 1, -0.549526, -0.0442642, 0.062063, 0.831992, 0.366667, 1, -0.563978, -0.050498, 0.0539388, 0.822478, 0.4, 1, -0.536177, -0.0585698, 0.0523282, 0.840444, 0.433333, 1, -0.465304, -0.0589332, 0.0463232, 0.881971, 0.466667, 1, -0.312201, -0.0451399, 0.034962, 0.948299, 0.5, 1, -0.162161, -0.0541882, 0.0367852, 0.984588, 0.533333, 1, -0.139187, -0.0705918, 0.044581, 0.98674, 0.566667, 1, -0.297555, -0.0623216, 0.0555642, 0.951047, 0.6, 1, -0.462653, -0.0713482, 0.0656706, 0.881221, 0.633333, 1, -0.588491, -0.0706336, 0.0649248, 0.802791, 0.666667, 1, -0.680409, -0.0687977, 0.0647607, 0.726717) tracks/47/type = "rotation_3d" tracks/47/imported = true tracks/47/enabled = true diff --git a/mirror-godot-app/player/animations/humanoid/walking_backward.tres b/mirror-godot-app/player/animations/humanoid/walking_backward.tres index 068aad05..85f27de1 100644 --- a/mirror-godot-app/player/animations/humanoid/walking_backward.tres +++ b/mirror-godot-app/player/animations/humanoid/walking_backward.tres @@ -248,7 +248,7 @@ tracks/34/enabled = true tracks/34/path = NodePath("Armature/Skeleton3D:RightHandIndex2") tracks/34/interp = 1 tracks/34/loop_wrap = true -tracks/34/keys = PackedFloat32Array(0, 1, 0.403117, 0.00638917, 0.0274684, 0.914714, 0.0333333, 1, 0.403117, 0.00638917, 0.0274684, 0.914714, 0.0666667, 1, 0.348786, 0.00521916, 0.0193808, 0.936987, 0.1, 1, 0.297971, 0.0041321, 0.0119167, 0.954492, 0.133333, 1, 0.273774, 0.00361654, 0.00839484, 0.961751, 0.166667, 1, 0.261192, 0.00334929, 0.00657177, 0.965259, 0.2, 1, 0.245421, 0.00301446, 0.00429399, 0.969402, 0.233333, 1, 0.229968, 0.00268703, 0.0020703, 0.973192, 0.266667, 1, 0.215444, 0.00237977, -1.23026e-05, 0.976513, 0.3, 1, 0.205848, 0.0021772, -0.00138456, 0.97858, 0.333333, 1, 0.204822, 0.0021556, -0.00153119, 0.978796, 0.366667, 1, 0.21371, 0.00234315, -0.000260534, 0.976894, 0.4, 1, 0.231592, 0.00272124, 0.0023037, 0.972807, 0.433333, 1, 0.256655, 0.00325252, 0.00591574, 0.966479, 0.466667, 1, 0.284161, 0.00383761, 0.00990422, 0.958718, 0.5, 1, 0.313068, 0.00445421, 0.0141246, 0.949615, 0.533333, 1, 0.340989, 0.00505194, 0.0182294, 0.939877, 0.6, 1, 0.389794, 0.00610139, 0.0254747, 0.92053, 0.633333, 1, 0.411409, 0.00656834, 0.0287132, 0.910975, 0.666667, 1, 0.431061, 0.00699418, 0.0316742, 0.90174, 0.7, 1, 0.447933, 0.00736036, 0.0342294, 0.893381, 0.733333, 1, 0.458656, 0.00759369, 0.0358594, 0.887857, 0.766667, 1, 0.464298, 0.00771656, 0.0367192, 0.884884, 0.8, 1, 0.464074, 0.00771198, 0.0366848, 0.885003, 0.833333, 1, 0.458565, 0.00759187, 0.0358455, 0.887905, 0.866667, 1, 0.448216, 0.00736662, 0.0342718, 0.893238, 0.9, 1, 0.437564, 0.00713519, 0.0326574, 0.898566, 0.933333, 1, 0.426958, 0.00690515, 0.0310547, 0.903711, 0.966667, 1, 0.418069, 0.00671265, 0.0297146, 0.907904, 1, 1, 0.415862, 0.00666471, 0.0293826, 0.908928, 1.03333, 1, 0.427345, 0.00691352, 0.0311131, 0.903527, 1.06667, 1, 0.440017, 0.00718859, 0.0330287, 0.897353, 1.1, 1, 0.436432, 0.00711071, 0.0324861, 0.899122, 1.13333, 1, 0.403117, 0.00638905, 0.0274684, 0.914714) +tracks/34/keys = PackedFloat32Array(0, 1, 0.403117, 0.00638917, 0.0274684, 0.914714, 0.0333333, 1, 0.403117, 0.00638918, 0.0274684, 0.914714, 0.0666667, 1, 0.348786, 0.00521916, 0.0193808, 0.936987, 0.1, 1, 0.297971, 0.0041321, 0.0119167, 0.954492, 0.133333, 1, 0.273774, 0.00361654, 0.00839484, 0.961751, 0.166667, 1, 0.261192, 0.00334929, 0.00657177, 0.965259, 0.2, 1, 0.245421, 0.00301446, 0.00429399, 0.969402, 0.233333, 1, 0.229968, 0.00268703, 0.0020703, 0.973192, 0.266667, 1, 0.215444, 0.00237977, -1.23026e-05, 0.976513, 0.3, 1, 0.205848, 0.0021772, -0.00138456, 0.97858, 0.333333, 1, 0.204822, 0.0021556, -0.00153119, 0.978796, 0.366667, 1, 0.21371, 0.00234315, -0.000260534, 0.976894, 0.4, 1, 0.231592, 0.00272124, 0.0023037, 0.972807, 0.433333, 1, 0.256655, 0.00325252, 0.00591574, 0.966479, 0.466667, 1, 0.284161, 0.00383761, 0.00990422, 0.958718, 0.5, 1, 0.313068, 0.00445421, 0.0141246, 0.949615, 0.533333, 1, 0.340989, 0.00505194, 0.0182294, 0.939877, 0.6, 1, 0.389794, 0.00610139, 0.0254747, 0.92053, 0.633333, 1, 0.411409, 0.00656834, 0.0287132, 0.910975, 0.666667, 1, 0.431061, 0.00699418, 0.0316742, 0.90174, 0.7, 1, 0.447933, 0.00736036, 0.0342294, 0.893381, 0.733333, 1, 0.458656, 0.00759369, 0.0358594, 0.887857, 0.766667, 1, 0.464298, 0.00771656, 0.0367192, 0.884884, 0.8, 1, 0.464074, 0.00771198, 0.0366848, 0.885003, 0.833333, 1, 0.458565, 0.00759187, 0.0358455, 0.887905, 0.866667, 1, 0.448216, 0.00736662, 0.0342718, 0.893238, 0.9, 1, 0.437564, 0.00713519, 0.0326574, 0.898566, 0.933333, 1, 0.426958, 0.00690515, 0.0310547, 0.903711, 0.966667, 1, 0.418069, 0.00671265, 0.0297146, 0.907904, 1, 1, 0.415862, 0.00666471, 0.0293826, 0.908928, 1.03333, 1, 0.427345, 0.00691352, 0.0311131, 0.903527, 1.06667, 1, 0.440017, 0.00718859, 0.0330287, 0.897353, 1.1, 1, 0.436432, 0.00711071, 0.0324861, 0.899122, 1.13333, 1, 0.403117, 0.00638905, 0.0274684, 0.914714) tracks/35/type = "rotation_3d" tracks/35/imported = true tracks/35/enabled = true diff --git a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_Wolf3D-fullbody-template-m-v2-N-arms.jpg.import b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_Wolf3D-fullbody-template-m-v2-N-arms.jpg.import index 9bd736d1..eaa11e73 100644 --- a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_Wolf3D-fullbody-template-m-v2-N-arms.jpg.import +++ b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_Wolf3D-fullbody-template-m-v2-N-arms.jpg.import @@ -10,7 +10,7 @@ metadata={ "vram_texture": true } generator_parameters={ -"md5": "08258988de27cdbc35ad6ffd0232cc77" +"md5": "2134022a58cffc43ff33a17fabbb07ea" } [deps] diff --git a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_Wolf3D_Teeth.jpg.import b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_Wolf3D_Teeth.jpg.import index 54d1cd4f..7b381f64 100644 --- a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_Wolf3D_Teeth.jpg.import +++ b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_Wolf3D_Teeth.jpg.import @@ -10,7 +10,7 @@ metadata={ "vram_texture": true } generator_parameters={ -"md5": "1b50d72e5bba32761068599395bb7c03" +"md5": "ae7df7280c67b50c0cf2d24a76477526" } [deps] diff --git a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_baseColor.jpg.import b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_baseColor.jpg.import index 06eb03b5..253f8fac 100644 --- a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_baseColor.jpg.import +++ b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_baseColor.jpg.import @@ -10,7 +10,7 @@ metadata={ "vram_texture": true } generator_parameters={ -"md5": "af7063f2c43c0fcfd3f6fac22805f6ca" +"md5": "8c9f717328e927a00775fe997879803c" } [deps] diff --git a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_baseColor_2.jpg.import b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_baseColor_2.jpg.import index e72edc37..9b202605 100644 --- a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_baseColor_2.jpg.import +++ b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_baseColor_2.jpg.import @@ -10,7 +10,7 @@ metadata={ "vram_texture": true } generator_parameters={ -"md5": "9763a26bf764f127726baaeb5a97bfea" +"md5": "e648671e104061be8d6d2ec63cbedc83" } [deps] diff --git a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_hair-07-N.jpg.import b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_hair-07-N.jpg.import index 1e35c2d7..dc438216 100644 --- a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_hair-07-N.jpg.import +++ b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_hair-07-N.jpg.import @@ -10,7 +10,7 @@ metadata={ "vram_texture": true } generator_parameters={ -"md5": "a6cd21c72d473a84293ca2218e15ff51" +"md5": "fab829735ff8239e8f80fd7337811db3" } [deps] diff --git a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-basic-01-v2-m-bottom-D.jpg.import b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-basic-01-v2-m-bottom-D.jpg.import index 02dd7dca..8d5701bb 100644 --- a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-basic-01-v2-m-bottom-D.jpg.import +++ b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-basic-01-v2-m-bottom-D.jpg.import @@ -10,7 +10,7 @@ metadata={ "vram_texture": true } generator_parameters={ -"md5": "3cc819aca4f5a769d8764341800ce5b4" +"md5": "c3fd00b3de9003caba1adf16ca7fe4c2" } [deps] diff --git a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-basic-01-v2-m-bottom-N.jpg.import b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-basic-01-v2-m-bottom-N.jpg.import index 524033ab..8991bfac 100644 --- a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-basic-01-v2-m-bottom-N.jpg.import +++ b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-basic-01-v2-m-bottom-N.jpg.import @@ -10,7 +10,7 @@ metadata={ "vram_texture": true } generator_parameters={ -"md5": "9f158eeb6b9195fa8afcd8735841a61a" +"md5": "147f6677d0f3a67ebec416bc2a7beb27" } [deps] diff --git a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-basic-01-v2-m-footwear-D.jpg.import b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-basic-01-v2-m-footwear-D.jpg.import index 64713b77..426e393a 100644 --- a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-basic-01-v2-m-footwear-D.jpg.import +++ b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-basic-01-v2-m-footwear-D.jpg.import @@ -10,7 +10,7 @@ metadata={ "vram_texture": true } generator_parameters={ -"md5": "b8b0165c99a5a7ff7dea1eff2bba8a15" +"md5": "c01b85952421a01f5d51f4f0f5e5f746" } [deps] diff --git a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-basic-01-v2-m-footwear-M-outfit-basic-01-v2-m-footwear-R.jpg.import b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-basic-01-v2-m-footwear-M-outfit-basic-01-v2-m-footwear-R.jpg.import index 47eff6cb..a84cb144 100644 --- a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-basic-01-v2-m-footwear-M-outfit-basic-01-v2-m-footwear-R.jpg.import +++ b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-basic-01-v2-m-footwear-M-outfit-basic-01-v2-m-footwear-R.jpg.import @@ -10,7 +10,7 @@ metadata={ "vram_texture": true } generator_parameters={ -"md5": "c277f1663e72c98d42d525e7b3c570fc" +"md5": "42541d7f2d0745aa4ccea6ced4f1c7ff" } [deps] diff --git a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-basic-01-v2-m-footwear-N.jpg.import b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-basic-01-v2-m-footwear-N.jpg.import index 6b13cb75..90080c76 100644 --- a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-basic-01-v2-m-footwear-N.jpg.import +++ b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-basic-01-v2-m-footwear-N.jpg.import @@ -10,7 +10,7 @@ metadata={ "vram_texture": true } generator_parameters={ -"md5": "c67f34bba9612c10424b001ec26377ff" +"md5": "36bc971621838ac4b305f49aa6bf47b8" } [deps] diff --git a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-cheer-02-v2-m-top-N.jpg.import b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-cheer-02-v2-m-top-N.jpg.import index 7e18592f..7c091123 100644 --- a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-cheer-02-v2-m-top-N.jpg.import +++ b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_outfit-cheer-02-v2-m-top-N.jpg.import @@ -10,7 +10,7 @@ metadata={ "vram_texture": true } generator_parameters={ -"md5": "3821f230475bdf749fdeac36f9528539" +"md5": "07701058a1a895285d071b00463b9ebe" } [deps] diff --git a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_tshirt-BC.jpg.import b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_tshirt-BC.jpg.import index 338ebc8f..c8b29552 100644 --- a/mirror-godot-app/player/character_models/astronaut/astronaut_updated_tshirt-BC.jpg.import +++ b/mirror-godot-app/player/character_models/astronaut/astronaut_updated_tshirt-BC.jpg.import @@ -10,7 +10,7 @@ metadata={ "vram_texture": true } generator_parameters={ -"md5": "d97e00e15c83d3a7207f9a30c34224a8" +"md5": "5f5adfe6328e6871abcfdecad6644e91" } [deps] diff --git a/mirror-godot-app/project.godot b/mirror-godot-app/project.godot index 329e3547..1b852eaf 100644 --- a/mirror-godot-app/project.godot +++ b/mirror-godot-app/project.godot @@ -82,7 +82,7 @@ global_script_class_icons={ config/name="The Mirror" config/tags=PackedStringArray("open_source") run/main_scene="res://scenes/boot_scene.tscn" -config/features=PackedStringArray("35021301", "4.3", "mirror") +config/features=PackedStringArray("2ed330c2", "4.3", "mirror") boot_splash/bg_color=Color(0.0745098, 0.0862745, 0.184314, 1) boot_splash/image="res://art/white_logo_slate_bg_with_text.png" boot_splash/fullsize=false @@ -140,7 +140,7 @@ export/convert_text_resources_to_binary=false [editor_plugins] -enabled=PackedStringArray("res://addons/compressed_build_exporter/plugin.cfg", "res://addons/draggable_container/plugin.cfg", "res://addons/godot-firebase/plugin.cfg", "res://addons/gut/plugin.cfg", "res://addons/http-sse-client/plugin.cfg", "res://addons/mirror_gltf/plugin.cfg", "res://addons/mirror_internal/plugin.cfg", "res://addons/omi_extensions/plugin.cfg") +enabled=PackedStringArray("res://addons/compressed_build_exporter/plugin.cfg", "res://addons/godot-firebase/plugin.cfg", "res://addons/gut/plugin.cfg", "res://addons/mirror_gltf/plugin.cfg", "res://addons/mirror_internal/plugin.cfg", "res://addons/omi_extensions/plugin.cfg") [feature_flags] diff --git a/mirror-godot-app/script/visual/editor/script_editor.theme.tres b/mirror-godot-app/script/visual/editor/script_editor.theme.tres index b314c537..513ba4fd 100644 --- a/mirror-godot-app/script/visual/editor/script_editor.theme.tres +++ b/mirror-godot-app/script/visual/editor/script_editor.theme.tres @@ -1,9 +1,6 @@ -[gd_resource type="Theme" load_steps=18 format=3 uid="uid://chpmeyn2g6o6r"] +[gd_resource type="Theme" load_steps=15 format=3 uid="uid://chpmeyn2g6o6r"] -[ext_resource type="FontFile" uid="uid://dhpbqmk3ulim4" path="res://ui/common/fonts/montserrat/montserrat_bold.ttf" id="1_78gun"] [ext_resource type="StyleBox" uid="uid://c5cvnb1hsor73" path="res://script/visual/editor/theme/accept_window_panel.stylebox.tres" id="1_dxymh"] -[ext_resource type="FontFile" uid="uid://bpw8ywxvp8ctj" path="res://ui/common/fonts/montserrat/montserrat_regular.ttf" id="1_j0da5"] -[ext_resource type="FontFile" uid="uid://cgyrixnr8bppj" path="res://ui/common/fonts/montserrat/montserrat_medium.ttf" id="1_u186u"] [ext_resource type="StyleBox" uid="uid://d3h0d32csi0yu" path="res://ui/new_player_ui/inventory/panel_light_blue_disabled.tres" id="2_k4mia"] [ext_resource type="StyleBox" uid="uid://biwid7pf726cm" path="res://ui/new_player_ui/inventory/panel_light_blue_rounded.tres" id="2_wqte6"] [ext_resource type="StyleBox" uid="uid://d0agfj0dkjits" path="res://ui/new_player_ui/inventory/panel_light_blue_rounded_hover.tres" id="3_t3mh4"] @@ -42,9 +39,8 @@ corner_radius_bottom_left = 20 corner_detail = 5 [resource] -default_font = ExtResource("1_j0da5") AcceptDialog/styles/panel = ExtResource("1_dxymh") -Button/fonts/font = ExtResource("1_u186u") +Button/fonts/font = null Button/styles/disabled = ExtResource("2_k4mia") Button/styles/focus = ExtResource("2_wqte6") Button/styles/hover = ExtResource("3_t3mh4") @@ -53,7 +49,7 @@ Button/styles/pressed = ExtResource("4_h5tli") ButtonAccent/base_type = &"Button" ButtonAccent/styles/normal = SubResource("StyleBoxFlat_jhnid") GraphEdit/styles/bg = SubResource("StyleBoxFlat_4in5o") -GraphNode/fonts/title_font = ExtResource("1_78gun") +GraphNode/fonts/title_font = null GraphNode/styles/frame = SubResource("StyleBoxFlat_6b66v") GraphNode/styles/selected_frame = ExtResource("6_h7fds") LineEdit/font_sizes/font_size = 16 diff --git a/mirror-godot-app/ui/common/themes/main_menu.theme.tres b/mirror-godot-app/ui/common/themes/main_menu.theme.tres index 9a51ce56..694b773a 100644 --- a/mirror-godot-app/ui/common/themes/main_menu.theme.tres +++ b/mirror-godot-app/ui/common/themes/main_menu.theme.tres @@ -1,7 +1,6 @@ -[gd_resource type="Theme" load_steps=10 format=3 uid="uid://j2x4to0hys03"] +[gd_resource type="Theme" load_steps=9 format=3 uid="uid://j2x4to0hys03"] [ext_resource type="FontVariation" uid="uid://cnncegbqgc72t" path="res://ui/common/themes/main_menu_ui_button_font.tres" id="1_f4ti0"] -[ext_resource type="FontFile" uid="uid://cgyrixnr8bppj" path="res://ui/common/fonts/montserrat/montserrat_medium.ttf" id="2_e7mfa"] [sub_resource type="StyleBoxLine" id="StyleBoxLine_1d2ur"] color = Color(0.282353, 0.505882, 0.968627, 1) @@ -60,7 +59,6 @@ corner_radius_bottom_left = 10 anti_aliasing_size = 1.5 [resource] -default_font = ExtResource("2_e7mfa") Button/colors/font_focus_color = Color(0.282353, 0.505882, 0.968627, 1) Button/colors/font_hover_color = Color(0.282353, 0.505882, 0.968627, 1) Button/colors/font_hover_pressed_color = Color(0.282353, 0.505882, 0.968627, 1) @@ -83,4 +81,4 @@ ButtonAccent/styles/focus = SubResource("StyleBoxFlat_qolle") ButtonAccent/styles/hover = SubResource("StyleBoxFlat_qolle") ButtonAccent/styles/normal = SubResource("StyleBoxFlat_kx8ra") ButtonAccent/styles/pressed = SubResource("StyleBoxFlat_rg5xs") -Label/fonts/font = ExtResource("2_e7mfa") +Label/fonts/font = null diff --git a/mirror-godot-app/ui/common/themes/main_menu_button_accent.theme.tres b/mirror-godot-app/ui/common/themes/main_menu_button_accent.theme.tres index f9024bd2..bac57e31 100644 --- a/mirror-godot-app/ui/common/themes/main_menu_button_accent.theme.tres +++ b/mirror-godot-app/ui/common/themes/main_menu_button_accent.theme.tres @@ -1,7 +1,6 @@ -[gd_resource type="Theme" load_steps=6 format=3 uid="uid://u0w47r2ijn3b"] +[gd_resource type="Theme" load_steps=5 format=3 uid="uid://u0w47r2ijn3b"] [ext_resource type="FontVariation" uid="uid://cnncegbqgc72t" path="res://ui/common/themes/main_menu_ui_button_font.tres" id="1_f4ti0"] -[ext_resource type="FontFile" uid="uid://cgyrixnr8bppj" path="res://ui/common/fonts/montserrat/montserrat_medium.ttf" id="2_e7mfa"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_qolle"] draw_center = false @@ -43,7 +42,6 @@ corner_radius_bottom_left = 10 anti_aliasing_size = 1.5 [resource] -default_font = ExtResource("2_e7mfa") Button/colors/font_color = Color(1, 1, 1, 1) Button/colors/font_focus_color = Color(1, 1, 1, 1) Button/colors/font_hover_color = Color(1, 1, 1, 1) @@ -57,4 +55,4 @@ Button/styles/focus = SubResource("StyleBoxFlat_qolle") Button/styles/hover = SubResource("StyleBoxFlat_qolle") Button/styles/normal = SubResource("StyleBoxFlat_kx8ra") Button/styles/pressed = SubResource("StyleBoxFlat_rg5xs") -Label/fonts/font = ExtResource("2_e7mfa") +Label/fonts/font = null diff --git a/mirror-godot-app/ui/common/themes/menu_ui.theme.tres b/mirror-godot-app/ui/common/themes/menu_ui.theme.tres index a678b693..3f2bab92 100644 --- a/mirror-godot-app/ui/common/themes/menu_ui.theme.tres +++ b/mirror-godot-app/ui/common/themes/menu_ui.theme.tres @@ -1,16 +1,11 @@ -[gd_resource type="Theme" load_steps=38 format=3 uid="uid://ggwm8asxintx"] +[gd_resource type="Theme" load_steps=33 format=3 uid="uid://ggwm8asxintx"] [ext_resource type="FontVariation" uid="uid://cnncegbqgc72t" path="res://ui/common/themes/main_menu_ui_button_font.tres" id="1_2ojen"] -[ext_resource type="Texture2D" uid="uid://1p8xud3vo124" path="res://ui/common/sliders/slider_button.svg" id="2_5as7o"] -[ext_resource type="Texture2D" uid="uid://cplq1i4kur4rv" path="res://ui/common/sliders/slider_button_highlight.svg" id="3_y70pv"] [ext_resource type="FontVariation" uid="uid://cihhrona27xhd" path="res://ui/common/themes/main_menu_ui_line_edit_font.tres" id="5_2615r"] [ext_resource type="StyleBox" uid="uid://bq3jyqps48teh" path="res://ui/common/text_edit/text_edit_focus.stylebox.tres" id="6_2qeu3"] [ext_resource type="StyleBox" uid="uid://clf3e0ur2nxpy" path="res://ui/common/text_edit/text_edit_normal.stylebox.tres" id="7_v20jb"] [ext_resource type="StyleBox" uid="uid://d01geu8jfp48b" path="res://ui/common/panels/panel_default.stylebox.tres" id="8_rnqcb"] -[ext_resource type="FontFile" uid="uid://cgyrixnr8bppj" path="res://ui/common/fonts/montserrat/montserrat_medium.ttf" id="8_y3bhi"] -[ext_resource type="Texture2D" uid="uid://7tnro5gaclt3" path="res://ui/art/radiobutton-selected-small.svg" id="8_yjndj"] [ext_resource type="StyleBox" uid="uid://bc7pqashdnvd" path="res://ui/common/panels/panel_basic.stylebox.tres" id="9_jo76y"] -[ext_resource type="Texture2D" uid="uid://cgjjs2r35tdy" path="res://ui/art/radiobutton-unselected-small.svg" id="9_oc6g7"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_lh8yo"] content_margin_left = 12.0 @@ -205,7 +200,6 @@ corner_radius_bottom_left = 3 corner_detail = 5 [sub_resource type="FontVariation" id="FontVariation_5p5so"] -base_font = ExtResource("8_y3bhi") spacing_top = 6 spacing_bottom = 6 @@ -289,8 +283,8 @@ ButtonAccent2/styles/focus = SubResource("StyleBoxFlat_ows5c") ButtonAccent2/styles/hover = SubResource("StyleBoxFlat_ows5c") ButtonAccent2/styles/normal = SubResource("StyleBoxFlat_5liqt") ButtonAccent2/styles/pressed = SubResource("StyleBoxFlat_r0e00") -CheckBox/icons/radio_checked = ExtResource("8_yjndj") -CheckBox/icons/radio_checked_disabled = ExtResource("9_oc6g7") +CheckBox/icons/radio_checked = null +CheckBox/icons/radio_checked_disabled = null CheckButton/styles/normal = SubResource("StyleBoxFlat_wcs1q") FlatButton/base_type = &"Button" FlatButton/colors/font_hover_color = Color(0.333333, 1, 0.831373, 1) @@ -299,8 +293,8 @@ FlatButton/styles/disabled = SubResource("StyleBoxFlat_k7nwg") FlatButton/styles/focus = SubResource("StyleBoxFlat_k7nwg") FlatButton/styles/hover = SubResource("StyleBoxFlat_iwpcx") FlatButton/styles/normal = SubResource("StyleBoxFlat_k7nwg") -HSlider/icons/grabber = ExtResource("2_5as7o") -HSlider/icons/grabber_highlight = ExtResource("3_y70pv") +HSlider/icons/grabber = null +HSlider/icons/grabber_highlight = null HSlider/styles/grabber_area = SubResource("StyleBoxEmpty_hni8n") HSlider/styles/grabber_area_highlight = SubResource("StyleBoxEmpty_ecgey") HSlider/styles/slider = SubResource("StyleBoxFlat_1gnkj") @@ -314,8 +308,8 @@ Panel/styles/panel = ExtResource("8_rnqcb") Panel/styles/panel_fg = SubResource("StyleBoxFlat_byi1l") PopupMenu/font_sizes/font_size = 16 PopupMenu/fonts/font = SubResource("FontVariation_5p5so") -PopupMenu/icons/radio_checked = ExtResource("8_yjndj") -PopupMenu/icons/radio_unchecked = ExtResource("9_oc6g7") +PopupMenu/icons/radio_checked = null +PopupMenu/icons/radio_unchecked = null PopupMenu/styles/hover = SubResource("StyleBoxFlat_glqot") PopupMenu/styles/panel = SubResource("StyleBoxFlat_rxdm6") RichTextLabel/fonts/normal_font = SubResource("Font_y5boo") diff --git a/mirror-godot-app/ui/main_menu/pages/settings/theme/tab_button_theme.tres b/mirror-godot-app/ui/main_menu/pages/settings/theme/tab_button_theme.tres index 119fa36a..1c147d25 100644 --- a/mirror-godot-app/ui/main_menu/pages/settings/theme/tab_button_theme.tres +++ b/mirror-godot-app/ui/main_menu/pages/settings/theme/tab_button_theme.tres @@ -1,6 +1,4 @@ -[gd_resource type="Theme" load_steps=6 format=3 uid="uid://bup8odqu073gb"] - -[ext_resource type="FontFile" uid="uid://bjwepurchoc75" path="res://ui/ui_rect_and_font/montserrat/static/montserrat_semi_bold.ttf" id="1_b7vry"] +[gd_resource type="Theme" load_steps=5 format=3 uid="uid://bup8odqu073gb"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_cgipo"] content_margin_top = 10.0 @@ -19,7 +17,6 @@ content_margin_top = 10.0 content_margin_bottom = 10.0 [resource] -default_font = ExtResource("1_b7vry") default_font_size = 18 Button/colors/font_hover_color = Color(0.145098, 0.419608, 0.984314, 1) Button/colors/font_hover_pressed_color = Color(0.145098, 0.419608, 0.984314, 1) diff --git a/mirror-godot-app/ui/new_player_ui/ui.theme.tres b/mirror-godot-app/ui/new_player_ui/ui.theme.tres index bd51abdb..2f9366ad 100644 --- a/mirror-godot-app/ui/new_player_ui/ui.theme.tres +++ b/mirror-godot-app/ui/new_player_ui/ui.theme.tres @@ -1,14 +1,10 @@ -[gd_resource type="Theme" load_steps=19 format=3 uid="uid://ys8qltjcesi5"] +[gd_resource type="Theme" load_steps=15 format=3 uid="uid://ys8qltjcesi5"] -[ext_resource type="FontFile" uid="uid://cyqoty8fo8udu" path="res://ui/ui_rect_and_font/montserrat/static/montserrat_regular.ttf" id="1"] [ext_resource type="FontVariation" uid="uid://bwp6hb31ol8la" path="res://ui/new_player_ui/inventory/title_font_bold.tres" id="1_od7qj"] [ext_resource type="StyleBox" uid="uid://biwid7pf726cm" path="res://ui/new_player_ui/inventory/panel_light_blue_rounded.tres" id="1_rpu2c"] [ext_resource type="StyleBox" uid="uid://d0agfj0dkjits" path="res://ui/new_player_ui/inventory/panel_light_blue_rounded_hover.tres" id="3_u611i"] [ext_resource type="StyleBox" uid="uid://bxdufxik1y0yu" path="res://ui/new_player_ui/inventory/panel_light_blue_rounded_pressed.tres" id="4_c8o4f"] -[ext_resource type="FontFile" uid="uid://s44wjlc18fo7" path="res://ui/ui_rect_and_font/montserrat/static/montserrat_bold.ttf" id="5_3n5pm"] [ext_resource type="StyleBox" uid="uid://dcdx4uxyjvmqv" path="res://ui/new_player_ui/inventory/panel_transparent_bg.tres" id="5_08w73"] -[ext_resource type="Texture2D" uid="uid://d1fm2eedtdrw" path="res://creator/selection/scene_hierarchy/icons/Down Arrow.svg" id="6_a4bp2"] -[ext_resource type="Texture2D" uid="uid://beqg1tvi84kpg" path="res://creator/selection/scene_hierarchy/icons/Right Arrow.svg" id="7_s6354"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_50bp0"] bg_color = Color(0.254902, 0.254902, 0.254902, 1) @@ -26,7 +22,6 @@ border_width_bottom = 1 border_color = Color(1, 1, 1, 1) [sub_resource type="FontVariation" id="Font_lmthf"] -base_font = ExtResource("5_3n5pm") [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_njfbf"] @@ -37,7 +32,6 @@ bg_color = Color(0.223529, 0.415686, 0.94902, 1) bg_color = Color(0.223529, 0.415686, 0.94902, 1) [sub_resource type="FontVariation" id="Font_i3xq3"] -base_font = ExtResource("1") [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_42mvy"] bg_color = Color(0.164706, 0.160784, 0.207843, 0.827451) @@ -72,8 +66,8 @@ Tree/constants/button_margin = 8 Tree/constants/h_separation = 8 Tree/constants/v_separation = 12 Tree/fonts/font = SubResource("Font_lmthf") -Tree/icons/arrow = ExtResource("6_a4bp2") -Tree/icons/arrow_collapsed = ExtResource("7_s6354") +Tree/icons/arrow = null +Tree/icons/arrow_collapsed = null Tree/styles/bg = ExtResource("5_08w73") Tree/styles/bg_focus = SubResource("StyleBoxEmpty_njfbf") Tree/styles/selected = SubResource("StyleBoxFlat_xq6ox") diff --git a/setup-linux.sh b/setup-linux.sh index ea81d7c6..0da2e995 100755 --- a/setup-linux.sh +++ b/setup-linux.sh @@ -1,2 +1,2 @@ #!/bin/bash -curl -o "MirrorGodotEditorLinux.x86_64" "https://storage.googleapis.com/mirror_native_client_builds/Engine/a6443c6c/MirrorGodotEditorLinux.x86_64" +curl -o "MirrorGodotEditorLinux.x86_64" "https://storage.googleapis.com/mirror_native_client_builds/Engine/2ed330c2/MirrorGodotEditorLinux.x86_64" diff --git a/setup-mac.sh b/setup-mac.sh index 156f334a..636a9b8c 100755 --- a/setup-mac.sh +++ b/setup-mac.sh @@ -1,2 +1,2 @@ #!/bin/bash -curl -o "MirrorGodotEditorMac.app.zip" "https://storage.googleapis.com/mirror_native_client_builds/Engine/a6443c6c/MirrorGodotEditorMac.app.zip" +curl -o "MirrorGodotEditorMac.app.zip" "https://storage.googleapis.com/mirror_native_client_builds/Engine/2ed330c2/MirrorGodotEditorMac.app.zip" diff --git a/setup-win.sh b/setup-win.sh index 7dee8387..e28c7767 100755 --- a/setup-win.sh +++ b/setup-win.sh @@ -1,2 +1,2 @@ #!/bin/bash -curl -o "MirrorGodotEditorWindows.exe" "https://storage.googleapis.com/mirror_native_client_builds/Engine/a6443c6c/MirrorGodotEditorWindows.exe" +curl -o "MirrorGodotEditorWindows.exe" "https://storage.googleapis.com/mirror_native_client_builds/Engine/2ed330c2/MirrorGodotEditorWindows.exe"