Skip to content

Commit

Permalink
Merge pull request #89339 from akien-mga/4.2-cherrypicks
Browse files Browse the repository at this point in the history
Cherry-picks for the 4.2 branch (future 4.2.2) - 3rd batch
  • Loading branch information
akien-mga authored Mar 12, 2024
2 parents 2a8c429 + fa1b680 commit c61a686
Showing 502 changed files with 3,932 additions and 7,817 deletions.
2 changes: 1 addition & 1 deletion .github/actions/download-artifact/action.yml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ runs:
using: "composite"
steps:
- name: Download Godot Artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ inputs.name }}
path: ${{ inputs.path }}
2 changes: 1 addition & 1 deletion .github/actions/godot-cache/action.yml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ runs:
steps:
# Upload cache on completion and check it out now
- name: Load .scons_cache directory
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{inputs.scons-cache}}
key: ${{inputs.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
2 changes: 1 addition & 1 deletion .github/actions/godot-deps/action.yml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ runs:
steps:
# Use python 3.x release (works cross platform)
- name: Set up Python 3.x
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
# Semantic version range syntax or exact version of a Python version
python-version: ${{ inputs.python-version }}
2 changes: 1 addition & 1 deletion .github/actions/upload-artifact/action.yml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ runs:
using: "composite"
steps:
- name: Upload Godot Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ inputs.name }}
path: ${{ inputs.path }}
2 changes: 1 addition & 1 deletion .github/workflows/android_builds.yml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v4

- name: Set up Java 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
3 changes: 2 additions & 1 deletion .github/workflows/web_builds.yml
Original file line number Diff line number Diff line change
@@ -23,10 +23,11 @@ jobs:
- uses: actions/checkout@v4

- name: Set up Emscripten latest
uses: mymindstorm/setup-emsdk@v12
uses: mymindstorm/setup-emsdk@v14
with:
version: ${{env.EM_VERSION}}
actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
cache-key: emsdk-${{ matrix.cache-name }}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}

- name: Verify Emscripten setup
run: |
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -132,6 +132,10 @@ cppcheck-cppcheck-build-dir/
*.pydevproject
*.launch

# Emacs
\#*\#
.\#*

# GCOV code coverage
*.gcda
*.gcno
6 changes: 3 additions & 3 deletions COPYRIGHT.txt
Original file line number Diff line number Diff line change
@@ -296,8 +296,8 @@ License: BSD-3-clause

Files: ./thirdparty/libpng/
Comment: libpng
Copyright: 1995-2019, The PNG Reference Library Authors.
2018-2019, Cosmin Truta.
Copyright: 1995-2024, The PNG Reference Library Authors.
2018-2024, Cosmin Truta.
2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
1996-1997, Andreas Dilger.
1995-1996, Guy Eric Schalnat, Group 42, Inc.
@@ -340,7 +340,7 @@ License: CC0-1.0

Files: ./thirdparty/miniupnpc/
Comment: MiniUPnP Project
Copyright: 2005-2023, Thomas Bernard
Copyright: 2005-2024, Thomas Bernard
License: BSD-3-clause

Files: ./thirdparty/minizip/
2 changes: 1 addition & 1 deletion SConstruct
Original file line number Diff line number Diff line change
@@ -152,7 +152,7 @@ env_base["x86_libtheora_opt_gcc"] = False
env_base["x86_libtheora_opt_vc"] = False

# avoid issues when building with different versions of python out of the same directory
env_base.SConsignFile(".sconsign{0}.dblite".format(pickle.HIGHEST_PROTOCOL))
env_base.SConsignFile(File("#.sconsign{0}.dblite".format(pickle.HIGHEST_PROTOCOL)).abspath)

# Build options

10 changes: 10 additions & 0 deletions core/error/error_macros.h
Original file line number Diff line number Diff line change
@@ -730,6 +730,16 @@ void _err_flush_stdout();
} else \
((void)0)

/**
* Warns about `m_msg` only when verbose mode is enabled.
*/
#define WARN_VERBOSE(m_msg) \
{ \
if (is_print_verbose_enabled()) { \
WARN_PRINT(m_msg); \
} \
}

// Print deprecated warning message macros.

/**
3 changes: 3 additions & 0 deletions core/extension/gdextension.cpp
Original file line number Diff line number Diff line change
@@ -794,6 +794,9 @@ void GDExtension::deinitialize_library(InitializationLevel p_level) {
ERR_FAIL_COND(p_level > int32_t(level_initialized));

level_initialized = int32_t(p_level) - 1;

ERR_FAIL_NULL(initialization.deinitialize);

initialization.deinitialize(initialization.userdata, GDExtensionInitializationLevel(p_level));
}

Loading

0 comments on commit c61a686

Please sign in to comment.