builds godot
-rw-r--r--.github/2d-build-modules.py106
-rw-r--r--.github/actions/build-godot/action.yml15
-rw-r--r--.github/actions/build-upload-image/action.yml14
-rw-r--r--.github/actions/release/action.yml11
-rw-r--r--.github/actions/setup/action.yml4
-rw-r--r--.github/actions/upload-artifact/action.yml4
-rw-r--r--.github/normal-build-modules.py5
-rw-r--r--.github/workflows/reusable-build.yml109
-rw-r--r--patches/fix_buffer_underrun.patch23
-rw-r--r--patches/hex_decode.patch154
-rw-r--r--patches/no-arg-handling.patch112
11 files changed, 133 insertions, 424 deletions
diff --git a/.github/2d-build-modules.py b/.github/2d-build-modules.py
index 0c3fb29..698b100 100644
--- a/.github/2d-build-modules.py
+++ b/.github/2d-build-modules.py
@@ -1,69 +1,67 @@
-module_bmp_enabled = "no"
-module_csg_enabled = "no"
-module_enet_enabled = "no"
-module_etc_enabled = "no"
-module_gltf_enabled = "no"
-module_gridmap_enabled = "no"
-module_hdr_enabled = "no"
-module_jpg_enabled = "no"
-module_lightmapper_cpu_enabled = "no"
-module_webm_enabled = "no"
debug_symbols = "no"
-optimize = "size"
-lto = "auto"
-production = "yes"
-deprecated = "no"
-minizip = "yes"
-vulkan = "yes"
-opengl3 = "yes"
-openxr = "no"
-pulseaudio = "yes"
-dbus = "yes"
-speechd = "no"
-fontconfig = "yes"
-udev = "yes"
-x11 = "yes"
-touch = "yes"
+brotli = "yes" # compression and woff2
+dbus = "no" # screensaver and portal
execinfo = "no"
+fontconfig = "yes" # system fonts
+graphite = "yes"
+minizip = "no" # zip support
+module_astcenc_enabled = "no" # adaptive scalable data compression format
module_basis_universal_enabled = "yes"
-module_camera_enabled = "yes"
-module_cvtt_enabled = "no"
-module_dds_enabled = "no"
-module_denoise_enabled = "no"
-module_etcpak_enabled = "no"
-brotli = "yes"
-module_freetype_enabled = "yes"
+module_bmp_enabled = "no" # BMP file format
+module_camera_enabled = "no" # windows and macos camera access
+module_csg_enabled = "no" # 3D csg boxes
+module_cvtt_enabled = "no" # yet another image format
+module_dds_enabled = "no" # ditto (but this is multiple)
+module_denoise_enabled = "no" # 3d lightmap denoising
+module_enet_enabled = "no" # multiplayer backend
+module_etc_enabled = "no" # image compression (again)
+module_etcpak_enabled = "no" # ^
+module_freetype_enabled = "yes" # font rendering
module_gdscript_enabled = "yes"
module_glslang_enabled = "yes"
-module_jsonrpc_enabled = "no"
+module_gltf_enabled = "no" # gltf loading
+module_gridmap_enabled = "no" # gridmap
+module_hdr_enabled = "no" # hdr images
+module_jpg_enabled = "no" # jpg images
+module_jsonrpc_enabled = "yes" # godot/modules/jsonrpc/jsonrpc.cpp (needed for editor)
module_lightmapper_rd_enabled = "no"
-module_mbedtls_enabled = "no"
+module_mbedtls_enabled = "no" # TLS and crypto
module_meshoptimizer_enabled = "no"
-module_minimp3_enabled = "no"
+module_minimp3_enabled = "no" # mp3 player
module_mobile_vr_enabled = "no"
-module_mono_enabled = "no"
+module_mono_enabled = "no" # .NET
module_msdfgen_enabled = "no"
-module_multiplayer_enabled = "no"
-module_navigation_enabled = "yes"
-module_noise_enabled = "no"
-module_ogg_enabled = "yes"
+module_multiplayer_enabled = "no" # godot multiplayer
+module_navigation_enabled = "yes" # navigation!!
+module_noise_enabled = "yes" # noise generation
+openxr = "no" # XR
module_openxr_enabled = "no"
-module_raycast_enabled = "yes"
+module_ogg_enabled = "yes"
+module_raycast_enabled = "no" # lightmap raytracing
module_regex_enabled = "yes"
-module_squish_enabled = "no"
-module_svg_enabled = "yes"
-graphite = "yes"
-module_text_server_adv_enabled = "yes"
-module_text_server_fb_enabled = "yes"
-module_tga_enabled = "no"
-module_theora_enabled = "no"
-module_tinyexr_enabled = "no"
+module_squish_enabled = "yes" # S3TC lossy compression format
+module_svg_enabled = "yes" # svg is necessary for editor
+module_text_server_fb_enabled = "no" # the text server
+module_text_server_adv_enabled = "yes" # the cooler text server
+module_tga_enabled = "no" # more image formats
+module_theora_enabled = "no" # ogg theora video format
+module_tinyexr_enabled = "no" # image
+module_ktx_enabled = "no" # why are there so many random image formats
module_upnp_enabled = "no" # universal plug and play
-module_vhacd_enabled = "no"
-module_vorbis_enabled = "yes"
-module_webp_enabled = "yes"
+module_vhacd_enabled = "no" # 3d surface stuff
+module_vorbis_enabled = "yes" # vorbis audio
+module_webp_enabled = "yes" # lossy compression format
module_webrtc_enabled = "no"
-module_websocket_enabled = "no"
+module_websocket_enabled = "yes" # websockets are useful, and editor needs for LSP
module_webxr_enabled = "no"
-module_xatlas_unwrap_enabled = "no"
+module_xatlas_unwrap_enabled = "no" # lightmapping stuff
module_zip_enabled = "no"
+opengl3 = "yes"
+optimize = "size"
+pulseaudio = "yes" # linux audio
+speechd = "no" # tts
+touch = "yes" # touchscreen
+udev = "yes"
+vulkan = "no" # use opengl3, this is the size build
+use_volk = "no"
+x11 = "yes" # x11 rendering
diff --git a/.github/actions/build-godot/action.yml b/.github/actions/build-godot/action.yml
index dc6e09d..88ec767 100644
--- a/.github/actions/build-godot/action.yml
+++ b/.github/actions/build-godot/action.yml
@@ -11,6 +11,9 @@ inputs:
target:
description: Target (template_release, template_debug, editor)
required: true
+ tools:
+ description: Tools!
+ default: "no"
runs:
using: "composite"
@@ -48,12 +51,14 @@ runs:
run: |
echo ::group::Compilation
cd godot
- scons_flags=${{ env.flags }}
+ scons_flags="${{ env.flags }} ${{ inputs.flags }} tools=${{ inputs.tools }}"
cores=$(nproc) || cores=$(sysctl -n hw.ncpu)
- [[ -n "${{ inputs.flags }}" ]] && scons_flags="${{ inputs.flags }}"
- [[ ${{ inputs.target }} == "editor" ]] && scons_flags="${scons_flags//disable_3d=yes/}" # remove disable_3d=yes if editor
- scons -j$((cores+2)) p=${{ inputs.platform }} target=${{ inputs.target }} use_lto=yes udev=yes $scons_flags
- strip bin/* || true
+ [[ ${{ inputs.tools }} == "yes" ]] && scons_flags="${scons_flags//disable_3d=yes/}" # remove disable_3d=yes if editor
+ [[ ${{ inputs.tools }} == "yes" ]] && scons_flags="$scons_flags debug_symbols=no"
+ [[ ${{ inputs.target }} ]] && scons_flags="$scons_flags deprecated=no"
+ scons -j$((cores+2)) p=${{ inputs.platform }} target=${{ inputs.target }} verbose=yes udev=yes dev_build=no lto=auto $scons_flags
+ echo "compile done"
+ [[ ${{ inputs.target}} != "editor" ]] && strip -v bin/* || true
ls bin
echo ::endgroup::
shell: bash
diff --git a/.github/actions/build-upload-image/action.yml b/.github/actions/build-upload-image/action.yml
index 4fbf2c5..aff9222 100644
--- a/.github/actions/build-upload-image/action.yml
+++ b/.github/actions/build-upload-image/action.yml
@@ -19,16 +19,20 @@ runs:
uses: bend-n/godot-builds/.github/actions/get-version@main
- name: Get templates
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
with:
name: templates
- - name: Get editor
- uses: actions/download-artifact@v3
+ - name: Get headless editor
+ uses: actions/download-artifact@v4
with:
- name: linuxbsd-editor-release
+ name: server-editor-release
- - run: mv godot.linuxbsd.editor.x86_64 godot && chmod -v +x godot
+ - name: List all downloaded files
+ run: ls -R
+ shell: bash
+
+ - run: mv godot_server.x11.opt.tools.64 godot && chmod -v +x godot
shell: bash
- name: Login to GitHub Container Registry
diff --git a/.github/actions/release/action.yml b/.github/actions/release/action.yml
index ad49765..c5e8fca 100644
--- a/.github/actions/release/action.yml
+++ b/.github/actions/release/action.yml
@@ -17,18 +17,23 @@ runs:
uses: bend-n/godot-builds/.github/actions/get-version@main
- name: Get templates
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
with:
name: templates
- name: Get editor
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
with:
name: linuxbsd-editor-release
+ - name: List all downloaded files
+ run: ls -R
+ shell: bash
+
- name: Compress
run: |
- mv godot.linuxbsd.editor.x86_64 ${{ env.fstart }}_linux.x86_64
+ strip godot.x11.opt.tools.64 -v || true
+ mv godot.x11.opt.tools.64 ${{ env.fstart }}_linux.x86_64
mv templates.tpz ${{ env.fstart }}_export_templates.tpz
shell: bash
env:
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 0963d97..68be9c4 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -40,6 +40,6 @@ runs:
# Patch godot
(cd repo && mv "${{ env.modules }}" ../godot/custom.py && mv patches ../godot)
cd godot
- for patch in patches/*; do git apply --ignore-whitespace "$patch" || err="$patch"; done
- [[ -n $err ]] && echo "::warning file={${err}}::Patch did not apply"
+ echo "applying $(find patches/* | tr '\n' ' ')..."
+ git apply patches/* || echo "::warning::Some patches failed"
shell: bash
diff --git a/.github/actions/upload-artifact/action.yml b/.github/actions/upload-artifact/action.yml
index 84bc56f..40b442b 100644
--- a/.github/actions/upload-artifact/action.yml
+++ b/.github/actions/upload-artifact/action.yml
@@ -5,7 +5,7 @@ description: Uploads the artifact
inputs:
name:
description: The artifact name.
- default: "${{ github.job }}"
+ default: "${{ github.job }}-${{ matrix.target }}"
required: true
path:
description: The path to upload.
@@ -16,7 +16,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 }}
diff --git a/.github/normal-build-modules.py b/.github/normal-build-modules.py
index 189b130..75f14db 100644
--- a/.github/normal-build-modules.py
+++ b/.github/normal-build-modules.py
@@ -1,5 +1,2 @@
+optimize = "speed"
debug_symbols = "no"
-optimize = "size"
-lto = "auto"
-production = "yes"
-deprecated = "no"
diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
index fabd372..b8b09f2 100644
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml
@@ -40,7 +40,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
- target: [template_release, template_debug]
+ target: [release, release_debug]
bits: [64]
steps:
- name: Compilation
@@ -53,12 +53,12 @@ jobs:
- name: Upload artifact
uses: bend-n/godot-builds/.github/actions/upload-artifact@main
with:
- path: godot/bin/*.x86_64
+ path: godot/bin/*.64
windows:
strategy:
matrix:
- target: [template_release, template_debug]
+ target: [release, release_debug]
bits: [64]
name: Win temps
runs-on: windows-latest
@@ -80,12 +80,12 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
- target: [template_release, template_debug]
+ target: [release, release_debug]
steps:
- - name: Set up Java 11
+ - name: Set up Java 17
uses: actions/setup-java@v3
with:
- java-version: 11
+ java-version: 17
distribution: temurin
- name: Compilation (armv7)
@@ -115,30 +115,14 @@ jobs:
macos:
strategy:
matrix:
- target: [template_release, template_debug]
+ target: [release, release_debug]
name: macOS temps
runs-on: macos-latest
steps:
- name: Install MoltenVK
- run: | # curl https://raw.githubusercontent.com/godotengine/godot/master/misc/scripts/install_vulkan_sdk_macos.sh
- curl -L "https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.dmg" -o /tmp/vulkan-sdk.dmg
- hdiutil attach /tmp/vulkan-sdk.dmg -mountpoint /Volumes/vulkan-sdk
- /Volumes/vulkan-sdk/InstallVulkan.app/Contents/MacOS/InstallVulkan \
- --accept-licenses --default-answer --confirm-command install
-
- cnt=5
- until hdiutil detach -force /Volumes/vulkan-sdk
- do
- [[ cnt -eq "0" ]] && break
- sleep 1
- ((cnt--))
- done
-
- rm -f /tmp/vulkan-sdk.dmg
-
- echo 'Vulkan SDK installed successfully! You can now build Godot by running "scons".'
-
+ run: curl https://raw.githubusercontent.com/godotengine/godot/master/misc/scripts/install_vulkan_sdk_macos.sh -s | sh
+
- name: Compilation(x86_64)
uses: bend-n/godot-builds/.github/actions/build-godot@main
with:
@@ -155,12 +139,12 @@ jobs:
- name: Create universal
run: |
- [[ "${{ matrix.target }}" == *"debug"* ]] && target='.debug'
+ [[ "${{ matrix.target }}" == *"release_debug"* ]] && target='.debug'
cd godot
- intel=bin/godot.macos.*.x86_64
- arm=bin/godot.macos.*.arm64
- lipo -create $intel $arm -output "bin/godot.macos.opt$target.universal"
- strip "bin/godot.macos.opt$target.universal"
+ intel=bin/godot.osx.*.x86_64
+ arm=bin/godot.osx.*.arm64
+ lipo -create $intel $arm -output "bin/godot.osx.opt$target.universal"
+ strip "bin/godot.osx.opt$target.universal"
- name: Upload artifact
uses: bend-n/godot-builds/.github/actions/upload-artifact@main
@@ -170,8 +154,8 @@ jobs:
web:
strategy:
matrix:
- target: [template_release, template_debug]
- flags: [dlink_enabled=yes, ""]
+ target: [release]
+ flags: [gdnative_enabled=yes, threads_enabled=yes, ""]
name: JS temps
runs-on: ubuntu-20.04
@@ -195,20 +179,24 @@ jobs:
uses: bend-n/godot-builds/.github/actions/upload-artifact@main
with:
path: godot/bin/*.zip
+ name: ${{ inputs.name }}-${{ matrix.target }}-${{ matrix.flags }}
templates:
needs: [web, macos, windows, linux, android]
name: Bundle all templates
- runs-on: ubuntu-latest
+ runs-on: ubuntu-20.04
env:
tmps: "templates"
steps:
- name: Download all artifacts
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
- name: List all downloaded files
run: ls -R
+ - name: flatten
+ run: find . -mindepth 2 -type f -exec mv -t . -i '{}' +
+
- name: Getdot
uses: actions/checkout@v3
with:
@@ -222,36 +210,32 @@ jobs:
bug="template_debug"
mkdir -vp "$tmps"
echo "Preparing linux"
- linux="godot.linuxbsd"
- mv "linux/$linux.$bug.x86_64" "$tmps/linux_debug.x86_64"
- mv "linux/$linux.$rel.x86_64" "$tmps/linux_release.x86_64"
+ linux="godot.x11.opt"
+ mv "$linux.64" "$tmps/linux_x11_debug.x86_64"
+ mv "$linux.debug.64" "$tmps/linux_x11_release.x86_64"
echo "Preparing windows"
- windows="godot.windows"
- mv "windows/$windows.$bug.x86_64.console.exe" "$tmps/windows_debug_x86_64_console.exe"
- mv "windows/$windows.$bug.x86_64.exe" "$tmps/windows_debug_x86_64.exe"
- mv "windows/$windows.$rel.x86_64.console.exe" "$tmps/windows_release_x86_64_console.exe"
- mv "windows/$windows.$rel.x86_64.exe" "$tmps/windows_release_x86_64.exe"
+ windows="godot.windows.opt"
+ # mv "windows/$windows.debug.64.exe" "$tmps/windows_debug_x86_64.exe"
+ mv "$windows.64.exe" "$tmps/windows_release_x86_64.exe"
echo "Preparing android"
- mv "android/android_debug.apk" "$tmps/android_debug.apk"
- mv "android/android_release.apk" "$tmps/android_release.apk"
+ # mv "android/android_debug.apk" "$tmps/android_debug.apk"
+ mv "android_release.apk" "$tmps/android_release.apk"
echo "Preparing macos"
- mac="godot.macos.opt"
- cp -r "godot-repo/misc/dist/macos_template.app" "."
- mkdir -p "macos_template.app/Contents/MacOS"
- cp "macos/$mac.universal" "macos_template.app/Contents/MacOS/godot_macos_release.universal"
- cp "macos/$mac.debug.universal" "macos_template.app/Contents/MacOS/godot_macos_debug.universal"
- chmod +x macos_template.app/Contents/MacOS/godot_macos_*.universal
- zip -q -9 -r "$tmps/macos.zip" "macos_template.app"
+ mac="godot.osx.opt"
+ cp -r "godot-repo/misc/dist/osx_template.app" "."
+ mkdir -p "osx_template.app/Contents/MacOS"
+ cp "$mac.universal" "osx_template.app/Contents/MacOS/godot_osx_release.64"
+ # cp "macos/$mac.debug.universal" "osx_template.app/Contents/MacOS/godot_osx_debug.64"
+ chmod +x osx_template.app/Contents/MacOS/*.64
+ zip -q -9 -r "$tmps/osz.zip" "osx_template.app"
echo "Preparing web"
- web="godot.web"
- mv "web/$web.$rel.wasm32.zip" "$tmps/web_release.zip"
- mv "web/$web.$bug.wasm32.zip" "$tmps/web_debug.zip"
- mv "web/$web.$rel.wasm32.dlink.zip" "$tmps/web_dlink_release.zip"
- mv "web/$web.$bug.wasm32.dlink.zip" "$tmps/web_dlink_debug.zip"
+ web="godot.javascript.opt"
+ mv "$web.zip" "$tmps/webassembly_release.zip"
+ mv "$web.gdnative.zip" "$tmps/webassembly_gdnative_release.zip"
- name: Prepare bundle
run: cd "${tmps}" && zip -qr9 templates.tpz ./*
@@ -260,22 +244,27 @@ jobs:
uses: bend-n/godot-builds/.github/actions/upload-artifact@main
with:
path: ${{ env.tmps }}/templates.tpz
+ name: templates
editor:
+ strategy:
+ matrix:
+ platform: [server, linuxbsd]
name: Linux editor
runs-on: ubuntu-20.04
steps:
- name: Compilation
uses: bend-n/godot-builds/.github/actions/build-godot@main
with:
- platform: linuxbsd
- target: editor
+ platform: ${{ matrix.platform }}
+ target: release_debug
+ tools: "yes"
- name: Upload artifact
uses: bend-n/godot-builds/.github/actions/upload-artifact@main
with:
- name: linuxbsd-editor-release
- path: godot/bin/*.x86_64
+ name: ${{ matrix.platform }}-editor-release
+ path: godot/bin/*.64
image:
if: inputs.make-release == 'yes'
diff --git a/patches/fix_buffer_underrun.patch b/patches/fix_buffer_underrun.patch
deleted file mode 100644
index 4cddcbf..0000000
--- a/patches/fix_buffer_underrun.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 5d10dc5da2508530a38c66d4aa1ec234327a3b34 Mon Sep 17 00:00:00 2001
-From: Ellen Poe <[email protected]>
-Date: Sun, 12 Feb 2023 07:34:55 -0800
-Subject: [PATCH] Fix AudioStreamGenerator stopping playback after a buffer
- underrun
-
----
- servers/audio_server.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp
-index 0344bf322d68..5e71d7af0550 100644
---- a/servers/audio_server.cpp
-+++ b/servers/audio_server.cpp
-@@ -354,7 +354,7 @@ void AudioServer::_mix_step() {
- playback->stream_playback->tag_used_streams();
- }
-
-- if (mixed_frames != buffer_size) {
-+ if (!playback->stream_playback->is_playing()) {
- // We know we have at least the size of our lookahead buffer for fade-out purposes.
-
- float fadeout_base = 0.94;
diff --git a/patches/hex_decode.patch b/patches/hex_decode.patch
deleted file mode 100644
index b4daf3d..0000000
--- a/patches/hex_decode.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-diff --git a/core/string/ustring.cpp b/core/string/ustring.cpp
-index 6a59942a56..773445edb6 100644
---- a/core/string/ustring.cpp
-+++ b/core/string/ustring.cpp
-@@ -1644,6 +1644,35 @@ String String::hex_encode_buffer(const uint8_t *p_buffer, int p_len) {
- return ret;
- }
-
-+Vector<uint8_t> String::hex_decode() const {
-+ ERR_FAIL_COND_V_MSG(length() % 2 != 0, Vector<uint8_t>(), "Hexadecimal string of uneven length.");
-+
-+#define HEX_TO_BYTE(m_output, m_index) \
-+ uint8_t m_output; \
-+ c = operator[](m_index); \
-+ if (is_digit(c)) { \
-+ m_output = c - '0'; \
-+ } else if (c >= 'a' && c <= 'f') { \
-+ m_output = c - 'a' + 10; \
-+ } else if (c >= 'A' && c <= 'F') { \
-+ m_output = c - 'A' + 10; \
-+ } else { \
-+ ERR_FAIL_V_MSG(Vector<uint8_t>(), "Invalid hexadecimal character \"" + chr(c) + "\" at index " + m_index + "."); \
-+ }
-+
-+ Vector<uint8_t> out;
-+ int len = length() / 2;
-+ out.resize(len);
-+ for (int i = 0; i < len; i++) {
-+ char32_t c;
-+ HEX_TO_BYTE(first, i * 2);
-+ HEX_TO_BYTE(second, i * 2 + 1);
-+ out.write[i] = first * 16 + second;
-+ }
-+ return out;
-+#undef HEX_TO_BYTE
-+}
-+
- void String::print_unicode_error(const String &p_message, bool p_critical) const {
- if (p_critical) {
- print_error(vformat("Unicode parsing error, some characters were replaced with spaces: %s", p_message));
-diff --git a/core/string/ustring.h b/core/string/ustring.h
-index 28e3af92c5..90034b1b07 100644
---- a/core/string/ustring.h
-+++ b/core/string/ustring.h
-@@ -321,6 +321,8 @@ public:
- static String chr(char32_t p_char);
- static String md5(const uint8_t *p_md5);
- static String hex_encode_buffer(const uint8_t *p_buffer, int p_len);
-+ Vector<uint8_t> hex_decode() const;
-+
- bool is_numeric() const;
-
- double to_float() const;
-diff --git a/core/variant/variant_call.cpp b/core/variant/variant_call.cpp
-index ae15158836..13e9da37f2 100644
---- a/core/variant/variant_call.cpp
-+++ b/core/variant/variant_call.cpp
-@@ -1734,6 +1734,7 @@ static void _register_variant_builtin_methods() {
- bind_string_method(to_utf8_buffer, sarray(), varray());
- bind_string_method(to_utf16_buffer, sarray(), varray());
- bind_string_method(to_utf32_buffer, sarray(), varray());
-+ bind_string_method(hex_decode, sarray(), varray());
- bind_string_method(to_wchar_buffer, sarray(), varray());
-
- bind_static_method(String, num_scientific, sarray("number"), varray());
-diff --git a/doc/classes/String.xml b/doc/classes/String.xml
-index 1f4ffa417d..854bb2b2f8 100644
---- a/doc/classes/String.xml
-+++ b/doc/classes/String.xml
-@@ -313,6 +313,24 @@
- [b]Note:[/b] Strings with equal hash values are [i]not[/i] guaranteed to be the same, as a result of hash collisions. On the countrary, strings with different hash values are guaranteed to be different.
- </description>
- </method>
-+ <method name="hex_decode" qualifiers="const">
-+ <return type="PackedByteArray" />
-+ <description>
-+ Decodes a hexadecimal string as a [PackedByteArray].
-+ [codeblocks]
-+ [gdscript]
-+ var text = "hello world"
-+ var encoded = text.to_utf8_buffer().hex_encode()
-+ print(buf.hex_decode().get_string_from_utf8())
-+ [/gdscript]
-+ [csharp]
-+ var text = "hello world";
-+ var encoded = text.ToUtf8Buffer().HexEncode();
-+ GD.Print(buf.HexDecode().GetStringFromUtf8());
-+ [/csharp]
-+ [/codeblocks]
-+ </description>
-+ </method>
- <method name="hex_to_int" qualifiers="const">
- <return type="int" />
- <description>
-diff --git a/doc/classes/StringName.xml b/doc/classes/StringName.xml
-index 2140c53e20..c41fcac033 100644
---- a/doc/classes/StringName.xml
-+++ b/doc/classes/StringName.xml
-@@ -296,6 +296,24 @@
- [b]Note:[/b] Strings with equal hash values are [i]not[/i] guaranteed to be the same, as a result of hash collisions. On the countrary, strings with different hash values are guaranteed to be different.
- </description>
- </method>
-+ <method name="hex_decode" qualifiers="const">
-+ <return type="PackedByteArray" />
-+ <description>
-+ Decodes a hexadecimal string as a [PackedByteArray].
-+ [codeblocks]
-+ [gdscript]
-+ var text = "hello world"
-+ var encoded = text.to_utf8_buffer().hex_encode()
-+ print(buf.hex_decode().get_string_from_utf8())
-+ [/gdscript]
-+ [csharp]
-+ var text = "hello world";
-+ var encoded = text.ToUtf8Buffer().HexEncode();
-+ GD.Print(buf.HexDecode().GetStringFromUtf8());
-+ [/csharp]
-+ [/codeblocks]
-+ </description>
-+ </method>
- <method name="hex_to_int" qualifiers="const">
- <return type="int" />
- <description>
-diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/StringExtensions.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/StringExtensions.cs
-index df67e075ac..d53bb9f536 100644
---- a/modules/mono/glue/GodotSharp/GodotSharp/Core/StringExtensions.cs
-+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/StringExtensions.cs
-@@ -728,6 +728,26 @@ namespace Godot
- return hash;
- }
-
-+ /// <summary>
-+ /// Decodes a hexadecimal string.
-+ /// </summary>
-+ /// <param name="instance">The hexadecimal string.</param>
-+ /// <returns>The byte array representation of this string.</returns>
-+ public static byte[] HexDecode(this string instance)
-+ {
-+ if (instance.Length % 2 != 0)
-+ {
-+ throw new ArgumentException("Hexadecimal string of uneven length.", nameof(instance));
-+ }
-+ int len = instance.Length / 2;
-+ byte[] ret = new byte[len];
-+ for (int i = 0; i < len; i++)
-+ {
-+ ret[i] = (byte)int.Parse(instance.AsSpan(i * 2, 2), NumberStyles.AllowHexSpecifier);
-+ }
-+ return ret;
-+ }
-+
- /// <summary>
- /// Returns a hexadecimal representation of this byte as a string.
- /// </summary>
diff --git a/patches/no-arg-handling.patch b/patches/no-arg-handling.patch
deleted file mode 100644
index 692fe34..0000000
--- a/patches/no-arg-handling.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff --git a/main/main.cpp b/main/main.cpp
-index 2326e519bf..dddcae0be2 100644
---- a/main/main.cpp
-+++ b/main/main.cpp
-@@ -156,10 +156,10 @@ static bool editor = false;
- static bool project_manager = false;
- static bool cmdline_tool = false;
- static String locale;
--static bool show_help = false;
- static bool auto_quit = false;
- static OS::ProcessID editor_pid = 0;
- #ifdef TOOLS_ENABLED
-+static bool show_help = false;
- static bool found_project = false;
- static bool auto_build_solutions = false;
- static String debug_server_uri;
-@@ -302,6 +302,7 @@ void finalize_theme_db() {
- #define MAIN_PRINT(m_txt)
- #endif
-
-+#ifdef TOOLS_ENABLED
- void Main::print_help(const char *p_binary) {
- print_line(String(VERSION_NAME) + " v" + get_full_version_string() + " - " + String(VERSION_WEBSITE));
- OS::get_singleton()->print("Free and open source software under the terms of the MIT license.\n");
-@@ -435,6 +436,7 @@ void Main::print_help(const char *p_binary) {
- #endif
- OS::get_singleton()->print("\n");
- }
-+#endif
-
- #ifdef TESTS_ENABLED
- // The order is the same as in `Main::setup()`, only core and some editor types
-@@ -679,7 +681,9 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
- List<String> args;
- List<String> main_args;
- List<String> user_args;
-+#ifdef TOOLS_ENABLED
- bool adding_user_args = false;
-+#endif
- List<String> platform_args = OS::get_singleton()->get_cmdline_platform_args();
-
- // Add command line arguments.
-@@ -774,6 +778,19 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
- }
- #endif
-
-+#ifndef TOOLS_ENABLED
-+ if (I->get() == "--main-pack") {
-+ if (I->next()) {
-+ main_pack = I->next()->get();
-+ N = I->next()->next();
-+ } else {
-+ OS::get_singleton()->print("Missing path to main pack file, aborting.\n");
-+ goto error;
-+ };
-+ } else {
-+ user_args.push_back(I->get());
-+ }
-+#else
- if (adding_user_args) {
- user_args.push_back(I->get());
- } else if (I->get() == "-h" || I->get() == "--help" || I->get() == "/?") { // display help
-@@ -1315,18 +1328,15 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
- } else {
- main_args.push_back(I->get());
- }
--
-+#endif
- I = N;
- }
--
- #ifdef TOOLS_ENABLED
- if (editor && project_manager) {
- OS::get_singleton()->print(
- "Error: Command line arguments implied opening both editor and project manager, which is not possible. Aborting.\n");
- goto error;
- }
--#endif
--
- // Network file system needs to be configured before globals, since globals are based on the
- // 'project.godot' file which will only be available through the network if this is enabled
- FileAccessNetwork::configure();
-@@ -1348,7 +1358,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
-
- FileAccess::make_default<FileAccessNetwork>(FileAccess::ACCESS_RESOURCES);
- }
--
-+#endif
- if (globals->setup(project_path, main_pack, upwards, editor) == OK) {
- #ifdef TOOLS_ENABLED
- found_project = true;
-@@ -1848,9 +1858,11 @@ error:
- args.clear();
- main_args.clear();
-
-+#ifdef TOOLS_ENABLED
- if (show_help) {
- print_help(execpath);
- }
-+#endif
-
- EngineDebugger::deinitialize();
-
-@@ -1897,7 +1909,7 @@ error:
-
- Error Main::setup2(Thread::ID p_main_tid_override) {
- // Print engine name and version
-- print_line(String(VERSION_NAME) + " v" + get_full_version_string() + " - " + String(VERSION_WEBSITE));
-+ print_line("v" + get_full_version_string());
-
- engine->startup_benchmark_begin_measure("servers");
-