From cfa0fef03bb874188c82b30fe0f94e3a9cb3b6d7 Mon Sep 17 00:00:00 2001 From: Gordon MacPherson Date: Tue, 19 Nov 2024 19:44:25 +0000 Subject: [PATCH] Yet another engine upgrade for msvc --- .github/workflows/deployment-pr.yml | 12 ++++++------ README.md | 6 +++--- godot-engine | 2 +- mirror-godot-app/project.godot | 2 +- setup-linux.sh | 2 +- setup-mac.sh | 2 +- setup-win.sh | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deployment-pr.yml b/.github/workflows/deployment-pr.yml index 032aa009..c51d4174 100644 --- a/.github/workflows/deployment-pr.yml +++ b/.github/workflows/deployment-pr.yml @@ -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/8e08aebf/MirrorGodotEditorWindows.exe - template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/8e08aebf/windows_release_x86_64.exe + editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/77066485/MirrorGodotEditorWindows.exe + template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/77066485/windows_release_x86_64.exe build-macos-client: name: 🍎 Build MacOS Dev PR uses: ./.github/workflows/client-build-tool.yml @@ -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/8e08aebf/MirrorGodotEditorMac.app.zip - template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/8e08aebf/macos_template.app.zip + editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/77066485/MirrorGodotEditorMac.app.zip + template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/77066485/macos_template.app.zip build-linux-client: name: 🐧 Build Linux Dev PR uses: ./.github/workflows/client-build-tool.yml @@ -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/8e08aebf/MirrorGodotEditorLinux.x86_64 - template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/8e08aebf/linux_release.x86_64 + editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/77066485/MirrorGodotEditorLinux.x86_64 + template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/77066485/linux_release.x86_64 diff --git a/README.md b/README.md index 0d739b0e..8bfec716 100644 --- a/README.md +++ b/README.md @@ -69,9 +69,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/8e08aebf/MirrorGodotEditorWindows.exe) -- Mac: **v buggy**; taking contributions for fixes :) [Download](https://storage.googleapis.com/mirror_native_client_builds/Engine/8e08aebf/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/8e08aebf/MirrorGodotEditorLinux.x86_64) +- Windows: [Download](https://storage.googleapis.com/mirror_native_client_builds/Engine/77066485/MirrorGodotEditorWindows.exe) +- Mac: **v buggy**; taking contributions for fixes :) [Download](https://storage.googleapis.com/mirror_native_client_builds/Engine/77066485/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/77066485/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 8e08aebf..77066485 160000 --- a/godot-engine +++ b/godot-engine @@ -1 +1 @@ -Subproject commit 8e08aebfcf34e17059b3dc41717d2415f3467744 +Subproject commit 77066485df8a05631e1e0751389506825f47fc2c diff --git a/mirror-godot-app/project.godot b/mirror-godot-app/project.godot index 2a143b86..8e71bbe3 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("8e08aebf", "4.3", "mirror") +config/features=PackedStringArray("77066485", "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 diff --git a/setup-linux.sh b/setup-linux.sh index 9aac28e1..5b23aacb 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/8e08aebf/MirrorGodotEditorLinux.x86_64" +curl -o "MirrorGodotEditorLinux.x86_64" "https://storage.googleapis.com/mirror_native_client_builds/Engine/77066485/MirrorGodotEditorLinux.x86_64" diff --git a/setup-mac.sh b/setup-mac.sh index bd09799e..48fe98f8 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/8e08aebf/MirrorGodotEditorMac.app.zip" +curl -o "MirrorGodotEditorMac.app.zip" "https://storage.googleapis.com/mirror_native_client_builds/Engine/77066485/MirrorGodotEditorMac.app.zip" diff --git a/setup-win.sh b/setup-win.sh index 2c9f8715..51ead163 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/8e08aebf/MirrorGodotEditorWindows.exe" +curl -o "MirrorGodotEditorWindows.exe" "https://storage.googleapis.com/mirror_native_client_builds/Engine/77066485/MirrorGodotEditorWindows.exe"