Merge branch 'SuperTux:master' into android-workflows

.github/workflows/ubuntu-touch.yml

@@ -67,7 +67,7 @@ jobs:
           ARCH: ${{ matrix.arch }}
         run: |
           ~/.local/bin/clickable build --verbose ${BUILD_TYPE} --arch ${ARCH}  \
-                                      --config mk/clickable/build-with-glew.json
+                                      --config mk/clickable/clickable-glew.yaml
 
       - name: Build (OpenGL with GLbinding)
         if: ${{ matrix.opengl == 'glbinding' }}
@@ -76,7 +76,7 @@ jobs:
           ARCH: ${{ matrix.arch }}
         run: |
           ~/.local/bin/clickable build --verbose ${BUILD_TYPE} --arch ${ARCH}  \
-                                 --config mk/clickable/build-with-glbinding.json
+                                 --config mk/clickable/clickable-glbinding.yaml
 
       - name: Build (no OpenGL)
         if: ${{ matrix.opengl == 'sdl' }}
@@ -92,12 +92,12 @@ jobs:
           path: build.clickable/*.click
           if-no-files-found: ignore
 
-      - name: Publish to Open Store
-        if: ${{ github.ref == 'refs/heads/master' && matrix.build_type == 'Release' && matrix.opengl == 'sdl' }}
-        env:
-          ARCH: ${{ matrix.arch }}
-          OPENSTORE_KEY: ${{ secrets.OPENSTORE_KEY }}
-        run: |
-          ~/.local/bin/clickable publish "* $(git log -1 --pretty=%B |         \
-                                         head -1)" --apikey ${OPENSTORE_KEY}   \
-                                         --arch ${ARCH}
+      #- name: Publish to Open Store
+      #  if: ${{ github.ref == 'refs/heads/master' && matrix.build_type == 'Release' && matrix.opengl == 'sdl' }}
+      #  env:
+      #    ARCH: ${{ matrix.arch }}
+      #    OPENSTORE_KEY: ${{ secrets.OPENSTORE_KEY }}
+      #  run: |
+      #    ~/.local/bin/clickable publish "* $(git log -1 --pretty=%B |         \
+      #                                   head -1)" --apikey ${OPENSTORE_KEY}   \
+      #                                   --arch ${ARCH}

CODINGSTYLE.md

@@ -2,10 +2,10 @@
 
 ## Language
 
-C++14 is the main langauge used for this project. GCC, Clang and MSVC are supported.
+C++17 is the main langauge used for this project. GCC, Clang and MSVC are supported.
 
 For better backward compatibilty with older compiler, namely gcc5,
-some C++14 features are restricted:
+some C++17 features are restricted:
 
 * generic lambda functions are not allowed, e.g. `[](auto foo){}`
 * tuple constructors have to be explicit, e.g. `std::tuple<int, int>{5, 6}`, not `{5, 6}`

clickable.yaml

@@ -0,0 +1,39 @@
+clickable_minimum_required: 7
+framework: "ubuntu-sdk-20.04"
+builder: "cmake"
+build_dir: "build.clickable"
+dependencies_target:
+  - "libogg-dev"
+  - "libvorbis-dev"
+  - "libopenal-dev"
+  - "libsdl2-dev"
+  - "libsdl2-image-dev"
+  - "libfreetype6-dev"
+  - "libcurl4-openssl-dev"
+  - "libharfbuzz-dev"
+  - "libfribidi-dev"
+  - "libglm-dev"
+  - "zlib1g-dev"
+install_lib:
+  - "/usr/lib/${ARCH_TRIPLET}/libogg.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libvorbis.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libvorbisfile.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libopenal.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libSDL2.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libSDL2-2.0.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libSDL2_image.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libSDL2_image-2.0.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libfreetype.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libcurl.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libharfbuzz.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libfribidi.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libasound.so*"
+  - "/usr/lib/${ARCH_TRIPLET}/libsndio.so*"
+  - "/lib/${ARCH_TRIPLET}/libz.so.1.2.11"
+build_args:
+  - "-DUBUNTU_TOUCH=ON"
+  - "-DENABLE_OPENGL=OFF"
+  - "-DWARNINGS=ON"
+  - "-DWERROR=ON"
+  - "-DCLICK_ARCH=${ARCH}"
+  - "-DCLICK_FRAMEWORK=ubuntu-sdk-20.04"

data/images/creatures/dart/dart.sprite

@@ -2,11 +2,23 @@
   (action
     (name "flying-left")
     (hitbox 10 6 12 7)
-    (images "flying.png")
-    )
+    (images "flying-left.png")
+  )
   (action
     (name "flying-right")
     (hitbox 10 6 12 7)
     (mirror-action "flying-left")
-    )
   )
+  (action
+    (name "flying-down")
+    (hitbox 6 10 7 12)
+    (images "flying-down.png")
+  )
+  ;; This will never show up since the editor uses the flipped down texture
+  ;; But it prevents warnings for missing actions
+  (action
+    (name "editor-up")
+    (hitbox 6 10 7 12)
+    (images "flying-down.png")
+  )
+)

data/images/creatures/darttrap/darttrap.sprite

@@ -1,39 +1,73 @@
 (supertux-sprite
   (action
-    (hitbox 21 13 11 37)
+    (hitbox 21 13 11 54)
     (name "idle-left")
-	(loops 1)
-    (images "d3-.png"
-	  "d3-.png"
-	  "d3-.png"
-	  "d3-.png"
-	  "d4.png"
-	  "d-idle.png")
+    (loops 1)
+    (images "left-3.png"
+      "left-3.png"
+      "left-3.png"
+      "left-3.png"
+      "left-4.png"
+      "left-idle.png"
+    )
+  )
+  (action
+    (hitbox 13 21 54 11)
+    (name "idle-down")
+    (loops 1)
+    (images "down-3.png"
+      "down-3.png"
+      "down-3.png"
+      "down-3.png"
+      "down-4.png"
+      "down-idle.png"
+    )
+  )
+  ;; This will never show up since the editor uses the flipped down texture
+  ;; But it prevents warnings for missing actions
+  (action
+    (hitbox 13 21 54 11)
+    (name "editor-up")
+    (images "down-1.png")
   )
   (action
-    (hitbox 21 13 11 37)
+    (hitbox 21 13 11 54)
     (name "idle-right")
-	(loops 1)
+    (loops 1)
     (mirror-action "idle-left")
   )
   (action
-    (hitbox 21 13 11 37)
+    (hitbox 21 13 11 54)
     (name "loading-left")
-	(fps 10)
+    (fps 10)
+    (images 
+      "left-idle.png"
+      "left-1.png"
+      "left-2.png"
+      "left-3.png"
+      "left-3.png"
+      "left-3.png"
+      "left-3.png"
+    )
+  )
+  (action
+    (hitbox 13 21 54 11)
+    (name "loading-down")
+    (fps 10)
     (images 
-      "d-idle.png"
-      "d1.png"
-	  "d2.png"
-	  "d3-.png"
-	  "d3-.png"
-	  "d3-.png"
-	  "d3-.png"
+      "down-idle.png"
+      "down-1.png"
+      "down-2.png"
+      "down-3.png"
+      "down-3.png"
+      "down-3.png"
+      "down-3.png"
     )
   )
   (action
-    (hitbox 21 13 11 37)
+    (hitbox 21 13 11 54)
     (name "loading-right")
-	(fps 10)
+    (fps 10)
     (mirror-action "loading-left")
   )
 )

data/images/creatures/mr_bomb/old_bomb/old_bomb.sprite

@@ -20,12 +20,12 @@
 
  (action
   (name "iced-left")
-  (hitbox 5 8 32 32)
-  (images "iced-left.png"))
+  (hitbox 14 19 32 32)
+  (images "left-0.png"))
 
  (action
   (name "iced-right")
-  (hitbox 5 8 32 32)
+  (hitbox 14 19 32 32)
   (mirror-action "iced-left"))
 
  (action