Skip to content

Commit

Permalink
Update engine with the jolt physics crash fix
Browse files Browse the repository at this point in the history
# Conflicts:
#	mirror-godot-app/dummy.md
  • Loading branch information
RevoluPowered committed Oct 8, 2024
1 parent 0b744af commit 7fc6c6d
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/deployment-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/35021301/MirrorGodotEditorWindows.exe
template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/35021301/windows_release_x86_64.exe
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
build-macos-client:
name: 🍎 Build MacOS Dev PR
uses: ./.github/workflows/client-build-tool.yml
Expand All @@ -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/35021301/MirrorGodotEditorMac.app.zip
template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/35021301/macos_template.app.zip
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
build-linux-client:
name: 🐧 Build Linux Dev PR
uses: ./.github/workflows/client-build-tool.yml
Expand All @@ -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/35021301/MirrorGodotEditorLinux.x86_64
template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/35021301/linux_release.x86_64
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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/35021301/MirrorGodotEditorWindows.exe)
- Mac: **v buggy**; taking contributions for fixes :) [Download](https://storage.googleapis.com/mirror_native_client_builds/Engine/35021301/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/35021301/MirrorGodotEditorLinux.x86_64)
- 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)

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.
Expand Down
2 changes: 1 addition & 1 deletion godot-engine
2 changes: 1 addition & 1 deletion mirror-godot-app/dummy.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
this file is used to force a rebuild in github actions...
This file is used to force a rebuild in github actions...
2 changes: 1 addition & 1 deletion setup-linux.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
curl -o "MirrorGodotEditorLinux.x86_64" "https://storage.googleapis.com/mirror_native_client_builds/Engine/35021301/MirrorGodotEditorLinux.x86_64"
curl -o "MirrorGodotEditorLinux.x86_64" "https://storage.googleapis.com/mirror_native_client_builds/Engine/a6443c6c/MirrorGodotEditorLinux.x86_64"
2 changes: 1 addition & 1 deletion setup-mac.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
curl -o "MirrorGodotEditorMac.app.zip" "https://storage.googleapis.com/mirror_native_client_builds/Engine/35021301/MirrorGodotEditorMac.app.zip"
curl -o "MirrorGodotEditorMac.app.zip" "https://storage.googleapis.com/mirror_native_client_builds/Engine/a6443c6c/MirrorGodotEditorMac.app.zip"
2 changes: 1 addition & 1 deletion setup-win.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
curl -o "MirrorGodotEditorWindows.exe" "https://storage.googleapis.com/mirror_native_client_builds/Engine/35021301/MirrorGodotEditorWindows.exe"
curl -o "MirrorGodotEditorWindows.exe" "https://storage.googleapis.com/mirror_native_client_builds/Engine/a6443c6c/MirrorGodotEditorWindows.exe"

0 comments on commit 7fc6c6d

Please sign in to comment.