Merge pull request #16 from decryptedchaos/merge-upstream

Merge upstream redot/master

Author: decryptedchaos

.github/actions/redot-cpp-build/action.yml

@@ -0,0 +1,39 @@
+name: Build redot-cpp
+description: Build redot-cpp with the provided options.
+
+env:
+  REDOT_CPP_BRANCH: 4.3
+
+inputs:
+  bin:
+    description: Path to the Redot binary.
+    required: true
+    type: string
+  scons-flags:
+    description: Additional SCons flags.
+    type: string
+  scons-cache:
+    description: The SCons cache path.
+    default: ${{ github.workspace }}/.scons_cache/
+    type: string
+
+runs:
+  using: composite
+  steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+        repository: Redot-Engine/redot-cpp
+        ref: ${{ env.REDOT_CPP_BRANCH }}
+        path: redot-cpp
+
+    - name: Extract API
+      shell: sh
+      run: ${{ inputs.bin }} --headless --dump-gdextension-interface --dump-extension-api
+
+    - name: SCons Build
+      shell: sh
+      env:
+        SCONS_CACHE: ${{ inputs.scons-cache }}
+      run: scons --directory=./redot-cpp/test "gdextension_dir=${{ github.workspace }}" ${{ inputs.scons-flags }}

.github/workflows/android_builds.yml

@@ -103,7 +103,27 @@ jobs:
           cd ../../..
           ls -l bin/android_editor_builds/
 
+          # Separate different editors for multiple artifacts
+          mkdir horizonos
+          mv bin/android_editor_builds/*-horizonos-* horizonos
+          mkdir picoos
+          mv bin/android_editor_builds/*-picoos-* picoos
+
       - name: Upload artifact
         uses: ./.github/actions/upload-artifact
         with:
           name: ${{ matrix.cache-name }}
+
+      - name: Upload artifact (Horizon OS)
+        if: matrix.target == 'editor'
+        uses: ./.github/actions/upload-artifact
+        with:
+          name: ${{ matrix.cache-name }}-horizonos
+          path: horizonos
+
+      - name: Upload artifact (PICO OS)
+        if: matrix.target == 'editor'
+        uses: ./.github/actions/upload-artifact
+        with:
+          name: ${{ matrix.cache-name }}-picoos
+          path: picoos

.github/workflows/linux_builds.yml

@@ -35,6 +35,8 @@ jobs:
             artifact: true
             # Validate godot-cpp compatibility on one arbitrary editor build.
             godot-cpp: true
+            # Validate redot-cpp compatibility on one arbitrary editor build.
+            redot-cpp: true
             cache-limit: 2
 
           - name: Editor with doubles and GCC sanitizers (target=editor, tests=yes, dev_build=yes, scu_build=yes, precision=double, use_asan=yes, use_ubsan=yes, linker=gold)
@@ -74,7 +76,7 @@ jobs:
             artifact: false
             cache-limit: 5
 
-          - name: Template w/ Mono (target=template_release, tests=yes)
+          - name: Template w/ Mono, release (target=template_release, tests=yes)
             cache-name: linux-template-mono
             target: template_release
             sconsflags: module_mono_enabled=yes
@@ -84,6 +86,16 @@ jobs:
             artifact: true
             cache-limit: 1
 
+          - name: Template w/ Mono, debug (target=template_debug, tests=yes)
+            cache-name: linux-template-mono-debug
+            target: template_debug
+            sconsflags: module_mono_enabled=yes
+            bin: ./bin/redot.linuxbsd.template_debug.x86_64.mono
+            build-mono: false
+            tests: true
+            artifact: true
+            cache-limit: 1
+
           - name: Minimal template (target=template_release, tests=yes, everything disabled)
             cache-name: linux-template-minimal
             target: template_release
@@ -105,7 +117,7 @@ jobs:
         run: |
           sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
           sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EB8B81E14DA65431D7504EA8F63F0F2B90935439
-          sudo add-apt-repository "deb https://ppa.launchpadcontent.net/kisak/turtle/ubuntu ${{ matrix.os == 'ubuntu-20.04' && 'focal' || 'jammy' }} main"
+          sudo add-apt-repository "deb https://ppa.launchpadcontent.net/kisak/turtle/ubuntu jammy main"
           sudo apt-get install -qq mesa-vulkan-drivers
 
       # TODO: Figure out somehow how to embed this one.
@@ -165,6 +177,13 @@ jobs:
           bin: ${{ matrix.bin }}
           scons-flags: target=template_debug dev_build=yes verbose=yes
 
+      - name: Compilation (redot-cpp)
+        uses: ./.github/actions/redot-cpp-build
+        if: matrix.redot-cpp
+        with:
+          bin: ${{ matrix.bin }}
+          scons-flags: target=template_debug dev_build=yes verbose=yes
+
       - name: Save Godot build cache
         uses: ./.github/actions/godot-cache-save
         with:

.github/workflows/static_checks.yml

@@ -15,6 +15,7 @@ jobs:
 
       - name: Install APT dependencies
         run: |
+          sudo apt update
           sudo apt install -y libxml2-utils
 
       - name: Install Python dependencies and general setup

.gitignore

@@ -363,6 +363,7 @@ cpp.hint
 # macOS
 .DS_Store
 __MACOSX
+Godot.app
 
 # Windows
 # https://github.com/github/gitignore/blob/main/Global/Windows.gitignore

.mailmap

@@ -1,5 +1,6 @@
 Aaron Record <aaronjrecord@gmail.com>
 ajreckof <66184050+ajreckof@users.noreply.github.com> <tbonhoure@ymail.com>
+Alexander Hartmann <alex.hart.278@gmail.com>
 Alexander Holland <alexander.holland@live.de>
 Alexander Holland <alexander.holland@live.de> <alexander.holland@haw-hamburg.de>
 Alexander Holland <alexander.holland@live.de> <AlexHolly>
@@ -15,6 +16,7 @@ Ariel Manzur <ariel@godotengine.org> <ariel@okamstudio.com>
 Ariel Manzur <ariel@godotengine.org> <punto@Ariels-Mac-mini.local>
 Ariel Manzur <ariel@godotengine.org> <punto@Ariels-Mac-mini-2.local>
 Arman Elgudzhyan <48544263+puchik@users.noreply.github.com>
+A Thousand Ships <96648715+AThousandShips@users.noreply.github.com>
 A Thousand Ships <96648715+AThousandShips@users.noreply.github.com> <over999ships@gmail.com>
 Bastiaan Olij <mux213@gmail.com>
 Benjamin <mafortion.benjamin@gmail.com>
@@ -30,6 +32,7 @@ CookieBadger <emil.dobetsberger@gmail.com>
 Dana Olson <dana@shineuponthee.com> <adolson@gmail.com>
 dankan1890 <mewuidev2@gmail.com>
 Daniel J. Ramirez <djrmuv@gmail.com>
+Dario <dariosamo@gmail.com>
 David Cambré <david.cambre@gmail.com> <David.Cambre@gmail.com>
 DmitriySalnikov <salnikov.mine@yandex.ru>
 DmitriySalnikov <salnikov.mine@yandex.ru> <dimokgamer@gmail.com>
@@ -57,6 +60,7 @@ Gilles Roudiere <gilles.roudiere@gmail.com>
 Gilles Roudiere <gilles.roudiere@gmail.com> <gilles.roudiere@laas.fr>
 Gordon MacPherson <gordon@gordonite.tech>
 Guilherme Felipe <guilhermefelipecgs@gmail.com>
+Hakim <hakim.rouatbi@gmail.com>
 Hanif Bin Ariffin <hanif.ariffin.4326@gmail.com>
 HaSa1002 <johawitt@outlook.de>
 Hein-Pieter van Braam-Stewart <hp@tmm.cx>
@@ -95,6 +99,7 @@ Kanabenki <lucien.menassol@gmail.com> <18357657+Kanabenki@users.noreply.github.c
 karroffel <therzog@mail.de>
 karroffel <therzog@mail.de> <thomas.herzog@mail.com>
 karroffel <therzog@mail.de> <thomas.herzog@simedis.com>
+Kasper Arnklit Frandsen <kasper.arnklit@gmail.com>
 Kelly Thomas <kelly.thomas@hotmail.com.au>
 Kongfa Waroros <gongpha@hotmail.com>
 K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
@@ -107,6 +112,7 @@ Liz Haas <27thLiz@gmail.com> <liu.gam3@gmail.com>
 Liz Haas <27thLiz@gmail.com> <hinsbart@gmail.com>
 Liz Haas <27thLiz@gmail.com> <hinsbart@users.noreply.github.com>
 Liz Haas <27thLiz@gmail.com> <entenflugstuhl@gmail.com>
+Logan Lang <devloglogan@gmail.com>
 Manuele Finocchiaro <m4nu3lf@gmail.com>
 Manuel Strey <manuel.strey@gmx.de>
 Marcel Admiraal <madmiraal@users.noreply.github.com>
@@ -127,6 +133,7 @@ Micky <micheledevita2@gmail.com> <66727710+Mickeon@users.noreply.github.com>
 Nathan Franke <natfra@pm.me> <nathanwfranke@gmail.com>
 Nathan Lovato <nathan@gdquest.com>
 Nathan Warden <nathan@nathanwarden.com> <nathanwardenlee@icloud.com>
+Nazarii <nazarii.yablonskyi.pp.2022@lpnu.ua>
 Nicholas Huelin <62965063+SirQuartz@users.noreply.github.com>
 Nils ANDRÉ-CHANG <nils@nilsand.re>
 Nils ANDRÉ-CHANG <nils@nilsand.re> <nils.andre.chang@gmail.com>
@@ -139,6 +146,7 @@ Patrick Exner <patrick.exner1@web.de>
 Patrick <firefly2442@gmail.com>
 Paul Batty <p_batty@hotmail.co.uk>
 Paul Batty <p_batty@hotmail.co.uk> <Paulb23@users.noreply.github.com>
+Pāvels Nadtočajevs <7645683+bruvzg@users.noreply.github.com>
 Pawel Kowal <pkowal1982@gmail.com> <pawel.kowal@javart.eu>
 Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 Pieter-Jan Briers <pieterjan.briers+git@gmail.com> <pieterjan.briers@gmail.com>
@@ -160,6 +168,7 @@ Rindbee <idleman@yeah.net>
 Riteo Siuga <riteo@posteo.net>
 Robin Hübner <profan@prfn.se> <robinhubner@gmail.com>
 romulox_x <romulox_x@yahoo.com>
+Rudolph Bester <Rudolph.f.Bester@gmail.com> <Rudolph.f.bester@gmail.com>
 rune-scape <allie.smith.epic@gmail.com>
 rune-scape <allie.smith.epic@gmail.com> <spartacrafter@gmail.com>
 Ruslan Mustakov <r.mustakov@gmail.com> <ruslan.mustakov@xored.com>
@@ -169,6 +178,7 @@ Silc 'Tokage' Renew <tokage.it.lab@gmail.com>
 Silc 'Tokage' Renew <tokage.it.lab@gmail.com> <61938263+TokageItLab@users.noreply.github.com>
 Swarnim Arun <swarnimarun11@gmail.com>
 TechnoPorg <jonah.janzen@gmail.com> <69441745+TechnoPorg@users.noreply.github.com>
+tetrapod00 <145553014+tetrapod00@users.noreply.github.com>
 Theo Hallenius <redsymbzone@hotmail.com>
 Tomasz Chabora <kobewi4e@gmail.com>
 Twarit <wtwarit@gmail.com>

.pre-commit-config.yaml

@@ -37,7 +37,7 @@ repos:
         stages: [manual] # Not automatically triggered, invoked via `pre-commit run --hook-stage manual clang-tidy`
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.4
+    rev: v0.9.4
     hooks:
       - id: ruff
         args: [--fix]
@@ -48,7 +48,7 @@ repos:
         types_or: [text]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.13.0
+    rev: v1.14.1
     hooks:
       - id: mypy
         files: \.py$

AUTHORS.md

@@ -39,23 +39,27 @@ name is available.
     Alexander Holland (AlexHolly)
     Alex Drozd (brno32)
     Alexey Khoroshavin (allkhor)
+    Allen Pestaluky (allenwp)
     Alfred Reinold Baudisch (alfredbaudisch)
     Alistair Leslie-Hughes (alesliehughes)
     Alket Rexhepi (alketii)
     Alvin Wong (alvinhochun)
     Andrea Catania (AndreaCatania)
     Andreia Gaita (shana)
+    Andrés Botero (0xafbf)
     Andrii Doroshenko (Xrayez)
     Andy Maloney (asmaloney)
     Andy Moss (MillionOstrich)
     Angad Kambli (angad-k)
     Anilforextra (AnilBK)
     Anish Bhobe (KidRigger)
+    Anish Mishra (syntaxerror247)
     Anni Ryynänen (anniryynanen)
     Anton Yabchinskiy (a12n)
     Anutrix
     Aren Villanueva (kurikaesu)
     Ariel Manzur (punto-)
+    arkology
     Arman Elgudzhyan (puchik)
     Arseny Kapoulkine (zeux)
     AThousandShips
@@ -118,6 +122,7 @@ name is available.
     Fabrice Cipolla (fabriceci)
     Ferenc Arn (tagcup)
     FireForge (fire-forge)
+    Florent Guiocheau (Flarkk)
     Florian Kothmeier (Dragoncraft89)
     follower
     foxydevloper
@@ -131,6 +136,7 @@ name is available.
     Gilles Roudiere (groud)
     Gordon MacPherson (RevoluPowered)
     Guilherme Felipe de C. G. da Silva (guilhermefelipecgs)
+    Guillaume Mouton (kiroxas)
     Hakim Rouatbi (hakro)
     Hanif Bin Ariffin (hbina)
     Haoyu Qiu (timothyqiu)
@@ -181,14 +187,18 @@ name is available.
     Kostadin Damyanov (Max-Might)
     K. S. Ernest (iFire) Lee (fire)
     Kyle Eichlin (likeich)
+    Lars Pettersson (larspet)
     lawnjelly
     Leon Krause (leonkrause)
     Liz Haas (27thLiz)
+    Logan Lang (devloglogan)
     Lucien Menassol (Kanabenki)
+    Lukas Tenbrink (Ivorforce)
     Lyuma
     Maganty Rushyendra (mrushyendra)
     Magian (magian1127)
     Mai Lavelle (maiself)
+    Malcolm Anderson (Meorge)
     Malcolm Nixon (Malcolmnixon)
     Manuele Finocchiaro (m4nu3lf)
     Marcel Admiraal (madmiraal)
@@ -236,6 +246,7 @@ name is available.
     Nathan Franke (nathanfranke)
     Nathan Lovato (NathanLovato)
     Nathan Warden (NathanWarden)
+    Nazarii Yablonskyi (Nazarwadim)
     Nicholas Huelin (SirQuartz)
     Nikita Lita (nikitalita)
     Nils André-Chang (NilsIrl)
@@ -245,6 +256,7 @@ name is available.
     ocean (they/them) (anvilfolk)
     Omar El Sheikh (The-O-King)
     Ovnuniarchos
+    Pablo Andres Fuente (pafuent)
     Pascal Richter (ShyRed)
     passivestar
     Patrick Dawson (pkdawson)
@@ -262,7 +274,7 @@ name is available.
     Pieter-Jan Briers (PJB3005)
     Poommetee Ketson (Noshyaar)
     Przemysław Gołąb (n-pigeon)
-    Radiant (RadiantUwU)
+    Radiant (radiantgurl)
     Rafael M. G. (rafallus)
     Rafał Mikrut (qarmin)
     Raffaele Picca (RPicster)
@@ -282,6 +294,7 @@ name is available.
     Robert Yevdokimov (ryevdokimov)
     Robin Hübner (profan)
     romulox-x
+    Rudolph Bester (Rudolph-B)
     Rune Smith (rune-scape)
     Ruslan Mustakov (endragor)
     Ryan Roden-Corrent (rrcore)
@@ -304,6 +317,7 @@ name is available.
     Swarnim Arun (minraws)
     TC (floppyhammer)
     TechnoPorg
+    tetrapod00
     Thaddeus Crews (Repiteo)
     Thakee Nathees (ThakeeNathees)
     thebestnom
@@ -313,9 +327,11 @@ name is available.
     Timothé Bonhoure (ajreckof)
     Timo (toger5)
     Tomasz Chabora (KoBeWi)
+    Travis Lange (TCROC)
     trollodel
     Twarit Waikar (IronicallySerious)
     Umang Kalra (theoway)
+    Victor Hampel (havi05)
     Vinzenz Feenstra (vinzenz)
     Vitika Soni (Vitika9)
     박한얼 (volzhs)
@@ -326,8 +342,10 @@ name is available.
     Wilson E. Alvarez (Rubonnek)
     Xavier Cho (mysticfall)
     Yaohua Xiong (xiongyaohua)
+    Yevhen Babiichuk (dustdfg)
     yg2f (SuperUserNameMan)
     Yordan Dolchinkov (Jordyfel)
+    Yufeng Ying (YYF233333)
     Yuri Rubinsky (Chaosus)
     Yuri Sizov (YuriSizov)
     Zae Chao (zaevi)