commit a8ef4e0d

branches: v2.6.X

Poul Sander · 2020-09-26 11:21
a8ef4e0d79cf2d6c10d7a5caeda127866f12f752 patch · browse files
parent 50c81b4b4699fbe0325116a066be2570aca345e1

Prepared for version 2.6.0 release

Changed files

diff --git a/CMakeLists.txt b/CMakeLists.txt index efabda6..86c4dc2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt

@@ -3,7 +3,7 @@ project (blockattack)

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${blockattack_SOURCE_DIR}/source/misc/cmake")

set(BIN_DIR ${blockattack_SOURCE_DIR}/Game)

-SET(CPACK_PACKAGE_VERSION "2.6.0-SNAPSHOT")

+SET(CPACK_PACKAGE_VERSION "2.6.0")

SET(CPACK_PACKAGE_VERSION_MAJOR "2")

SET(CPACK_PACKAGE_VERSION_MINOR "6")

SET(CPACK_PACKAGE_VERSION_PATCH "0")

diff --git a/ReleaseNotes-2.6.0.txt b/ReleaseNotes-2.6.0.txt new file mode 100644 index 0000000..23375ef --- /dev/null +++ b/ReleaseNotes-2.6.0.txt

@@ -0,0 +1,16 @@

+This is Block Attack - Rise of the Blocks - version 2.6.0

+The main focus of this release is improved controller support.

+Changes since 2.5.0:

+Modified the controller keybind. "B" is now Cancel instead of "Y"

+There is a virtual keyboard on the enter name screen allowing using a mouse or a gamepad to type.

+Added patch by bmwiedemann for sorting in the data file

+Update embedded Cerial from 1.2.2 to 1.3.0

+Update library versions for the compiled Linux version:

+ * SDL2: 2.0.9 to 2.0.12

+ * SDL2_image: 2.0.4 to 2.0.5

+ * SDL2_ttf: 2.0.14 to 2.0.15

+ * physfs: 2.0.3 to 3.0.2

diff --git a/man/blockattack.man b/man/blockattack.man index 9947ce5..5546f79 100644 --- a/man/blockattack.man +++ b/man/blockattack.man

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

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

-.TH BLOCKATTACK "6" "June 2019" "blockattack 2.6.0-SNAPSHOT" "Games"

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

+.TH BLOCKATTACK "6" "September 2020" "blockattack 2.6.0" "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.6.0\-SNAPSHOT

+Block Attack \- Rise of the blocks 2.6.0

.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 c86a035..248ed95 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.6.0-SNAPSHOT"

+#define VERSION_NUMBER "2.6.0"

#endif

diff --git a/source/misc/docker/Dockerfile.Fedora25build b/source/misc/docker/Dockerfile.Fedora25build index d5dce78..ea65d76 100644 --- a/source/misc/docker/Dockerfile.Fedora25build +++ b/source/misc/docker/Dockerfile.Fedora25build

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

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.6.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.6.0

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Fedora29build b/source/misc/docker/Dockerfile.Fedora29build index fe6ce4b..b875646 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.6.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.6.0

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Ubuntu12.04build_Standalone b/source/misc/docker/Dockerfile.Ubuntu12.04build_Standalone index 1e57d8a..50ed8df 100644 --- a/source/misc/docker/Dockerfile.Ubuntu12.04build_Standalone +++ b/source/misc/docker/Dockerfile.Ubuntu12.04build_Standalone

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

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.6.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.6.0

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Ubuntu14.04build b/source/misc/docker/Dockerfile.Ubuntu14.04build index 2b0590d..b60c8c6 100644 --- a/source/misc/docker/Dockerfile.Ubuntu14.04build +++ b/source/misc/docker/Dockerfile.Ubuntu14.04build

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

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.6.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.6.0

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone b/source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone index 3c47a05..416bd62 100644 --- a/source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone +++ b/source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone

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

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.6.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.6.0

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone32 b/source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone32 index 742534f..ee4cc7d 100644 --- a/source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone32 +++ b/source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone32

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

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.6.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.6.0

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Ubuntu16.04build b/source/misc/docker/Dockerfile.Ubuntu16.04build index 841519a..19183f6 100644 --- a/source/misc/docker/Dockerfile.Ubuntu16.04build +++ b/source/misc/docker/Dockerfile.Ubuntu16.04build

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

COPY . /staging/blockattack-game

-ENV BLOCKATTACK_VERSION 2.6.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.6.0

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.WindoesBuild b/source/misc/docker/Dockerfile.WindoesBuild index 1a26301..090435c 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.6.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.6.0

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/windows installer/install_script.nsi b/windows installer/install_script.nsi index c70e493..22aecb1 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.6.0-SNAPSHOT"

+!define PRODUCT_VERSION "2.6.0"

!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	CMakeLists.txt before
A	ReleaseNotes-2.6.0.txt
M	man/blockattack.man before
M	source/code/version.h before
M	source/misc/docker/Dockerfile.Fedora25build before
M	source/misc/docker/Dockerfile.Fedora29build before
M	source/misc/docker/Dockerfile.Ubuntu12.04build_Standalone before
M	source/misc/docker/Dockerfile.Ubuntu14.04build before
M	source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone before
M	source/misc/docker/Dockerfile.Ubuntu14.04build_Standalone32 before
M	source/misc/docker/Dockerfile.Ubuntu16.04build before
M	source/misc/docker/Dockerfile.WindoesBuild before
M	windows installer/install_script.nsi before