Merge commit 'dfbd3b9e32c7a6d4e66f35e4e885c4e3ca113613' into wind_fixes

.github/workflows/android.yml

@@ -74,7 +74,7 @@ jobs:
           sed -i "s/AppVersionCode.*/AppVersionCode=$VERSION_CODE/g" project/jni/application/supertux/AndroidAppSettings.cfg
 
       - name: Copy precompiled libraries from cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: cache
         with:
           # The same SDL revision will produce the same libraries

.github/workflows/lint.yml

@@ -54,4 +54,4 @@ jobs:
             --check-level=exhaustive \
             --quiet --inline-suppr --language=c++ --error-exitcode=10 \
             -j"$(nproc)" --std=c++17 --enable=warning,style \
-            --suppress=useStlAlgorithm  src/
+            --suppress=useStlAlgorithm -UEMSCRIPTEN src/

.github/workflows/translations.yml

@@ -19,7 +19,7 @@ name: translations
 on:
   workflow_dispatch:
   schedule:
-    - cron:  '0 0 * * *'
+    - cron:  '0 0 * * 0'
 
 jobs:
   update-all-translations:

.github/workflows/windows.yml

@@ -54,7 +54,7 @@ jobs:
 
       - name: Use cached dependencies
         id: cache-dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: C:/vcpkg/installed
           key: ${{ runner.os }}-${{ matrix.arch }}-dependencies-${{ hashFiles('.github/workflows/windows.yml') }}

.gitignore

@@ -46,6 +46,13 @@ language.settings.xml
 # JetBrains IDE project files
 .idea/
 
+# Emacs
+*~
+\#*\#
+.\#*
+.dir-locals.el
+.projectile
+
 # Windows build dependencies
 dependencies*/
 

CODINGSTYLE.md

@@ -80,7 +80,7 @@ with polymorphism in mind.
 
 Mark all functions that override a virtual function in a base class with `override`.
 
-Write simple getters/setters inside a header file on a single line.
+Write simple getters/setters inside a header file on a single line. Mark them as `inline`.
 
 Properly separate data members and member functions. Do not mix them in the same
 `public`/`protected`/`private` section.

README.md

@@ -95,10 +95,10 @@ In case you need help, feel free to reach out using the following means:
   and might miss potential answers.
 * **Matrix:** [#supertux:matrix.org](https://matrix.to/#/#supertux:matrix.org)
   is bridged to our IRC room.
-* **[Forum](https://forum.freegamedev.net/viewforum.php?f=66):** The SuperTux
-  community is very active on the forum, the discussion ranges from feature
+* **[Forum](https://groups.f-hub.org/g/8AKEaTgZ):** The SuperTux
+  community is also active on the forum, the discussions range from feature
   proposals to support questions. In particular, most community-contributed
-  add-ons are published there first, so this is worth checking.
+  add-ons are published there, so this is worth checking.
 * **Mailing Lists:** The
   [supertux-devel](http://lists.lethargik.org/listinfo.cgi/supertux-devel-lethargik.org)
   mailing list is dead. Here is the [archive](https://github.com/supertux-community/supertux-devel-maillist).