Merge branch 'master' into wind_fixes

.github/workflows/android.yml

@@ -40,7 +40,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          submodules: true
+          submodules: recursive
 
       - name: Clone SDL Android repo
         run: |

.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, Release]
+        build_type: [Debug, RelWithDebInfo]
         # FreeBSD does not have glbinding
         # glbiactions/checkout@v4
 
@@ -42,7 +42,7 @@ jobs:
         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' }}

.github/workflows/gnulinux.yml

@@ -34,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
@@ -62,7 +62,7 @@ jobs:
         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 }}

.github/workflows/macos.yml

@@ -32,11 +32,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-12]
-        build_type: [Debug, Release]
+        build_type: [Debug, RelWithDebInfo]
         glbinding: [ON, OFF]
         include:
           - os: macos-12
-            build_type: Release
+            build_type: RelWithDebInfo
             glbinding: OFF
             release: ON
 
@@ -46,7 +46,7 @@ jobs:
         with:
           # Fetch the whole tree so git describe works
           fetch-depth: 0
-          submodules: true
+          submodules: recursive
 
       - name: Install macos dependencies
         if: ${{ matrix.os == 'macos-12' }}

.github/workflows/scripting.yml

@@ -20,7 +20,7 @@ on:
   push:
     branches: [ "master" ]
     paths:
-      - src/scripting/*.hpp
+      - src/*
   workflow_dispatch:
 
 jobs:
@@ -56,31 +56,42 @@ jobs:
           cmake --version
           mkdir build
           cd build
-          cmake .. -DBUILD_SCRIPTING_DOCUMENTATION=ON
+          cmake .. -DBUILD_DOCUMENTATION_WITH_SCRIPTING=ON
           make
 
       - name: Generate scripting reference
         working-directory: tools/scripting_docs_gen/build
         run: |
-          doxygen docs/scripting/Doxyfile
+          doxygen docs/Doxyfile
           rm ../../../wiki/Scripting*.md
-          ./ScriptingDocsGen --dir docs/scripting/doxygen/xml \
+          ./ScriptingDocsGen --dir docs/doxygen/xml \
                              --home ../../../wiki/templates/ScriptingHome.md \
                              --page ../../../wiki/templates/ScriptingPage.md \
                              --output ../../../wiki
 
+      - name: Check for changes
+        working-directory: wiki
+        run: |
+          REF_UPDATED=true
+          if git diff --exit-code; then
+            REF_UPDATED=false
+          fi
+          echo "REFERENCE_UPDATED=$(echo $REF_UPDATED)" >> $GITHUB_ENV
+
       - name: Install SSH key
+        if: ${{ env.REFERENCE_UPDATED == 'true' }}
         uses: shimataro/ssh-key-action@v2
         with:
           key: ${{ secrets.wiki_repo_key }}
           known_hosts: ${{ secrets.wiki_repo_hosts }}
 
       - name: Push changes to wiki
+        if: ${{ env.REFERENCE_UPDATED == 'true' }}
         working-directory: wiki
         run: |
           git --version
           git status
-          git config --global user.email "supertux-bot"
+          git config --global user.email "SuperTux-bot@users.noreply.github.com"
           git config --global user.name "SuperTux Bot"
           git add .
           git commit -m "Update scripting reference (SuperTux/supertux@${{ github.sha }})"

.github/workflows/ubuntu-touch.yml

@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build_type: [Debug, Release]
+        build_type: [Debug, RelWithDebInfo]
         arch: [amd64, arm64, armhf]
         # glbinding is missing as it isn't available on Ubuntu 16.04
         opengl: [glew, sdl]
@@ -45,7 +45,7 @@ jobs:
         with:
           # Fetch the whole tree so git describe works
           fetch-depth: 0
-          submodules: true
+          submodules: recursive
 
       - name: Install clickable
         run: |

.github/workflows/wasm.yml

@@ -30,15 +30,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build_type: ["Release", "Debug"]
+        build_type: ["RelWithDebInfo", "Debug"]
 
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           # Fetch the whole tree so git describe works
           fetch-depth: 0
-          submodules: true
+          submodules: recursive
 
       - name: Install emscripten tools
         run: |

.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
@@ -50,7 +50,7 @@ jobs:
         with:
           # Fetch the whole tree so git describe works
           fetch-depth: 0
-          submodules: true
+          submodules: recursive
 
       - name: Use cached dependencies
         id: cache-dependencies
@@ -104,21 +104,56 @@ jobs:
         run: |
           "./$Env:BUILD_TYPE/run_tests.exe"
 
-      - name: Package
+      - name: Package MSI Installer
+        shell: pwsh
         working-directory: build
         env:
           BUILD_TYPE: ${{ matrix.build_type }}
         run: |
           cpack -C $Env:BUILD_TYPE
-          mkdir upload
-          mv *.msi upload/
+          if ($LASTEXITCODE -ne 0)
+          {
+            $code = $LASTEXITCODE
+            type ./_CPack_Packages/win64/WIX/wix.log
+            exit $code
+          }
+          else
+          {
+            mkdir upload
+            mv *.msi upload/
+          }
 
-      - uses: actions/upload-artifact@v4
+      - name: Upload MSI Installer
+        uses: actions/upload-artifact@v4
         with:
           name: "windows-${{ matrix.arch }}-${{ matrix.build_type }}${{ matrix.glbinding == 'ON' && '-glbinding' || '' }}-installer"
           path: build/upload/*.msi
           if-no-files-found: ignore
 
+      - name: Package Portable Archive
+        working-directory: build
+        env:
+          BUILD_TYPE: ${{ matrix.build_type }}
+        run: |
+          mkdir -Force SuperTux-${{ github.sha }}-portable
+          cmake --install . --config $Env:BUILD_TYPE --prefix .\SuperTux-${{ github.sha }}-portable
+
+          # Because github puts assets in zips, if you upload a zip,
+          # it will upload another zip. I have disabled this code because
+          # of that, but in case you wanted to know how to generate a portable release,
+          # here it is.
+          <#
+          cpack -C $Env:BUILD_TYPE -G ZIP
+          mv *.zip SuperTux-${{ github.sha }}-portable/
+          #>
+
+      - name: Upload Portable Package
+        uses: actions/upload-artifact@v4
+        with:
+          name: "windows-${{ matrix.arch }}-${{ matrix.build_type }}${{ matrix.glbinding == 'ON' && '-glbinding' || '' }}-portable"
+          path: build/SuperTux-${{ github.sha }}-portable
+          if-no-files-found: ignore
+
       - uses: anshulrgoyal/upload-s3-action@master
         if: matrix.release && env.CI_KEY != null
         env:
@@ -147,5 +182,5 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          files: 'build/upload/SuperTux-*'
+          files: 'build/upload/SuperTux-*.msi'
           draft: true

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "external/tinygettext"]
 	path = external/tinygettext
 	url = https://github.com/SuperTux/tinygettext.git
-[submodule "external/squirrel"]
-	path = external/squirrel
-	url = https://github.com/albertodemichelis/squirrel.git
 [submodule "external/sexp-cpp"]
 	path = external/sexp-cpp
 	url = https://github.com/SuperTux/sexp-cpp.git
@@ -15,13 +12,13 @@
 	url = https://github.com/SuperTux/SDL_ttf
 [submodule "discord-sdk"]
 	path = external/discord-sdk
-	url = https://github.com/discord/discord-rpc
+	url = https://github.com/SuperTux/discord-rpc
 [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
+[submodule "external/simplesquirrel"]
+	path = external/simplesquirrel
+	url = https://github.com/SuperTux/simplesquirrel

CMakeLists.txt

@@ -174,7 +174,7 @@ include(SuperTux/ProvideOpenAL)
 include(SuperTux/ProvideOggVorbis)
 include(SuperTux/ProvidePhysfs)
 include(SuperTux/ProvideCurl)
-include(SuperTux/ProvideSquirrel)
+include(SuperTux/ProvideSimpleSquirrel)
 include(SuperTux/ProvideTinygettext)
 include(SuperTux/ProvideSDL2_ttf)
 include(SuperTux/ProvideDiscord)
@@ -187,7 +187,6 @@ include(SuperTux/ProvideOpenGL)
 include(SuperTux/BuildVersion)
 include(SuperTux/BuildDocumentation)
 include(SuperTux/BuildMessagePot)
-include(SuperTux/BuildMiniswigWrapper)
 
 ## Build list of sources for supertux binary
 file(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/obstack/*.c external/findlocale/findlocale.c)
@@ -205,10 +204,6 @@ list(SORT SUPERTUX_SOURCES_C)
 list(SORT SUPERTUX_SOURCES_CXX)
 list(SORT SUPERTUX_RESOURCES)
 
-if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/scripting/wrapper.cpp)
-  set(SUPERTUX_SOURCES_CXX ${SUPERTUX_SOURCES_CXX} ${CMAKE_CURRENT_SOURCE_DIR}/src/scripting/wrapper.cpp)
-endif()
-
 ## On Windows, add an icon
 if(WIN32)
   if(MINGW)
@@ -269,8 +264,7 @@ endif()
 
 ## Link supertux binary with squirrel and other libraries
 
-target_link_libraries(supertux2_lib PUBLIC LibSquirrel)
-target_link_libraries(supertux2_lib PUBLIC LibSqstdlib)
+target_link_libraries(supertux2_lib PUBLIC LibSimpleSquirrel)
 target_link_libraries(supertux2_lib PUBLIC LibTinygettext)
 target_link_libraries(supertux2_lib PUBLIC LibSexp)
 target_link_libraries(supertux2_lib PUBLIC LibSavePNG)

CONTRIBUTING.md

@@ -6,7 +6,7 @@
   however English is generally preferred so everyone can understand what's happening.
 - Please check for duplicate issues on GitHub, as they're wasting the developers'
   time.
-- Also try to check if your issue has been resolved in the development version.
+- Check if your issue has been resolved in the latest development version.
 - Separate issues and feature requests. Don't put all in the same issue.
 - If you made a mistake in your bug report, please use GitHub's edit feature
   to correct the wrong detail, instead of closing the old issue and opening a
@@ -23,18 +23,21 @@ Please include the following details in your issue report so that we can investi
   and version details.
 - If possible, provide steps to reproduce your issue.
 - If available, it's a great help for the developers to include a backtrace from
-  gdb or a core dump. If you're on GNU/Linux and your distro is using systemd, it's
+  `gdb` or a core dump. If you're on GNU/Linux and your distro is using systemd, it's
   highly likely that a core dump is available using `coredumpctl(1)`.
 
 ### Add-on related issues
 
+Issues regarding add-ons found in the official SuperTux Add-on repository
+should be filed at [SuperTux/addons](https://github.com/SuperTux/addons/issues).
+
 No support is provided for third-party add-ons (that doesn't include official
-add-ons or language packs). However, a pull request against the SuperTux/addons
-repository containing a fix is always welcome.
+add-ons or language packs). However, a pull request against the [SuperTux/addons](https://github.com/SuperTux/addons)
+repository, containing a fix, is always welcome!
 
 ### Translation issues
 
-Please use Transifex to fix or report translation related issues.
+Please use [Transifex](https://explore.transifex.com/arctic-games/supertux/) to fix or report translation related issues.
 
 ## Pull requests
 

data/AUTHORS

@@ -86,6 +86,8 @@ All files in data/music created by wansti and licensed under GPLv2+CC-by-sa, unl
 * snowfort.ogg - By SnugglyBun, licensed under CC-BY-SA 4.0
 * icecastle.ogg - By SnugglyBun, based on the original fortress theme by Wansti. licensed under CC-BY-SA 4.0
 * yetiboss.ogg - By SnugglyBun, cover of the original boss battle theme by Wansti. licensed under CC-BY-SA 4.0
+* forest_midday.ogg - By SnugglyBun, based on the original forest theme by Wansti. licensed under CC-BY-SA 4.0
+* forest_midday_alt.ogg - By SnugglyBun, based on forest.ogg and forest3.ogg by Wansti. licensed under CC-BY-SA 4.0
 
 == Scripts ==