commit 18977aa7

sago007 · 2018-10-07 12:16
18977aa7773a5a50b582e23b7f843b7a5299ede1 patch · browse files
parent f6d8a69932df51b3ca188de8969b35626ed83ba2
parent 255d1b71074b5ccb61f47b55a6bef9b5e7ade613

Merge branch 'master' of github.com:blockattack/blockattack-game

Changed files

diff --git a/CMakeLists.txt b/CMakeLists.txt index 1278b65..ad8213c 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.3.0-SNAPSHOT")

+SET(CPACK_PACKAGE_VERSION "2.4.0-SNAPSHOT")

SET(CPACK_PACKAGE_VERSION_MAJOR "2")

-SET(CPACK_PACKAGE_VERSION_MINOR "3")

+SET(CPACK_PACKAGE_VERSION_MINOR "4")

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 58b32e4..ac0f4d6 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" "May 2018" "blockattack 2.3.0-SNAPSHOT" "Games"

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

+.TH BLOCKATTACK "6" "July 2018" "blockattack 2.4.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.3.0\-SNAPSHOT

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

.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 bd305d5..1813bb5 100644 --- a/source/code/version.h +++ b/source/code/version.h

@@ -22,5 +22,5 @@ http://www.blockattack.net

#ifndef VERSION_NUMBER

-#define VERSION_NUMBER "2.3.0-SNAPSHOT"

+#define VERSION_NUMBER "2.4.0-SNAPSHOT"

#endif

diff --git a/source/misc/docker/Dockerfile.Fedora25build b/source/misc/docker/Dockerfile.Fedora25build index 8a49174..d30e436 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.3.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.4.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 7d8a278..92ccaa9 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.3.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.4.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 9662401..36f2046 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.3.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.4.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 708687c..1fcda23 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.3.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.4.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 cbf9604..23936b1 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.3.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.4.0-SNAPSHOT

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/source/misc/docker/Dockerfile.WindoesBuild b/source/misc/docker/Dockerfile.WindoesBuild index 4e41670..c020de6 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.3.0-SNAPSHOT

+ENV BLOCKATTACK_VERSION 2.4.0-SNAPSHOT

RUN cd /staging/blockattack-game && \

./packdata.sh && \

diff --git a/windows installer/install_script.nsi b/windows installer/install_script.nsi index 1f477b3..98360c6 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.3.0-SNAPSHOT"

+!define PRODUCT_VERSION "2.4.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.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.WindoesBuild before
M	windows installer/install_script.nsi before