Merge master

.ci_scripts/deploy.sh

@@ -13,10 +13,11 @@ for file in upload/SuperTux*; do
         shasum=$(shasum -a 256 "$file" | cut -d " " -f 1)
     fi
     echo "Checksum: $shasum";
+    echo "Branch: $BRANCH_NAME";
     curl --data "apikey=$DOWNLOAD_APIKEY" \
          --data "url=$url" \
          --data "size=$size" \
-         --data "branch=$(git branch --show-current)" \
+         --data "branch=$BRANCH_NAME" \
          --data "shasum=$shasum" \
          -L -s https://download.supertux.org/submit.php
 done

.ci_scripts/package.sh

@@ -2,7 +2,7 @@
 
 shopt -s nullglob
 
-if ([ "$OS_NAME" = "macos-10.15" ] || [ "$OS_NAME" = "macos-11" ]) && [ "$PACKAGE" = "ON" ]; then
+if ([ "$OS_NAME" = "macos-10.15" ] || [ "$OS_NAME" = "macos-12" ]) && [ "$PACKAGE" = "ON" ]; then
     sudo chmod -R +w /usr/local/Cellar
     cpack -G Bundle;
 fi

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,80 @@
+name: Bug Report
+description: File a report for unexpected behavior in SuperTux.
+title: "[Bug]: "
+labels: ["type:bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: input
+    id: supertux-version
+    attributes:
+      label: SuperTux Version
+      description: The version of SuperTux, shown at the bottom-left corner on the title screen.
+      placeholder: ex. v0.6.3-1236-g7451121dd
+    validations:
+      required: true
+  - type: input
+    id: system-info
+    attributes:
+      label: System Information
+      description: Details about your operating system (such as Linux distribution or Windows version) and CPU architecture (ex. 64-bit or 32-bit).
+      placeholder: ex. Windows 11 64-bit
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected Behavior
+      description: What did you expect to happen?
+      placeholder: Describe the behavior you expected in detail.
+    validations:
+      required: true
+  - type: textarea
+    id: actual-behavior
+    attributes:
+      label: Actual Behavior
+      description: Instead, what actually happened?
+      placeholder: Describe the actual behavior in detail.
+    validations:
+      required: true
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps To Reproduce Actual Behavior
+      description: A clear and concise description of how the actual behavior was achieved, since starting up the game.
+      placeholder: |
+        Describe the steps leading to the actual behavior, preferably with a numerated list.
+
+        1. ...
+        2. ...
+        3. ...
+    validations:
+      required: true
+  - type: textarea
+    id: additional-info
+    attributes:
+      label: Additional Information
+      description: Include any additional information regarding the bug.
+      placeholder: You can also leave this empty.
+    validations:
+      required: false
+  - type: checkboxes
+    id: guidelines
+    attributes:
+      label: Guidelines For Reporting Issues
+      description: "Before submitting this issue, make sure you have done the following:"
+      options:
+        - label: I have read <https://github.com/SuperTux/supertux/blob/master/CONTRIBUTING.md#bug-reports>.
+          required: true
+        - label: I have verified this isn't an issue that's already been reported.
+          required: true
+        - label: I have verified this isn't a [discussion](https://github.com/SuperTux/supertux/discussions), or an issue about a crash or a feature request, but rather an actual bug ─ that is, the game did something not intended.
+          required: true
+        - label: I have verified this issue is **not** about wrong translations (use Transifex for those), or anything unsupported (e.g. third-party add-ons).
+          required: true
+        - label: In this report, I have only included details about **one** (1) bug.
+          required: true
+        - label: If I make a mistake while submitting this report, I agree to use the "Edit" feature to correct it, instead of closing this issue and opening a new one.
+          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Create a Discussion
+    url: https://github.com/SuperTux/supertux/discussions/new/choose
+    about: If you're looking for something else, create a Discussion, assuming this hasn't been reported there before.

.github/ISSUE_TEMPLATE/crash.yml

@@ -0,0 +1,76 @@
+name: Crash Report
+description: File a report for a crash in SuperTux.
+title: "[Crash]: "
+labels: ["type:crash"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this crash report!
+  - type: input
+    id: supertux-version
+    attributes:
+      label: SuperTux Version
+      description: The version of SuperTux, shown at the bottom-left corner on the title screen.
+      placeholder: ex. v0.6.3-1236-g7451121dd
+    validations:
+      required: true
+  - type: input
+    id: system-info
+    attributes:
+      label: System Information
+      description: Details about your operating system (such as Linux distribution or Windows version) and CPU architecture (ex. 64-bit or 32-bit).
+      placeholder: ex. Windows 11 64-bit
+    validations:
+      required: true
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps To Reproduce Crash
+      description: A clear and concise description of how the crash was achieved, since starting up the game.
+      placeholder: |
+        Describe the steps, leading to the crash, preferably with a numerated list.
+
+        1. ...
+        2. ...
+        3. ...
+    validations:
+      required: true
+  - type: textarea
+    id: debug-stacktrace
+    attributes:
+      label: Debugging Information (Stacktrace)
+      description: Include a stacktrace, leading to the crash. This can be obtained via a debugging utility.
+      placeholder: |
+        Paste the full stacktrace here.
+
+        You can leave this empty, in case a stacktrace can't be obtained (for example, if the game freezes).
+      render: shell
+    validations:
+      required: false
+  - type: textarea
+    id: additional-info
+    attributes:
+      label: Additional Information
+      description: Include any additional information, regarding the crash.
+      placeholder: You can also leave this empty.
+    validations:
+      required: false
+  - type: checkboxes
+    id: guidelines
+    attributes:
+      label: Guidelines For Reporting Issues
+      description: "Before submitting this issue, make sure you have done the following:"
+      options:
+        - label: I have read <https://github.com/SuperTux/supertux/blob/master/CONTRIBUTING.md#bug-reports>.
+          required: true
+        - label: I have verified this isn't an issue that's already been reported.
+          required: true
+        - label: I have verified this isn't a [discussion](https://github.com/SuperTux/supertux/discussions), or an issue about unintended behavior or a feature request, but rather an actual crash ─ that is, the game closed unexpectedly.
+          required: true
+        - label: I have verified this issue is **not** about wrong translations (use Transifex for those), or anything unsupported (e.g. third-party add-ons).
+          required: true
+        - label: In this report, I have only included details about **one** (1) crash.
+          required: true
+        - label: If I make a mistake while submitting this report, I agree to use the "Edit" feature to correct it, instead of closing this issue and opening a new one.
+          required: true

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,52 @@
+name: Feature Requests
+description: File a request for a feature you want to see in SuperTux!
+title: "[Feature Request]: "
+labels: ["type:idea"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature request!
+  - type: textarea
+    id: feature-details
+    attributes:
+      label: Feature Details
+      description: How would your feature work?
+      placeholder: A clear and concise description of the way the feature would function.
+    validations:
+      required: true
+  - type: textarea
+    id: feature-purpose
+    attributes:
+      label: Feature Purpose
+      description: What purpose would your feature serve, towards improving the SuperTux experience?
+      placeholder: A list of one or multiple example use-cases or positive outcomes from your feature being in SuperTux.
+    validations:
+      required: true
+  - type: textarea
+    id: feature-screenshots
+    attributes:
+      label: Concept Screenshots
+      description: Include any concept screenshots of the way your feature would look in-game, to help others grasp your idea better.
+      placeholder: |
+        To attach image files, click this area to highlight it, and then drag the files in.
+
+        You can also leave this empty.
+    validations:
+      required: false
+  - type: checkboxes
+    id: guidelines
+    attributes:
+      label: Guidelines For Reporting Issues
+      description: "Before submitting this issue, make sure you have done the following:"
+      options:
+        - label: I have read <https://github.com/SuperTux/supertux/blob/master/CONTRIBUTING.md#bug-reports>.
+          required: true
+        - label: I have verified this isn't a request that's already been submitted as an issue.
+          required: true
+        - label: I have verified this isn't a [discussion](https://github.com/SuperTux/supertux/discussions), or an issue with the game, but rather an actual feature request - a currently non-existent, but desired feature.
+          required: true
+        - label: In this request, I have only included details about **one** (1) desired feature.
+          required: true
+        - label: If I make a mistake while submitting this request, I agree to use the "Edit" feature to correct it, instead of closing this issue and opening a new one.
+          required: true

.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, Release]
+        build_type: [Debug, RelWithDebInfo]
         # FreeBSD does not have glbinding
-        # glbinding: [ON, OFF]
+        # glbiactions/checkout@v4
 
     runs-on: macos-10.15
     steps:
       - uses: actions/checkout@v2
         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' }}
@@ -80,3 +80,4 @@ jobs:
             make -j3 VERBOSE=1
             make install DESTDIR="/tmp/supertux" VERBOSE=1
             ./test_supertux2
+actions/checkout@v4

.github/workflows/gnulinux.yml

@@ -17,6 +17,7 @@
 
 name: GNU/Linux
 on:
+  workflow_dispatch:
   push:
     branches:
       - master
@@ -33,14 +34,14 @@ jobs:
         arch: [32, 64]
         os: [ubuntu-20.04]
         compiler: [gcc, clang]
-        build_type: [Debug, Release]
+        build_type: [Debug, RelWithDebInfo]
         glbinding: [ON, OFF]
         exclude:
           - arch: 32
             glbinding: ON
         include:
           - os: ubuntu-20.04
-            build_type: Release
+            build_type: RelWithDebInfo
             compiler: gcc
             arch: 64
             glbinding: OFF
@@ -57,11 +58,11 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     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: Install 64-bit dependencies
         if: ${{ matrix.arch == 64 }}
@@ -223,35 +224,35 @@ jobs:
         run: ../.ci_scripts/package.sh
 
       - name: Upload AppImage
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: "${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.compiler }}-${{ matrix.build_type }}${{ matrix.glbinding == 'ON' && '-glbinding' || '' }}-appimage"
           path: build/upload/*.AppImage
           if-no-files-found: ignore
 
       - name: Upload source
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: "source"
           path: build/upload/*Source.tar.gz
           if-no-files-found: ignore
 
       - name: Upload coverage
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: "coverage"
           path: build/coverage/*
           if-no-files-found: ignore
 
       - name: Upload documentation
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: "documentation"
           path: build/docs/doxygen/html/*
           if-no-files-found: ignore
 
       - name: Upload tar archives
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: "${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.compiler }}-${{ matrix.build_type }}${{ matrix.glbinding == 'ON' && '-glbinding' || '' }}-tgz"
           path: build/upload/*Linux.tar.gz
@@ -276,6 +277,7 @@ jobs:
         env:
           PREFIX: "${{ github.sha }}/gh-actions/${{ matrix.os }}-${{ matrix.arch }}/${{ github.run_id }}"
           DOWNLOAD_APIKEY: ${{ secrets.DOWNLOAD_APIKEY }}
+          BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
       - name: Prepare Release
         if: startsWith(github.ref, 'refs/tags/') && matrix.release && github.repository_owner == 'supertux'