commit 0fba9758

branches: v2.9.X

Poul Sander · 2025-02-09 13:45
0fba975828a1e00338f971a6dd67fb8b0f7ba21a patch · browse files
parent 8c5fa105ec94ede21d9b041ae51dd012ba67fd5a

Prepared 2.9.1 release

Changed files

diff --git a/CHANGELOG.md b/CHANGELOG.md index 072db2c..21ae2d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md

@@ -8,6 +8,11 @@

### Removed

+## [2.9.1] - 2025-02-09

+### Changed

+ - Left and right on gamepad d-pad now works again. Broken in 2.6.0.

## [2.9.0] - 2024-05-09

### Added

diff --git a/CMakeLists.txt b/CMakeLists.txt index 0927a63..2b67fad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt

@@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 3.5.1...3.27.4)

project (blockattack)

set(BIN_DIR ${blockattack_SOURCE_DIR}/Game)

-SET(CPACK_PACKAGE_VERSION "2.9.0")

+SET(CPACK_PACKAGE_VERSION "2.9.1")

SET(CPACK_PACKAGE_VERSION_MAJOR "2")

SET(CPACK_PACKAGE_VERSION_MINOR "9")

-SET(CPACK_PACKAGE_VERSION_PATCH "0")

+SET(CPACK_PACKAGE_VERSION_PATCH "1")

SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Block Attack - Rise of the Blocks ${CPACK_PACKAGE_VERSION}")

SET(CPACK_PACKAGE_VENDOR "Poul Sander")

INCLUDE(CPack)

diff --git a/man/blockattack.man b/man/blockattack.man index 0b4e682..811c90b 100644 --- a/man/blockattack.man +++ b/man/blockattack.man

@@ -1,12 +1,12 @@

-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.

-.TH BLOCKATTACK "6" "May 2024" "blockattack 2.9.0" "Games"

+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.

+.TH BLOCKATTACK "6" "February 2025" "blockattack 2.9.1" "Games"

.SH NAME

blockattack \- a puzzle game inspired by Tetris Attack

.SH SYNOPSIS

.B blockattack

[\fI\,OPTION\/\fR]...

.SH DESCRIPTION

-Block Attack \- Rise of the blocks 2.9.0

+Block Attack \- Rise of the blocks 2.9.1

.PP

Block Attack \- Rise of the Blocks is a puzzle/blockfall game inspired by Tetris Attack for the SNES.

.PP

diff --git a/source/code/version.h b/source/code/version.h index 63832d6..a300273 100644 --- a/source/code/version.h +++ b/source/code/version.h

@@ -30,5 +30,5 @@ https://blockattack.net

#define GAMENAME "blockattack"

#ifndef VERSION_NUMBER

-#define VERSION_NUMBER "2.9.0"

+#define VERSION_NUMBER "2.9.1"

#endif

diff --git a/source/misc/docker/Dockerfile.Fedora29build b/source/misc/docker/Dockerfile.Fedora29build index 9bbbaf5..b8dbd3f 100644 --- a/source/misc/docker/Dockerfile.Fedora29build +++ b/source/misc/docker/Dockerfile.Fedora29build

@@ -15,7 +15,7 @@ zip \

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.9.0

+ENV BLOCKATTACK_VERSION 2.9.1

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Ubuntu18.04build b/source/misc/docker/Dockerfile.Ubuntu18.04build index 2540d37..857da4a 100644 --- a/source/misc/docker/Dockerfile.Ubuntu18.04build +++ b/source/misc/docker/Dockerfile.Ubuntu18.04build

@@ -6,7 +6,7 @@ RUN mkdir -p /staging/blockattack-game

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.9.0

+ENV BLOCKATTACK_VERSION 2.9.1

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Ubuntu18.04build_Standalone b/source/misc/docker/Dockerfile.Ubuntu18.04build_Standalone index f35659c..2c97e47 100644 --- a/source/misc/docker/Dockerfile.Ubuntu18.04build_Standalone +++ b/source/misc/docker/Dockerfile.Ubuntu18.04build_Standalone

@@ -10,7 +10,7 @@ RUN /compile_requirements.sh

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.9.0

+ENV BLOCKATTACK_VERSION 2.9.1

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Ubuntu20.04build b/source/misc/docker/Dockerfile.Ubuntu20.04build index 212bf51..13969c7 100644 --- a/source/misc/docker/Dockerfile.Ubuntu20.04build +++ b/source/misc/docker/Dockerfile.Ubuntu20.04build

@@ -11,7 +11,7 @@ RUN mkdir -p /staging/blockattack-game

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.9.0

+ENV BLOCKATTACK_VERSION 2.9.1

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Ubuntu22.04build b/source/misc/docker/Dockerfile.Ubuntu22.04build index e14ee50..636f970 100644 --- a/source/misc/docker/Dockerfile.Ubuntu22.04build +++ b/source/misc/docker/Dockerfile.Ubuntu22.04build

@@ -11,7 +11,7 @@ RUN mkdir -p /staging/blockattack-game

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.9.0

+ENV BLOCKATTACK_VERSION 2.9.1

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.WindoesBuild b/source/misc/docker/Dockerfile.WindoesBuild index 674ab9c..5f82c9d 100644 --- a/source/misc/docker/Dockerfile.WindoesBuild +++ b/source/misc/docker/Dockerfile.WindoesBuild

@@ -8,7 +8,7 @@ RUN mkdir -p /output

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.9.0

+ENV BLOCKATTACK_VERSION 2.9.1

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/windows installer/install_script.nsi b/windows installer/install_script.nsi index c9f0c39..8ccbce7 100644 --- a/windows installer/install_script.nsi +++ b/windows installer/install_script.nsi

@@ -2,7 +2,7 @@

; HM NIS Edit Wizard helper defines

!define PRODUCT_NAME "Block Attack - Rise Of the Blocks"

-!define PRODUCT_VERSION "2.9.0"

+!define PRODUCT_VERSION "2.9.1"

!define PRODUCT_PUBLISHER "Poul Sander"

!define PRODUCT_WEB_SITE "http://www.blockattack.net"

!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\blockattack.exe"

M	CHANGELOG.md before
M	CMakeLists.txt before
M	man/blockattack.man before
M	source/code/version.h before
M	source/misc/docker/Dockerfile.Fedora29build before
M	source/misc/docker/Dockerfile.Ubuntu18.04build before
M	source/misc/docker/Dockerfile.Ubuntu18.04build_Standalone before
M	source/misc/docker/Dockerfile.Ubuntu20.04build before
M	source/misc/docker/Dockerfile.Ubuntu22.04build before
M	source/misc/docker/Dockerfile.WindoesBuild before
M	windows installer/install_script.nsi before