Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Godot 4.1.3 Stable Release #164

Merged
merged 1 commit into from
Nov 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [push, pull_request]

env:
GODOT_BASE_DOWNLOAD_URL: https://github.com/godotengine/godot
GODOT_VERSION: 4.1.1
GODOT_VERSION: 4.1.3
GODOT_VERSION_TYPE: stable
OPENVIC_BASE_BRANCH: master

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.1](https://github.com/godotengine/godot/releases/tag/4.1.1-stable)
* [Godot 4.1.3](https://github.com/godotengine/godot/releases/tag/4.1.3-stable)
* [scons](https://scons.org/)

See [System Requirements](docs/contribution/system-requirements.md).
Expand All @@ -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.1.1](https://github.com/godotengine/godot/releases/tag/4.1.1-stable) and [scons](https://scons.org/) for your system.
1. Install [Godot 4.1.3](https://github.com/godotengine/godot/releases/tag/4.1.3-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.
Expand Down
13 changes: 11 additions & 2 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@ opts = env.SetupOptions()
env.FinalizeOptions()

# Needs Clone, else godot-cpp builds using our modified environment variables. eg: godot-cpp builds on C++20
OLD_ARGS = ARGUMENTS.copy()
ARGUMENTS["use_static_cpp"] = False # TODO: Dependencies need to update scripts submodule
ARGUMENTS["disable_exceptions"] = env["disable_exceptions"]
godot_env = SConscript("godot-cpp/SConstruct")
ARGUMENTS = OLD_ARGS

# Make LIBS into a list which is easier to deal with.
godot_env["LIBS"] = [godot_env["LIBS"]]
env.Append(CPPPATH=godot_env["CPPPATH"])
env.Append(LIBPATH=godot_env["LIBPATH"])
env.Prepend(LIBS=godot_env["LIBS"])

SConscript("extension/deps/SCsub", "env")
Expand Down Expand Up @@ -77,8 +80,14 @@ else:
source=sources,
)

default_args = [library]

# Add compiledb if the option is set
if env.get("compiledb", False):
default_args += ["compiledb"]

if "env" in locals():
# FIXME: This method mixes both cosmetic progress stuff and cache handling...
env.show_progress(env)

Default(library)
Default(default_args)
2 changes: 1 addition & 1 deletion godot-cpp
Submodule godot-cpp updated 47 files
+23 −4 .github/workflows/ci.yml
+1 −1 .github/workflows/static_checks.yml
+4 −0 .gitignore
+21 −5 CMakeLists.txt
+26 −17 README.md
+10 −250 SConstruct
+111 −81 binding_generator.py
+169 −18 gdextension/extension_api.json
+62 −0 include/godot_cpp/classes/editor_plugin_registration.hpp
+1 −1 include/godot_cpp/classes/ref.hpp
+128 −81 include/godot_cpp/classes/wrapped.hpp
+10 −8 include/godot_cpp/core/class_db.hpp
+1 −1 include/godot_cpp/core/memory.hpp
+2 −0 include/godot_cpp/core/method_ptrcall.hpp
+0 −3 include/godot_cpp/godot.hpp
+21 −11 include/godot_cpp/templates/cowdata.hpp
+1 −1 include/godot_cpp/templates/list.hpp
+3 −3 include/godot_cpp/templates/rid_owner.hpp
+4 −4 include/godot_cpp/templates/thread_work_pool.hpp
+79 −50 include/godot_cpp/variant/char_string.hpp
+14 −6 include/godot_cpp/variant/variant.hpp
+8 −0 include/godot_cpp/variant/vector3.hpp
+8 −0 include/godot_cpp/variant/vector3i.hpp
+8 −0 include/godot_cpp/variant/vector4.hpp
+8 −0 include/godot_cpp/variant/vector4i.hpp
+3 −3 src/classes/editor_plugin_registration.cpp
+29 −0 src/classes/wrapped.cpp
+14 −3 src/core/class_db.cpp
+2 −2 src/core/memory.cpp
+45 −16 src/godot.cpp
+107 −98 src/variant/char_string.cpp
+8 −6 src/variant/variant.cpp
+16 −1 test/CMakeLists.txt
+3 −1 test/project/example.gdextension
+54 −0 test/project/main.gd
+54 −0 test/src/example.cpp
+17 −0 test/src/example.h
+22 −8 tools/android.py
+333 −0 tools/godotcpp.py
+31 −6 tools/ios.py
+0 −26 tools/ios_osxcross.py
+2 −0 tools/linux.py
+28 −6 tools/macos.py
+0 −28 tools/macos_osxcross.py
+67 −15 tools/targets.py
+23 −24 tools/web.py
+31 −11 tools/windows.py
2 changes: 1 addition & 1 deletion scripts