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

…al-master

.github/workflows/bsd.yml

@@ -38,7 +38,7 @@ jobs:
 
     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/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/windows.yml

@@ -32,14 +32,14 @@ jobs:
       fail-fast: false
       matrix:
         arch: [x64, x86]
-        build_type: [Debug, Release]
+        build_type: [Debug, RelWithDebInfo]
         glbinding: [OFF] # [ON, OFF] # FIXME: Fix Windows glbinding builds
         include:
-          - build_type: Release
+          - build_type: RelWithDebInfo
             arch: x64
             glbinding: OFF
             release: ON
-          - build_type: Release
+          - build_type: RelWithDebInfo
             arch: x86
             glbinding: OFF
             release: ON

INSTALL.md

@@ -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/images/autotiles.satc

@@ -14,7 +14,7 @@
 ;;  |
 ;;  V
 ;; Contains :
-;;   The autotileset name (unused as of writing these lines) : (name "snow")
+;;   The autotileset name (used as an indicator in the editor) : (name "snow")
 ;;     The name of the autotileset is "snow".
 ;;   The default tile ID (used if no tile matches any mask) : (default 11)
 ;;     If a very special tile is needed (and it doesn't exist), it will use this tile (it's a center tile) by default.
@@ -75,7 +75,7 @@
 ;;       (Contributor, 2020)
 ;;
 ;;
-;; NOTE : A single id MUST NOT OCCUR MORE THAN ONE AUTOTILE IN THE ENTIRE FILE.
+;; NOTE : A single id MUST NOT OCCUR IN MORE THAN ONE AUTOTILE IN AN AUTOTILESET.
 ;;        Otherwise, the behavior is UNDEFINED.
 
 (supertux-autotiles
@@ -6107,4 +6107,185 @@
       (mask "11111*0*")
     )
   )
+
+  (autotileset
+    (name "jrock_a")
+    (default 7317)
+
+  ;; CENTER
+    (autotile
+      (id 7317)
+      (alt-id
+        (id 7324)
+        (weight 0.5)
+      )
+      (solid #t)
+      (mask "***11111")
+    )
+
+  ;; LEFT
+  (autotile
+      (id 7316)
+      (solid #t)
+      (mask "***01011")
+    )
+
+  ;; RIGHT
+  (autotile
+      (id 7318)
+      (solid #t)
+      (mask "***10110")
+    )
+
+  ;; THIN
+  (autotile
+      (id 7319)
+      (solid #t)
+      (mask "***00010")
+    )
+
+  ;; B LEFT
+  (autotile
+      (id 7320)
+      (solid #t)
+      (mask "***01*0*")
+    )
+
+  ;; B CENTER
+  (autotile
+      (id 7321)
+      (solid #t)
+      (mask "***11*0*")
+    )
+
+  ;; B RIGHT
+  (autotile
+      (id 7322)
+      (solid #t)
+      (mask "***10*0*")
+    )
+
+  ;; B THIN
+  (autotile
+      (id 7323)
+      (solid #t)
+      (mask "***00*0*")
+    )
+
+  ;; CORNER TL
+  (autotile
+      (id 7325)
+      (solid #t)
+      (mask "***11110")
+    )
+
+  ;; CORNER TR
+  (autotile
+      (id 7326)
+      (solid #t)
+      (mask "***11011")
+    )
+
+  ;; CORNER BL
+  (autotile
+      (id 7327)
+      (solid #t)
+      (mask "***10111")
+    )
+
+  ;; CORNER BR
+  (autotile
+      (id 7328)
+      (solid #t)
+      (mask "***01111")
+    )
+
+  ;; CORNER THIN TL
+  (autotile
+      (id 7329)
+      (solid #t)
+      (mask "***01010")
+    )
+
+  ;; CORNER THIN TR
+  (autotile
+      (id 7330)
+      (solid #t)
+      (mask "***10010")
+    )
+
+  ;; CORNER THIN TC
+  (autotile
+      (id 7331)
+      (solid #t)
+      (mask "***11010")
+    )
+
+  ;; CORNER THIN BL
+  (autotile
+      (id 7332)
+      (solid #t)
+      (mask "***00011")
+    )
+
+  ;; CORNER THIN BR
+  (autotile
+      (id 7333)
+      (solid #t)
+      (mask "***00110")
+    )
+
+  ;; CORNER THIN BC
+  (autotile
+      (id 7334)
+      (solid #t)
+      (mask "***00111")
+    )
+
+  ;; CORNER "S"
+  (autotile
+      (id 7335)
+      (solid #t)
+      (mask "***01110")
+    )
+
+  ;; CORNER "Z"
+  (autotile
+      (id 7336)
+      (solid #t)
+      (mask "***10011")
+    )
+
+  ;; DECO TILES -----------
+
+  ;; DECO LEFT
+  (autotile
+      (id 7312)
+      (solid #f)
+      (mask "*****011")
+    )
+
+  ;; DECO CENTER
+  (autotile
+      (id 7313)
+      (solid #f)
+      (mask "*****111")
+    )
+
+  ;; DECO RIGHT
+  (autotile
+      (id 7314)
+      (solid #f)
+      (mask "*****110")
+    )
+
+  ;; DECO THIN
+  (autotile
+      (id 7315)
+      (solid #f)
+      (mask "*****010")
+    )
+
+  )
+
 )

data/images/converters/data.stcd

@@ -1,12 +1,17 @@
-(supertux-converter-data
-  (nightly_all_tiles.sttc
-    (title (_ "Nightly Tiles"))
-    (author "SuperTux Team")
-    (description (_ "For levels, created in previous Nightly builds."))
-  )
-  (pre-0.6.3_crystal_tiles.sttc
-    (title (_ "Pre-0.6.3 Crystal Tiles"))
-    (author "tylerandari12")
-    (description (_ "For levels, created in pre-0.6.3 versions, which use crystal tiles."))
-  )
-)
+(supertux-converter-data
+  (nightly_all_tiles.sttc
+    (title (_ "Nightly Tiles"))
+    (author "SuperTux Team")
+    (description (_ "For levels, created in previous Nightly builds."))
+  )
+  (pre-0.6.3_crystal_tiles.sttc
+    (title (_ "Pre-0.6.3 Crystal Tiles"))
+    (author "tylerandari12")
+    (description (_ "For levels, created in pre-0.6.3 versions, which use crystal tiles."))
+  )
+  (rock_tiles_addon_to_vanilla.sttc
+    (title (_ "Jagged Rock Tiles from Addon"))
+    (author "Eauix")
+    (description (_ "For levels, created with the rock tiles addon, converts their IDs to vanilla rock tile IDs"))
+  )
+)