Merge branch 'master' into rock-interactions

.github/ISSUE_TEMPLATE.md

@@ -16,6 +16,7 @@ If the issue only occurs in a custom level, please attach that too.*
 
 - [ ] I have read <https://github.com/SuperTux/supertux/blob/master/CONTRIBUTING.md#bug-reports>.
 - [ ] I verified this isn't an issue that's already been reported.
+- [ ] I verified this isn't a [discussion](https://github.com/SuperTux/supertux/discussions), but an actual issue ─ that is, the game did something not intended such as crashing or giving error messages.
 - [ ] This report only includes details about **one** (1) issue, feature request or topic.
 - [ ] If I make a mistake while submitting this report I will use the edit feature instead of closing this issue and opening a new one.
 - [ ] This issue is **not** about wrong translations (use Transifex for those), or anything unsupported (e.g. third-party add-ons).

.github/workflows/bsd.yml

@@ -64,7 +64,6 @@ jobs:
             pkg install -y openal-soft
             pkg install -y glew
             # pkg install -y glbinding # TODO: Uncomment whenever possible
-            pkg install -y boost-all
             pkg install -y curl
             pkg install -y libogg
             pkg install -y libvorbis

.github/workflows/gnulinux.yml

@@ -31,7 +31,7 @@ jobs:
       fail-fast: false
       matrix:
         arch: [32, 64]
-        os: [ubuntu-20.04, ubuntu-18.04]
+        os: [ubuntu-20.04]
         compiler: [gcc, clang]
         build_type: [Debug, Release]
         glbinding: [ON, OFF]
@@ -84,7 +84,6 @@ jobs:
             libogg-dev \
             libvorbis-dev \
             libopenal-dev \
-            libboost-all-dev \
             libsdl2-dev \
             libsdl2-image-dev \
             libfreetype6-dev \
@@ -137,9 +136,6 @@ jobs:
             libogg-dev:i386 \
             libvorbis-dev:i386 \
             libopenal-dev:i386 \
-            libboost-date-time-dev:i386 \
-            libboost-filesystem-dev:i386 \
-            libboost-locale-dev:i386 \
             libsdl2-dev:i386 \
             libsdl2-image-dev:i386 \
             libfreetype6-dev:i386 \

.github/workflows/macos.yml

@@ -30,14 +30,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-10.15, macos-11]
+        os: [macos-11]
         build_type: [Debug, Release]
         glbinding: [ON, OFF]
         include:
-          - os: macos-10.15
-            build_type: Release
-            glbinding: OFF
-            release: ON
           - os: macos-11
             build_type: Release
             glbinding: OFF
@@ -52,9 +48,9 @@ jobs:
           submodules: true
 
       - name: Install macos dependencies
-        if: ${{ matrix.os == 'macos-10.15' ||  matrix.os == 'macos-11' }}
+        if: ${{ matrix.os == 'macos-11' }}
         run: |
-          brew install boost cmake googletest bash rename libogg libvorbis glew\
+          brew install cmake googletest bash rename libogg libvorbis glew\
                        openal-soft sdl2 sdl2_image sdl2_ttf freetype harfbuzz  \
                        fribidi glib gtk-doc glbinding libraqm glm zlib
 
@@ -137,9 +133,6 @@ jobs:
         env:
           OS: ${{ matrix.os }}
         run: |
-          if [ "$OS" = "macos-10.15" ]; then
-            rename 's/.dmg/-10.15.dmg/' build/upload/SuperTux-*
-          fi
           if [ "$OS" = "macos-11" ]; then
             rename 's/.dmg/-11.dmg/' build/upload/SuperTux-*
           fi

.github/workflows/scripting.yml

@@ -0,0 +1,87 @@
+#  SuperTux
+#  Copyright (C) 2023 Vankata453
+#
+#  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: Scripting
+on:
+  push:
+    branches: [ "master" ]
+    paths:
+      - src/scripting/*.hpp
+  workflow_dispatch:
+
+jobs:
+  scripting-update:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 1
+
+      - name: Checkout the wiki repository
+        uses: actions/checkout@v3
+        with:
+          repository: SuperTux/wiki
+          path: wiki
+          fetch-depth: 1
+
+      - name: Install packages
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            cmake \
+            build-essential \
+            g++-9 \
+            libc++-dev \
+            libtinyxml2-dev \
+            doxygen
+
+      - name: Build scripting reference generator
+        working-directory: tools/scripting_docs_gen
+        run: |
+          cmake --version
+          mkdir build
+          cd build
+          cmake .. -DBUILD_SCRIPTING_DOCUMENTATION=ON
+          make
+
+      - name: Generate scripting reference
+        working-directory: tools/scripting_docs_gen/build
+        run: |
+          doxygen docs/scripting/Doxyfile
+          rm ../../../wiki/Scripting*.md
+          ./ScriptingDocsGen --dir docs/scripting/doxygen/xml \
+                             --home ../../../wiki/templates/ScriptingHome.md \
+                             --page ../../../wiki/templates/ScriptingPage.md \
+                             --output ../../../wiki
+
+      - name: Install SSH key
+        uses: shimataro/ssh-key-action@v2
+        with:
+          key: ${{ secrets.wiki_repo_key }}
+          known_hosts: ${{ secrets.wiki_repo_hosts }}
+
+      - name: Push changes to wiki
+        working-directory: wiki
+        run: |
+          git --version
+          git status
+          git config --global user.email "supertux-bot"
+          git config --global user.name "SuperTux Bot"
+          git add .
+          git commit -m "Update scripting reference (SuperTux/supertux@${{ github.sha }})"
+          git push [email protected]:SuperTux/wiki.git HEAD:master

.github/workflows/wasm.yml

@@ -31,7 +31,7 @@ jobs:
       matrix:
         build_type: ["Release", "Debug"]
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:
@@ -46,37 +46,8 @@ jobs:
           sudo apt-get install -y git cmake build-essential curl zip
           git clone https://github.com/emscripten-core/emsdk.git
           cd emsdk
-          ./emsdk install 1.40.1
-          ./emsdk activate 1.40.1
-          # Fixes a bug in emscripten - see https://github.com/emscripten-core/emscripten/issues/13590
-          sed -i "s/\#define MALLOC_ALIGNMENT ((size_t)(2 \* sizeof(void \*)))/#define MALLOC_ALIGNMENT 16/g" upstream/emscripten/system/lib/dlmalloc.c
-          # Fixes a bug with the libjpeg port - see https://github.com/emscripten-core/emscripten/pull/13878
-          sed -i 's/2b581c60ae401a79bbbe748ff2deeda5acd50bfd2ea22e5926e36d34b9ebcffb6580b0ff48e972c1441583e30e21e1ea821ca0423f9c67ce08a31dffabdbe6b7/b2affe9a1688bd49fc033f4682c4a242d4ee612f1affaef532f5adcb4602efc4433c4a52a4b3d69e7440ff1f6413b1b041b419bc90efd6d697999961a9a6afb7/g' upstream/emscripten/tools/ports/libjpeg.py
-          sed -i 's/https:\/\/dl.bintray.com\/homebrew\/mirror\/jpeg-9c.tar.gz/https:\/\/storage.googleapis.com\/webassembly\/emscripten-ports\/jpegsrc.v9c.tar.gz/g' upstream/emscripten/tools/ports/libjpeg.py
-
-      - name: Install vcpkg and dependencies
-        run: |
-          source ~/emsdk/emsdk_env.sh
-          cd ~
-          git clone https://github.com/microsoft/vcpkg
-          ./vcpkg/bootstrap-vcpkg.sh
-          ./vcpkg/vcpkg integrate install
-          ./vcpkg/vcpkg install boost-date-time:wasm32-emscripten
-          ./vcpkg/vcpkg install boost-filesystem:wasm32-emscripten
-          ./vcpkg/vcpkg install boost-format:wasm32-emscripten
-          ./vcpkg/vcpkg install boost-locale:wasm32-emscripten
-          ./vcpkg/vcpkg install boost-optional:wasm32-emscripten
-          ./vcpkg/vcpkg install boost-system:wasm32-emscripten
-          ./vcpkg/vcpkg install glbinding:wasm32-emscripten
-          ./vcpkg/vcpkg install libpng:wasm32-emscripten
-          ./vcpkg/vcpkg install libogg:wasm32-emscripten
-          ./vcpkg/vcpkg install libvorbis:wasm32-emscripten
-          ./vcpkg/vcpkg install glm:wasm32-emscripten
-          ./vcpkg/vcpkg install zlib:wasm32-emscripten
-
-      - name: Patch SDL_ttf
-        working-directory: external/SDL_ttf
-        run: git apply ../../mk/emscripten/SDL_ttf.patch
+          ./emsdk install latest
+          ./emsdk activate latest
 
       - name: Configure build
         env:
@@ -85,10 +56,8 @@ jobs:
           source ~/emsdk/emsdk_env.sh
           mkdir build
           cd build
-          emcmake cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_OPENGLES2=ON \
-                -DCMAKE_TOOLCHAIN_FILE=~/vcpkg/scripts/buildsystems/vcpkg.cmake\
-                -DVCPKG_TARGET_TRIPLET=wasm32-emscripten -DGLBINDING_ENABLED=ON\
-                -DEMSCRIPTEN=1 -DWARNINGS=ON -DWERROR=ON ..
+          # TODO: Re-add -DWERROR=ON when warnings will be fixed
+          emcmake cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DWARNINGS=ON ..
 
       - name: Sync data folder
         working-directory: build
@@ -110,7 +79,7 @@ jobs:
         env:
           BUILD_TYPE: ${{ matrix.build_type }}
         run: |
-          rm supertux2.html && cp template.html supertux2.html
+          cp template.html supertux2.html
           mkdir upload/
           mv supertux2* upload/
 
@@ -128,4 +97,5 @@ jobs:
           cd build/upload/
           mv supertux2.html index.html
           zip supertux2.zip *
-          curl -F "archive=@$(pwd)/supertux2.zip" -F "message=$(git log --format=%B -n 1 | head -1)" $UPLOAD_URL
+          # TODO: Decomment (or replace URL with a different host)
+          # curl -F "archive=@$(pwd)/supertux2.zip" -F "message=$(git log --format=%B -n 1 | head -1)" $UPLOAD_URL

.github/workflows/windows.yml

@@ -50,19 +50,21 @@ jobs:
           # Fetch the whole tree so git describe works
           fetch-depth: 0
           submodules: true
+
+      - name: Use cached dependencies
+        id: cache-dependencies
+        uses: actions/cache@v3
+        with:
+          path: C:/vcpkg/installed
+          key: ${{ runner.os }}-${{ matrix.arch }}-dependencies-${{ hashFiles('.github/workflows/windows.yml') }}
+
       - name: Install dependencies
+        if: steps.cache-dependencies.outputs.cache-hit != 'true'
         env:
           ARCH: ${{ matrix.arch }}
         run: |
           vcpkg integrate install
           vcpkg install gtest:$Env:ARCH-windows
-          vcpkg install boost-date-time:$Env:ARCH-windows
-          vcpkg install boost-filesystem:$Env:ARCH-windows
-          vcpkg install boost-format:$Env:ARCH-windows
-          vcpkg install boost-iostreams:$Env:ARCH-windows
-          vcpkg install boost-locale:$Env:ARCH-windows
-          vcpkg install boost-optional:$Env:ARCH-windows
-          vcpkg install boost-system:$Env:ARCH-windows
           vcpkg install curl:$Env:ARCH-windows
           vcpkg install --recurse freetype:$Env:ARCH-windows
           vcpkg install glew:$Env:ARCH-windows

.gitignore

@@ -26,6 +26,9 @@ version.cmake
 Doxyfile
 docs/doxygen/
 
+# Tool-related build files
+tools/scripting_docs_gen/build/
+
 # Qt Creator project file
 CMakeLists.txt.user
 
@@ -40,6 +43,9 @@ language.settings.xml
 # Visual Studio project files
 *.vs/
 
+# JetBrains IDE project files
+.idea/
+
 # Windows build dependencies
 dependencies*/
 

.gitmodules

@@ -19,3 +19,9 @@
 [submodule "external/fmt"]
 	path = external/fmt
 	url = https://github.com/fmtlib/fmt.git
+[submodule "tools/miniswig"]
+	path = tools/miniswig
+	url = https://github.com/WindstilleTeam/miniswig
+[submodule "external/glm"]
+	path = external/glm
+	url = https://github.com/g-truc/glm.git