Merge commit '7140d53520207ed9c87114df1fb6db0fc25c56d1' into wind_fixes

Author: biggeryetbetter

.github/workflows/bsd.yml

@@ -32,13 +32,13 @@ 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
@@ -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
@@ -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/macos.yml

@@ -32,11 +32,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-12]
-        build_type: [Debug, RelWithDebInfo]
+        build_type: [Debug, Release]
         glbinding: [ON, OFF]
         include:
           - os: macos-12
-            build_type: RelWithDebInfo
+            build_type: Release
             glbinding: OFF
             release: ON
 
@@ -62,8 +62,8 @@ jobs:
             /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 +116,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/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 "[email protected]"
+          git config --global user.name "SuperTux Bot"
+          git commit -am "Update translation templates" || true
+          git push https://git:[email protected]/SuperTux/supertux.git master

.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]
@@ -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,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build_type: ["RelWithDebInfo", "Debug"]
+        build_type: ["Release", "Debug"]
 
     runs-on: ubuntu-latest
     steps:
@@ -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/*

.github/workflows/windows.yml

@@ -105,6 +105,7 @@ jobs:
           "./$Env:BUILD_TYPE/run_tests.exe"
 
       - name: Package MSI Installer
+        if: matrix.build_type != 'Debug' && matrix.glbinding == 'OFF'
         shell: pwsh
         working-directory: build
         env:
@@ -148,6 +149,7 @@ jobs:
           #>
 
       - name: Upload Portable Package
+        if: matrix.build_type != 'Debug' && matrix.glbinding == 'OFF'
         uses: actions/upload-artifact@v4
         with:
           name: "windows-${{ matrix.arch }}-${{ matrix.build_type }}${{ matrix.glbinding == 'ON' && '-glbinding' || '' }}-portable"

INSTALL.md

@@ -1,6 +1,6 @@
 Install instructions for SuperTux - <https://supertux.org/>
 ====================================================================
-Last update: May 19, 2023
+Last update: August 28, 2024
 
 Quick links:
 - [Binaires](#binaries)
@@ -109,9 +109,9 @@ For ease of use, here are some installation lines for some Linux distributions:
   sudo apt-get update && sudo apt-get install -y cmake build-essential libogg-dev libvorbis-dev libopenal-dev libsdl2-dev libsdl2-image-dev libfreetype6-dev libraqm-dev libcurl4-openssl-dev libglew-dev libharfbuzz-dev libfribidi-dev libglm-dev zlib1g-dev
   ```
 
-- ArchLinux (using sudo, as of June 3rd 2023)
+- ArchLinux (using sudo, as of August 28th 2024)
   ```
-  sudo pacman -Sy cmake base-devel libogg libvorbis openal sdl2 sdl2_image freetype2 libraqm curl openssl glew harfbuzz fribidi glm zlib
+  sudo pacman -S cmake base-devel libogg libvorbis openal sdl2 sdl2_image freetype2 libraqm curl openssl glew harfbuzz fribidi glm zlib
   ```
 
 ### Linux/UNIX using CMake
@@ -248,10 +248,10 @@ Once all of these are installed; you may install dependencies with vcpkg. In any
 ```
 ./bootstrap-vcpkg.bat -disableMetrics
 ./vcpkg integrate install
-./vcpkg install --triplet=x86-windows gtest curl freetype glew libogg libraqm libvorbis openal-soft sdl2 sdl2-image[libjpeg-turbo] glm zlib
+./vcpkg install --triplet=x64-windows gtest curl freetype glew libogg libraqm libvorbis openal-soft sdl2 sdl2-image[libjpeg-turbo] glm zlib
 ```
 
-**Note:** If you wish to produce 64-bit builds, replace `--triplet=x86-windows` with `--triplet=x64-windows`.
+**Note:** If you wish to produce 32-bit builds, replace `--triplet=x64-windows` with `--triplet=x86-windows`.
 
 Once dependencies are installed:
 
@@ -261,16 +261,15 @@ Once dependencies are installed:
 
 3. Open a console window and navigate to the `build` directory.
 
-5. Run `cmake .. -A Win32 -DCMAKE_BUILD_TYPE=Release -DVCPKG_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=C:/PATH/TO/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x86-windows`.
+5. Run `cmake .. -DCMAKE_BUILD_TYPE=Release -DVCPKG_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=C:/PATH/TO/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows`.
 
     **Make sure to change the path to vcpkg to the actual path to vcpkg on your system!**
 
     Options:
-    - `-A Win32` tells CMake to produce 32-bit executables. To produce 64-bit executables, you may either replace `Win32` with `x64`, or omit this argument entirely (remove everything, including the `-A`).
     - `-DCMAKE_BUILD_TYPE=Release` creates a Release build, which does not contain debug information and runs faster. You may also produce `Debug` builds, but these run significantly slower. Other options may be available, such as `RelWithDebInfo` and `MinSizeRel`, but they are not tested. [More info](https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html)
     - `-DVCPKG_BUILD=ON` tells SuperTux to use vcpkg to find dependencies.
     - `-DCMAKE_TOOLCHAIN_FILE=C:/PATH/TO/vcpkg/scripts/buildsystems/vcpkg.cmake` tells CMake to use the vcpkg toolchain to load dependencies. **Make sure to change the path to the actual path to vcpkg on your system!**
-    - `-DVCPKG_TARGET_TRIPLET=x86-windows` tells vcpkg to use 32-bit dependencies for Windows. If you are compiling 64-bit executables, replace "x86" with "x64".
+    - `-DVCPKG_TARGET_TRIPLET=x64-windows` tells vcpkg to use 64-bit dependencies for Windows. If you are compiling 32-bit executables, replace "x64" with "x86".
     - Optionally, you may add `-G "Visual Studio 16 2019"` to force a certain version of Visual Studio if multiple are installed on your system.
 
     For more CMake options, look at end of the Linux/UNIX build section.

data/AUTHORS

@@ -11,6 +11,7 @@ Most images were created either by grumbel or gwater. Check the log for details.
 * images/objects/explosion/explosion*.png - Bleed - http://remusprites.carbonmade.com/ licensed under CC-BY 3.0, see https://opengameart.org/content/simple-explosion-bleeds-game-art
 * images/engine/editor/sparkle-file.png - Semphris, licensed CC-BY 4.0 - CONTAINS WORK BY FortAwesome/FontAwesome (the file logo), licensed under CC-BY 4.0
 * images/worldmap/shared/rocky_paths[-editor].png - Semphris, released under CC0
+* images/objects/conveyor_belt/* - submitted by RodirodDude CC BY-NC 4.0
 
 == Levels ==