Merge branch 'master' of https://github.com/SuperTux/supertux into re…

…al-master
SuperTux · Aug 27, 2024 · bb43fe3 · bb43fe3
2 parents 3631663 + 168bdf3
commit bb43fe3
Show file tree

Hide file tree

Showing 85 changed files with 5,482 additions and 3,950 deletions.
diff --git a/.github/workflows/bsd.yml b/.github/workflows/bsd.yml
@@ -32,7 +32,7 @@ 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
 

diff --git a/.github/workflows/gnulinux.yml b/.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

diff --git a/.github/workflows/macos.yml b/.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
 

diff --git a/.github/workflows/ubuntu-touch.yml b/.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]

diff --git a/.github/workflows/wasm.yml b/.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:

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -32,14 +32,14 @@ jobs:
       fail-fast: false
       matrix:
         arch: [x64, x86]
-        build_type: [Debug, RelWithDebInfo]
+        build_type: [Debug, Release]
         glbinding: [OFF] # [ON, OFF] # FIXME: Fix Windows glbinding builds
         include:
-          - build_type: RelWithDebInfo
+          - build_type: Release
             arch: x64
             glbinding: OFF
             release: ON
-          - build_type: RelWithDebInfo
+          - build_type: Release
             arch: x86
             glbinding: OFF
             release: ON

diff --git a/data/images/decal/retro/picnic.png b/data/images/decal/retro/picnic.png
diff --git a/data/levels/misc/menu_retro.stl b/data/levels/misc/menu_retro.stl