commit 4ed4998a

Poul Sander · 2019-06-19 18:05
4ed4998a32307903dba353cc7eec385a8e302bf3 patch · browse files
parent 1d0b40ccdc527c195ae551512f981a1db033181b

Prepare for new development iteration

Changed files

diff --git a/CMakeLists.txt b/CMakeLists.txt index 150021e..324e178 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt

@@ -3,9 +3,9 @@ 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.5.0-SNAPSHOT")

+SET(CPACK_PACKAGE_VERSION "2.6.0-SNAPSHOT")

SET(CPACK_PACKAGE_VERSION_MAJOR "2")

-SET(CPACK_PACKAGE_VERSION_MINOR "5")

+SET(CPACK_PACKAGE_VERSION_MINOR "6")

SET(CPACK_PACKAGE_VERSION_PATCH "0")

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

SET(CPACK_PACKAGE_VENDOR "Poul Sander")

diff --git a/man/blockattack.man b/man/blockattack.man index 2bd43ee..9947ce5 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" "March 2019" "blockattack 2.5.0-SNAPSHOT" "Games"

+.TH BLOCKATTACK "6" "June 2019" "blockattack 2.6.0-SNAPSHOT" "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.5.0\-SNAPSHOT

+Block Attack \- Rise of the blocks 2.6.0\-SNAPSHOT

.PP

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

.PP

@@ -43,6 +43,9 @@ Prints the search path and quits

\fB\-\-no\-auto\-scale\fR

Do not automatically auto scale

.TP

+\fB\-\-always\-sixteen\-nine\fR

+Use 16:9 format even in Window mode

+.TP

\fB\-\-puzzle\-level\-file\fR arg

Sets the default puzzle file to load

.TP

diff --git a/source/code/version.h b/source/code/version.h index bb413c0..c86a035 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.5.0-SNAPSHOT"

+#define VERSION_NUMBER "2.6.0-SNAPSHOT"

#endif

diff --git a/source/misc/docker/Dockerfile.Fedora25build b/source/misc/docker/Dockerfile.Fedora25build index 2e44129..d5dce78 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.5.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.6.0-SNAPSHOT

RUN cd /staging/blockattack-game && \

./packdata.sh && \

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

+ENV BLOCKATTACK_VERSION 2.6.0-SNAPSHOT

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 1138fe3..1e57d8a 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.5.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.6.0-SNAPSHOT

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Ubuntu14.04build b/source/misc/docker/Dockerfile.Ubuntu14.04build index cb2f630..2b0590d 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.5.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.6.0-SNAPSHOT

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 4da2c54..3c47a05 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.5.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.6.0-SNAPSHOT

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 88677e9..742534f 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.5.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.6.0-SNAPSHOT

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.Ubuntu16.04build b/source/misc/docker/Dockerfile.Ubuntu16.04build index 7f4f119..841519a 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.5.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.6.0-SNAPSHOT

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.WindoesBuild b/source/misc/docker/Dockerfile.WindoesBuild index 41e9547..948688d 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.5.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.6.0-SNAPSHOT

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/windows installer/install_script.nsi b/windows installer/install_script.nsi index 5953ab3..c70e493 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.5.0-SNAPSHOT"

+!define PRODUCT_VERSION "2.6.0-SNAPSHOT"

!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
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