Merge branch 'real-master' into slope-collision-rewrite

.ci_scripts/package.sh

@@ -2,9 +2,18 @@
 
 shopt -s nullglob
 
-if ([ "$OS_NAME" = "macos-10.15" ] || [ "$OS_NAME" = "macos-12" ]) && [ "$PACKAGE" = "ON" ]; then
+if ([ "$OS_NAME" = "macos-10.15" ] || [ "$OS_NAME" = "macos-13" ]) && [ "$PACKAGE" = "ON" ]; then
     sudo chmod -R +w /usr/local/Cellar
-    cpack -G Bundle;
+    # Workaround resource busy bug on github on MacOS 13
+    # https://github.com/actions/runner-images/issues/7522
+    i=0
+    until
+        cpack -G Bundle;
+    do
+        if [ $i -eq 10 ]; then exit 1; fi
+        i=$((i+1))
+        sleep 1
+    done
 fi
 
 # make only one source package

.github/workflows/android.yml

@@ -40,7 +40,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          submodules: true
+          submodules: recursive
 
       - name: Clone SDL Android repo
         run: |
@@ -74,7 +74,7 @@ jobs:
           sed -i "s/AppVersionCode.*/AppVersionCode=$VERSION_CODE/g" project/jni/application/supertux/AndroidAppSettings.cfg
 
       - name: Copy precompiled libraries from cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: cache
         with:
           # The same SDL revision will produce the same libraries

.github/workflows/bsd.yml

@@ -32,17 +32,17 @@ jobs:
       matrix:
         # TODO: Add the OpenBSD, NetBSD and Solaris VMs whenever possible
         vm_os: [freebsd]
-        build_type: [Debug, RelWithDebInfo]
+        build_type: [Debug, Release]
         # FreeBSD does not have glbinding
         # glbiactions/checkout@v4
 
     runs-on: macos-10.15
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           # Fetch the whole tree so git describe works
           fetch-depth: 0
-          submodules: true
+          submodules: recursive
 
       - name: Build in FreeBSD
         if: ${{ matrix.vm_os == 'freebsd' }}
@@ -79,5 +79,4 @@ jobs:
                                             # TODO: Uncomment whenever possible
             make -j3 VERBOSE=1
             make install DESTDIR="/tmp/supertux" VERBOSE=1
-            ./test_supertux2
-actions/checkout@v4
+            ./test_supertux2

.github/workflows/gnulinux.yml

@@ -34,14 +34,14 @@ jobs:
         arch: [32, 64]
         os: [ubuntu-20.04]
         compiler: [gcc, clang]
-        build_type: [Debug, RelWithDebInfo]
+        build_type: [Debug, Release]
         glbinding: [ON, OFF]
         exclude:
           - arch: 32
             glbinding: ON
         include:
           - os: ubuntu-20.04
-            build_type: RelWithDebInfo
+            build_type: Release
             compiler: gcc
             arch: 64
             glbinding: OFF
@@ -62,7 +62,7 @@ jobs:
         with:
           # Fetch the whole tree so git describe works
           fetch-depth: 0
-          submodules: true
+          submodules: recursive
 
       - name: Install 64-bit dependencies
         if: ${{ matrix.arch == 64 }}
@@ -212,7 +212,7 @@ jobs:
           doxygen docs/Doxyfile
 
       - name: Package
-        if: ${{ matrix.arch != '32' }}
+        if: matrix.arch != '32'
         env:
           OS_NAME: ${{ matrix.os }}
           ARCH: ${{ matrix.arch }} # TODO: Working Linux 32-bit packaging
@@ -224,6 +224,7 @@ jobs:
         run: ../.ci_scripts/package.sh
 
       - name: Upload AppImage
+        if: matrix.build_type != 'Debug' && matrix.glbinding == 'OFF'
         uses: actions/upload-artifact@v4
         with:
           name: "${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.compiler }}-${{ matrix.build_type }}${{ matrix.glbinding == 'ON' && '-glbinding' || '' }}-appimage"

.github/workflows/lint.yml

@@ -54,4 +54,4 @@ jobs:
             --check-level=exhaustive \
             --quiet --inline-suppr --language=c++ --error-exitcode=10 \
             -j"$(nproc)" --std=c++17 --enable=warning,style \
-            --suppress=useStlAlgorithm  src/
+            --suppress=useStlAlgorithm -UEMSCRIPTEN src/

.github/workflows/macos.yml

@@ -31,12 +31,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-12]
-        build_type: [Debug, RelWithDebInfo]
+        os: [macos-13]
+        build_type: [Debug, Release]
         glbinding: [ON, OFF]
         include:
-          - os: macos-12
-            build_type: RelWithDebInfo
+          - os: macos-13
+            build_type: Release
             glbinding: OFF
             release: ON
 
@@ -46,24 +46,25 @@ jobs:
         with:
           # Fetch the whole tree so git describe works
           fetch-depth: 0
-          submodules: true
+          submodules: recursive
 
       - name: Install macos dependencies
-        if: ${{ matrix.os == 'macos-12' }}
+        if: ${{ matrix.os == 'macos-13' }}
         run: |
           # Use GLM 1.0.0 as later versions don't build with clang
           HOMEBREW_NO_AUTO_UPDATE=1 brew install --formula ./mk/brew/glm.rb --build-from-source
           brew install cmake googletest bash rename libogg libvorbis glew \
                        openal-soft sdl2 sdl2_image sdl2_ttf freetype harfbuzz \
                        fribidi glib gtk-doc glbinding@2 libraqm zlib
           brew link glbinding@2
+
           install_name_tool -change \
             '@rpath/libsharpyuv.0.dylib' \
             /usr/local/opt/webp/lib/libsharpyuv.0.dylib \
             /usr/local/opt/webp/lib/libwebp.7.dylib
           install_name_tool -change \
-            '@rpath/libjxl_cms.0.10.dylib' \
-            /usr/local/opt/jpeg-xl/lib/libjxl_cms.0.10.dylib \
+            '@rpath/libjxl_cms.0.11.dylib' \
+            /usr/local/opt/jpeg-xl/lib/libjxl_cms.0.11.dylib \
             /usr/local/opt/jpeg-xl/lib/libjxl.dylib
 
           # Something funky happens with freetype if mono is left
@@ -116,6 +117,7 @@ jobs:
         run: ../.ci_scripts/package.sh
 
       - uses: actions/upload-artifact@v4
+        if: matrix.build_type != 'Debug' && matrix.glbinding == 'OFF'
         with:
           name: "${{ matrix.os }}-${{ matrix.build_type }}${{ matrix.glbinding == 'ON' && '-glbinding' || '' }}-dmg"
           path: build/upload/*.dmg

.github/workflows/scripting.yml

@@ -20,7 +20,8 @@ on:
   push:
     branches: [ "master" ]
     paths:
-      - src/scripting/*.hpp
+      - src/**
+      - tools/scripting_docs_gen/**
   workflow_dispatch:
 
 jobs:
@@ -56,31 +57,42 @@ jobs:
           cmake --version
           mkdir build
           cd build
-          cmake .. -DBUILD_SCRIPTING_DOCUMENTATION=ON
+          cmake .. -DBUILD_DOCUMENTATION_WITH_SCRIPTING=ON
           make
 
       - name: Generate scripting reference
         working-directory: tools/scripting_docs_gen/build
         run: |
-          doxygen docs/scripting/Doxyfile
+          doxygen docs/Doxyfile
           rm ../../../wiki/Scripting*.md
-          ./ScriptingDocsGen --dir docs/scripting/doxygen/xml \
+          ./ScriptingDocsGen --dir docs/doxygen/xml \
                              --home ../../../wiki/templates/ScriptingHome.md \
                              --page ../../../wiki/templates/ScriptingPage.md \
                              --output ../../../wiki
 
+      - name: Check for changes
+        working-directory: wiki
+        run: |
+          REF_UPDATED=true
+          if git diff --exit-code; then
+            REF_UPDATED=false
+          fi
+          echo "REFERENCE_UPDATED=$(echo $REF_UPDATED)" >> $GITHUB_ENV
+
       - name: Install SSH key
+        if: ${{ env.REFERENCE_UPDATED == 'true' }}
         uses: shimataro/ssh-key-action@v2
         with:
           key: ${{ secrets.wiki_repo_key }}
           known_hosts: ${{ secrets.wiki_repo_hosts }}
 
       - name: Push changes to wiki
+        if: ${{ env.REFERENCE_UPDATED == 'true' }}
         working-directory: wiki
         run: |
           git --version
           git status
-          git config --global user.email "supertux-bot"
+          git config --global user.email "SuperTux-bot@users.noreply.github.com"
           git config --global user.name "SuperTux Bot"
           git add .
           git commit -m "Update scripting reference (SuperTux/supertux@${{ github.sha }})"

.github/workflows/translation_templates.yml

@@ -0,0 +1,52 @@
+#  SuperTux
+#  Copyright (C) 2024 Tobias Markus
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 3
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+name: translation_templates
+on:
+  workflow_dispatch:
+
+jobs:
+  update-all-templates:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout SuperTux repository
+        uses: actions/checkout@v4
+        with:
+          repository: 'SuperTux/supertux'
+          fetch-depth: 0
+
+      - name: Update translation templates
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          # Update packages
+          sudo apt-get update
+          sudo apt-get install -y gettext
+
+          # Checkout master to make git describe work
+          git checkout master
+          
+          # Update translation templates:
+          chmod +x makepot.sh
+          sh ./makepot.sh
+
+          # Commit
+          git status
+          git config --global user.email "SuperTux-bot@users.noreply.github.com"
+          git config --global user.name "SuperTux Bot"
+          git commit -am "Update translation templates" || true
+          git push https://git:$GITHUB_TOKEN@github.com/SuperTux/supertux.git master

.github/workflows/translations.yml

@@ -19,7 +19,7 @@ name: translations
 on:
   workflow_dispatch:
   schedule:
-    - cron:  '0 0 * * *'
+    - cron:  '0 0 * * 0'
 
 jobs:
   update-all-translations:

.github/workflows/ubuntu-touch.yml

@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build_type: [Debug, RelWithDebInfo]
+        build_type: [Debug, Release]
         arch: [amd64, arm64, armhf]
         # glbinding is missing as it isn't available on Ubuntu 16.04
         opengl: [glew, sdl]
@@ -45,7 +45,7 @@ jobs:
         with:
           # Fetch the whole tree so git describe works
           fetch-depth: 0
-          submodules: true
+          submodules: recursive
 
       - name: Install clickable
         run: |
@@ -88,6 +88,7 @@ jobs:
           ~/.local/bin/clickable build --verbose ${BUILD_TYPE} --arch ${ARCH}
 
       - uses: actions/upload-artifact@v4
+        if: matrix.build_type != 'Debug'
         with:
           name: "clickable-${{ matrix.arch }}-${{ matrix.build_type }}-${{ matrix.opengl }}-click"
           path: build.clickable/*.click

.github/workflows/wasm.yml

@@ -30,15 +30,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build_type: ["RelWithDebInfo", "Debug"]
+        build_type: ["Release", "Debug"]
 
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           # Fetch the whole tree so git describe works
           fetch-depth: 0
-          submodules: true
+          submodules: recursive
 
       - name: Install emscripten tools
         run: |
@@ -85,6 +85,7 @@ jobs:
           mv supertux2* upload/
 
       - uses: actions/upload-artifact@v4
+        if: matrix.build_type != 'Debug'
         with:
           name: "wasm32-emscripten-${{ matrix.build_type }}-html"
           path: build/upload/*