git repos / blockattack-game

commit 030a39c4

branches: v2.3.X

sago007 · 2018-07-01 14:51
030a39c4a48e831edd74ede8251d8a0c916386e2 patch · browse files
parent 7b16a3a8c16da7adf90ecc98efa096b70299094a

Prepare 2.3.0

Changed files

M CMakeLists.txt before
A ReleaseNotes-2.3.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.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
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1278b65..23eacc8 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.3.0-SNAPSHOT")
+SET(CPACK_PACKAGE_VERSION "2.3.0")
SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "3")
SET(CPACK_PACKAGE_VERSION_PATCH "0")
diff --git a/ReleaseNotes-2.3.0.txt b/ReleaseNotes-2.3.0.txt new file mode 100644 index 0000000..dfaecce --- /dev/null +++ b/ReleaseNotes-2.3.0.txt
@@ -0,0 +1,10 @@
+This is Block Attack - Rise of the Blocks - version 2.3.0
+
+Changes since 2.2.0:
+Several keyboard keys are now translatable
+Window size is now restored on next startup
+The back-button on the gamepad now goes back in menus
+Gamepad L2 and R2 can now be used to push lines
+Game Over, Winner and Draw are now translatable
+
+Feedback can be given on https://blockattack.net or https://github.com/blockattack/blockattack-game
diff --git a/man/blockattack.man b/man/blockattack.man index 58b32e4..12805fb 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"
+.TH BLOCKATTACK "6" "July 2018" "blockattack 2.3.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.3.0\-SNAPSHOT
+Block Attack \- Rise of the blocks 2.3.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 bd305d5..763617c 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.3.0"
#endif
diff --git a/source/misc/docker/Dockerfile.Fedora25build b/source/misc/docker/Dockerfile.Fedora25build index 8a49174..ff22120 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.3.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 7d8a278..b877919 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.3.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 9662401..6a81a78 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.3.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 708687c..b1cd3e1 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.3.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 cbf9604..f649cf6 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.3.0
RUN cd /staging/blockattack-game && \
./packdata.sh && \
diff --git a/source/misc/docker/Dockerfile.WindoesBuild b/source/misc/docker/Dockerfile.WindoesBuild index 4e41670..681d0fe 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.3.0
RUN cd /staging/blockattack-game && \
./packdata.sh && \
diff --git a/windows installer/install_script.nsi b/windows installer/install_script.nsi index 1f477b3..2798f42 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.3.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"