aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author George L. Albany <Megacake1234@gmail.com>2023-04-13 15:47:29 +0200
committer GitHub <noreply@github.com>2023-04-13 15:47:29 +0200
commit1f04a7827ae377372cb491ff0257a47d0d4c2967 (patch)
tree96780b3ef006332c4959e4639195c92f13c3a858
parent21aeaadf332d1a0d874f2c3850944fbdc6e64ff1 (diff)
parentb01832e939b639c25ee4d60438517768b1d2173d (diff)
Merge pull request #86 from Spartan322/update/godot4.0.2-stable
-rw-r--r--.github/workflows/builds.yml8
-rw-r--r--README.md8
m---------godot-cpp0
3 files changed, 8 insertions, 8 deletions
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 88d5200..772b16c 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -143,8 +143,8 @@ jobs:
id: export_game
uses: Spartan322/godot-export@master
with:
- godot_executable_download_url: https://downloads.tuxfamily.org/godotengine/4.0.1/Godot_v4.0.1-stable_linux.x86_64.zip
- godot_export_templates_download_url: https://downloads.tuxfamily.org/godotengine/4.0.1/Godot_v4.0.1-stable_export_templates.tpz
+ godot_executable_download_url: https://downloads.tuxfamily.org/godotengine/4.0.2/Godot_v4.0.2-stable_linux.x86_64.zip
+ godot_export_templates_download_url: https://downloads.tuxfamily.org/godotengine/4.0.2/Godot_v4.0.2-stable_export_templates.tpz
relative_project_path: ./game
export_as_pack: true
export_debug: true
@@ -191,8 +191,8 @@ jobs:
id: export_game
uses: Spartan322/godot-export@master
with:
- godot_executable_download_url: https://downloads.tuxfamily.org/godotengine/4.0.1/Godot_v4.0.1-stable_linux.x86_64.zip
- godot_export_templates_download_url: https://downloads.tuxfamily.org/godotengine/4.0.1/Godot_v4.0.1-stable_export_templates.tpz
+ godot_executable_download_url: https://downloads.tuxfamily.org/godotengine/4.0.2/Godot_v4.0.2-stable_linux.x86_64.zip
+ godot_export_templates_download_url: https://downloads.tuxfamily.org/godotengine/4.0.2/Godot_v4.0.2-stable_export_templates.tpz
relative_project_path: ./game
archive_output: true
wine_path: ${{ steps.wine_install.outputs.WINE_PATH }}
diff --git a/README.md b/README.md
index 7f8a1d8..fed2e32 100644
--- a/README.md
+++ b/README.md
@@ -5,22 +5,22 @@ Main Repo for the OpenVic2 Project
For detailed instructions, view the Contributor Quickstart Guide [here](docs/contribution-quickstart-guide.md)
## Required
-* [Godot 4.0.1](https://github.com/godotengine/godot/releases/tag/4.0.1-stable)
+* [Godot 4.0.2](https://github.com/godotengine/godot/releases/tag/4.0.2-stable)
* [scons](https://scons.org/)
## [Godot Documentation](https://docs.godotengine.org/en/latest/)
## Build/Run Instructions
-1. Install [Godot 4.0.1](https://github.com/godotengine/godot/releases/tag/4.0.1-stable) and [scons](https://scons.org/) for your system.
+1. Install [Godot 4.0.2](https://github.com/godotengine/godot/releases/tag/4.0.2-stable) and [scons](https://scons.org/) for your system.
2. Run the command `git submodule update --init --recursive` to retrieve all related submodules.
3. Run `scons` in the project root, you should see a libopenvic2 file in `game/bin/openvic2`.
-4. Open with Godot 4.0.1, click import and navigate to the `game` directory.
+4. Open with Godot 4, click import and navigate to the `game` directory.
5. Import and edit.
6. Once loaded, click the play button at the top right, if you see `Hello GDExtension Singleton!` in the output at the bottom then it is working.
## Project Export
1. Build the extension with `scons` or `scons target=template_debug`. (or `scons target=template_release` for release)
-2. Open `game/project.godot` with Godot 4.0.1.
+2. Open `game/project.godot` with Godot 4.
3. Click `Project` at the top left, click `Export`.
4. If you do not have the templates, you must download the templates, there is highlighted white text at the bottom of the Export subwindow that opens up the template manager for you to download.
5. Click `Export All`:
diff --git a/godot-cpp b/godot-cpp
-Subproject 4d3afc0ad0c5445831418830a33c6adb3e0a9aa
+Subproject 7fb46e9ea1571b1364ab049b2088e9b302ff798