aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author George L. Albany <Megacake1234@gmail.com>2023-12-18 20:46:24 +0100
committer GitHub <noreply@github.com>2023-12-18 20:46:24 +0100
commite35b9ed5d753a6690e720d5403953f89d8f1faad (patch)
treeb16e133e8575b06ec461abaf6d0b8611ec3adaab
parent0b3a162d3db840996c3d89e65dfe9270faebffe5 (diff)
parentc37d79668f33d6f96a82ea9f50affcd9638cf82c (diff)
Merge pull request #171 from Spartan322/update/godot4.2.1-stable
-rw-r--r--.github/workflows/builds.yml2
-rw-r--r--README.md4
m---------godot-cpp0
3 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index efa5c85..74c78c4 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
env:
GODOT_BASE_DOWNLOAD_URL: https://github.com/godotengine/godot
- GODOT_VERSION: 4.2
+ GODOT_VERSION: 4.2.1
GODOT_VERSION_TYPE: stable
OPENVIC_BASE_BRANCH: master
diff --git a/README.md b/README.md
index ec35c67..dc04ac8 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Main Repo for the OpenVic Project
For detailed instructions, view the Contributor Quickstart Guide [here](docs/contribution-quickstart-guide.md)
## System Requirements
-* [Godot 4.2](https://github.com/godotengine/godot/releases/tag/4.2-stable)
+* [Godot 4.2.1](https://github.com/godotengine/godot/releases/tag/4.2.1-stable)
* [scons](https://scons.org/)
See [System Requirements](docs/contribution/system-requirements.md).
@@ -21,7 +21,7 @@ See [Cloning](docs/contribution/cloning.md).
## [Godot Documentation](https://docs.godotengine.org/en/latest/)
## Build/Run Instructions
-1. Install [Godot 4.2](https://github.com/godotengine/godot/releases/tag/4.2-stable) and [scons](https://scons.org/) for your system.
+1. Install [Godot 4.2.1](https://github.com/godotengine/godot/releases/tag/4.2.1-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 libopenvic file in `game/bin/openvic`.
4. Open with Godot 4, click import and navigate to the `game` directory.
diff --git a/godot-cpp b/godot-cpp
-Subproject 54136ee8357c5140a3775c54f08db5f7deda205
+Subproject 78ffea5b136f3178c31cddb28f6b963ceaa8942