From e848e1baa82c77923c31def6317864280a135235 Mon Sep 17 00:00:00 2001 From: Gordon MacPherson Date: Tue, 19 Nov 2024 14:36:29 +0000 Subject: [PATCH] Update URLs (#244) --- .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 62b6a281..4a5a634e 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/6a1210ed/MirrorGodotEditorWindows.exe - template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/6a1210ed/windows_release_x86_64.exe + editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/02381634/MirrorGodotEditorWindows.exe + template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/02381634/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/6a1210ed/MirrorGodotEditorMac.app.zip - template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/6a1210ed/macos_template.app.zip + editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/02381634/MirrorGodotEditorMac.app.zip + template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/02381634/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/6a1210ed/MirrorGodotEditorLinux.x86_64 - template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/6a1210ed/linux_release.x86_64 + editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/02381634/MirrorGodotEditorLinux.x86_64 + template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/02381634/linux_release.x86_64 diff --git a/README.md b/README.md index 150cfe30..8e2e91c8 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/6a1210ed/MirrorGodotEditorWindows.exe) -- Mac: **v buggy**; taking contributions for fixes :) [Download](https://storage.googleapis.com/mirror_native_client_builds/Engine/6a1210ed/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/6a1210ed/MirrorGodotEditorLinux.x86_64) +- Windows: [Download](https://storage.googleapis.com/mirror_native_client_builds/Engine/02381634/MirrorGodotEditorWindows.exe) +- Mac: **v buggy**; taking contributions for fixes :) [Download](https://storage.googleapis.com/mirror_native_client_builds/Engine/02381634/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/02381634/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 6a1210ed..02381634 160000 --- a/godot-engine +++ b/godot-engine @@ -1 +1 @@ -Subproject commit 6a1210ed79c801f038263b083ea508b5916fc587 +Subproject commit 023816340c4cf304bedc54a71389e9554afef935 diff --git a/mirror-godot-app/project.godot b/mirror-godot-app/project.godot index aa4ce8ac..3ecad884 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("6a1210ed", "4.3", "mirror") +config/features=PackedStringArray("02381634", "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 98831c93..c046f37c 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/6a1210ed/MirrorGodotEditorLinux.x86_64" +curl -o "MirrorGodotEditorLinux.x86_64" "https://storage.googleapis.com/mirror_native_client_builds/Engine/02381634/MirrorGodotEditorLinux.x86_64" diff --git a/setup-mac.sh b/setup-mac.sh index 06698008..f6491b6f 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/6a1210ed/MirrorGodotEditorMac.app.zip" +curl -o "MirrorGodotEditorMac.app.zip" "https://storage.googleapis.com/mirror_native_client_builds/Engine/02381634/MirrorGodotEditorMac.app.zip" diff --git a/setup-win.sh b/setup-win.sh index 43eeeca3..8d84c66d 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/6a1210ed/MirrorGodotEditorWindows.exe" +curl -o "MirrorGodotEditorWindows.exe" "https://storage.googleapis.com/mirror_native_client_builds/Engine/02381634/MirrorGodotEditorWindows.exe"