git repos / blockattack-game

commit 5764c94a

branches: v2.4.X

sago007 · 2019-03-10 12:50
5764c94a42a3187c32c5b429b7bdb32e1c0d4452 patch · browse files
parent 8cb016a549367c923749ee6b106e9d477f270e2d 

Prepared for version 2.4.0

Changed files

M CMakeLists.txt before
A ReleaseNotes-2.4.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.WindoesBuild before
M windows installer/install_script.nsi before
diff --git a/CMakeLists.txt b/CMakeLists.txt index 48ae458..12c0d2b 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.4.0-SNAPSHOT")
+SET(CPACK_PACKAGE_VERSION "2.4.0")
SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "4")
SET(CPACK_PACKAGE_VERSION_PATCH "0")
diff --git a/ReleaseNotes-2.4.0.txt b/ReleaseNotes-2.4.0.txt new file mode 100644 index 0000000..b0faca6 --- /dev/null +++ b/ReleaseNotes-2.4.0.txt
@@ -0,0 +1,14 @@
+This is Block Attack - Rise of the Blocks - version 2.4.0
+Changes since 2.3.0:
+Different starting speeds for Endless
+Minor code cleanup
+Improved "About" page with technical information
+Also dumps the about page info to "about.txt" when viewed
+Default player 1 name is now fetched from the OS
+
+Windows specific:
+Improved unicode support (--homepath can now be used with Unicode chars)
+Windows 7 is now required
+Build against SDL 2.0.9 fixing some scaling problems and improving gamepad support
+
+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 ac0f4d6..79a6bd4 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.3.
-.TH BLOCKATTACK "6" "July 2018" "blockattack 2.4.0-SNAPSHOT" "Games"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
+.TH BLOCKATTACK "6" "March 2019" "blockattack 2.4.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.4.0\-SNAPSHOT
+Block Attack \- Rise of the blocks 2.4.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 c070d10..6da3d6b 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.4.0-SNAPSHOT"
+#define VERSION_NUMBER "2.4.0"
#endif
diff --git a/source/misc/docker/Dockerfile.Fedora25build b/source/misc/docker/Dockerfile.Fedora25build index d30e436..f5bf6fc 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.4.0-SNAPSHOT
+ENV BLOCKATTACK_VERSION 2.4.0
RUN cd /staging/blockattack-game && \
./packdata.sh && \
diff --git a/source/misc/docker/Dockerfile.Fedora29build b/source/misc/docker/Dockerfile.Fedora29build index 7404187..53f54b7 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.4.0-SNAPSHOT
+ENV BLOCKATTACK_VERSION 2.4.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 92ccaa9..abf2f6d 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.4.0-SNAPSHOT
+ENV BLOCKATTACK_VERSION 2.4.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 36f2046..67b7d6f 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.4.0-SNAPSHOT
+ENV BLOCKATTACK_VERSION 2.4.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 1fcda23..1d7f8d1 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.4.0-SNAPSHOT
+ENV BLOCKATTACK_VERSION 2.4.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 23936b1..1e749d6 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.4.0-SNAPSHOT
+ENV BLOCKATTACK_VERSION 2.4.0
RUN cd /staging/blockattack-game && \
./packdata.sh && \
diff --git a/source/misc/docker/Dockerfile.WindoesBuild b/source/misc/docker/Dockerfile.WindoesBuild index c020de6..e5afb0d 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.4.0-SNAPSHOT
+ENV BLOCKATTACK_VERSION 2.4.0
RUN cd /staging/blockattack-game && \
./packdata.sh && \
diff --git a/windows installer/install_script.nsi b/windows installer/install_script.nsi index 98360c6..8303aa6 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.4.0-SNAPSHOT"
+!define PRODUCT_VERSION "2.4.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"