Merge branch 'master' of github.com:instead-hub/instead

Author: hugeping

.github/workflows/CI.yml

@@ -28,7 +28,7 @@ jobs:
           }
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@main
 
       - name: Create Build Directory
         run: cmake -E make_directory ${{github.workspace}}/build
@@ -50,7 +50,7 @@ jobs:
 #          cmake --install ./build
 
 #      - name: Publish Artifact
-#        uses: actions/upload-artifact@v2
+#        uses: actions/upload-artifact@v4
 #        with:
 #          name: standalone
 #          path: build/standalone

.github/workflows/appimage.yml

@@ -9,7 +9,7 @@ jobs:
     name: build AppImage
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@main
 
       - name: Create Build Directory
         run: cmake -E make_directory ${{github.workspace}}/build
@@ -39,7 +39,7 @@ jobs:
           ./appimagetool-x86_64.AppImage appimage/
 
       - name: Publish Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: AppImage
           path: INSTEAD-x86_64.AppImage

.github/workflows/emscripten.yml

@@ -5,18 +5,18 @@ on:
   workflow_dispatch:
 
 env:
-    emsdk_ver: 3.1.19
+    emsdk_ver: 3.1.49
 
 jobs:
   build:
     name: Emscripten version
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@main
 
       - name: Cache emsdk
         id: cache-emsdk
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: emsdk
           key: ${{ runner.os }}-${{ env.emsdk_ver }}
@@ -51,7 +51,7 @@ jobs:
           cp env/instead-em-js/*.svg ../release/instead-em
 
       - name: Publish Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: instead-em
           path: release

.github/workflows/windows.yml

@@ -10,7 +10,7 @@ jobs:
     name: Windows version
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@main
 
       - name: Install Packages
         run: |
@@ -31,7 +31,7 @@ jobs:
         run: make install -f Makefile.mingw
 
       - name: Publish Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: instead-win
           path: bin

CMakeLists.txt

@@ -8,7 +8,7 @@ IF("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
 ENDIF("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
 
 # global constants
-SET(INSTEAD_VERSION "3.5.1")
+SET(INSTEAD_VERSION "3.5.2")
 
 # options
 OPTION(WITH_GTK2 "Use GTK2 file open dialog" OFF)

ChangeLog

@@ -1,11 +1,24 @@
+3.5.2
+
+ * enh: redesigned installer for Windows;
+ * enh: gamepad triggers simulate mouse wheel up/down;
+ * fix: theme.reset();
+ * fix: documentation.
+
+ -- Peter Kosyh <[email protected]>  Sun, 1 Sep 2024 12:00:00 +0300
+
 3.5.1
 
  * enh: gamepads support;
  * fix: anigif logic;
  * fix: sprite alpha artefacts;
- * fix: cleanups in instead library and docs.
+ * fix: cleanups in instead library and docs;
+ * fix: Windows XP build;
+ * fix: -software parameter in Windows;
+ * fix: dbg keyboard input fix;
+ * fix: segfault in pixels (line).
 
- -- Peter Kosyh <[email protected]>  Mon, 27 Mar 2023 21:48:00 +0300
+ -- Peter Kosyh <[email protected]>  Fri, 1 Sep 2023 12:00:00 +0300
 
 3.5.0
 

INSTALL

@@ -1,4 +1,4 @@
-INSTEAD 3.5.1
+INSTEAD 3.5.2
 =============
 
 WARNING! For successfull building you must install these development packages

Makefile

@@ -34,7 +34,8 @@ PKGBUILD: PKGBUILD.in tarball
 	cat PKGBUILD.in | sed -e s/MD5SUM/`md5sum $(ARCHIVE) | cut -f1 -d' '`/g > PKGBUILD
 
 windows-sdl2.tar.gz:
-	wget "http://sourceforge.net/projects/instead/files/instead/build-bin-data/windows-sdl2-2.0.24.tar.gz/download" -O $(@)
+	wget "http://sourceforge.net/projects/instead/files/instead/build-bin-data/windows-sdl2-2.0.24.2.tar.gz/download" -O $(@)
+	# wget "http://sourceforge.net/projects/instead/files/instead/build-bin-data/windows-sdl2-2.0.24.tar.gz/download" -O $(@)
 	# wget "http://sourceforge.net/projects/instead/files/instead/build-bin-data/windows-sdl2-2.0.22.tar.gz/download" -O $(@)
 	# wget "http://sourceforge.net/projects/instead/files/instead/build-bin-data/windows-sdl2-2.0.14.tar.gz/download" -O $(@)
 

Makefile.mingw

@@ -24,6 +24,7 @@ docs:
 
 install: all
 	cp src/sdl-instead.exe bin
+	cp COPYING bin
 	$(MAKE) DESTDIR=../bin/ -C themes install
 	$(MAKE) DESTDIR=../bin/ -C games install
 	$(MAKE) DESTDIR=../bin/ -C stead install

PKGBUILD.in

@@ -1,7 +1,7 @@
 # Contributor: Peter Kosyh <p.kosyhgmail.com>
 
 pkgname=instead
-pkgver=3.5.1
+pkgver=3.5.2
 pkgrel=1
 pkgdesc="instead quest interpreter"
 arch=('i686' 'x86_64')