diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a93842..edcdaad 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.2.0-SNAPSHOT") +SET(CPACK_PACKAGE_VERSION "2.2.0") SET(CPACK_PACKAGE_VERSION_MAJOR "2") SET(CPACK_PACKAGE_VERSION_MINOR "2") SET(CPACK_PACKAGE_VERSION_PATCH "0") diff --git a/ReleaseNotes-2.2.0.txt b/ReleaseNotes-2.2.0.txt new file mode 100644 index 0000000..574ff81 --- /dev/null +++ b/ReleaseNotes-2.2.0.txt @@ -0,0 +1,19 @@ +This is Block Attack - Rise of the Blocks - version 2.2.0 + +The primary change in this version is the font handling but I have also added a few help pages. + +While an updated font handling may at first glance not seem so interesting the effect is actually quite bug. Most importantly the scaling is now a lot better. This is important as computer screens has gotten smaller and smaller in the past years. Another change is that the game now runs out of the box on Windows machines with high resolution displays. + +Changes since 2.1.2: +* New font system +* Better scaling +* Works out of the box on Windows with high resolution displays +* New help menu with rule explanations + +Known issues: +* Some string like "winner", "loser" and "draw" are not translatable. +* Keyboard key names are not translatable either +* A few screens like the "name" screen does not have gamepad support +* Only gamepads connected on startup can be used + +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 b20d8e2..ecd2b70 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.2.0-SNAPSHOT" "Games" +.TH BLOCKATTACK "6" "May 2018" "blockattack 2.2.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.2.0\-SNAPSHOT +Block Attack \- Rise of the blocks 2.2.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 4af3c64..fcad5dc 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.2.0-SNAPSHOT" +#define VERSION_NUMBER "2.2.0" #endif diff --git a/source/misc/docker/Dockerfile.Fedora25build b/source/misc/docker/Dockerfile.Fedora25build index b411203..795ec37 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.2.0-SNAPSHOT +ENV BLOCKATTACK_VERSION 2.2.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 3675f2d..a5a9bd5 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.2.0-SNAPSHOT +ENV BLOCKATTACK_VERSION 2.2.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 8c88789..cc9ae9e 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.2.0-SNAPSHOT +ENV BLOCKATTACK_VERSION 2.2.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 ba37a20..440a6f1 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.2.0-SNAPSHOT +ENV BLOCKATTACK_VERSION 2.2.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 7277016..e1c2a7e 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.2.0-SNAPSHOT +ENV BLOCKATTACK_VERSION 2.2.0 RUN cd /staging/blockattack-game && \ ./packdata.sh && \ diff --git a/source/misc/docker/Dockerfile.WindoesBuild b/source/misc/docker/Dockerfile.WindoesBuild index 64d43b0..ed914f4 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.2.0-SNAPSHOT +ENV BLOCKATTACK_VERSION 2.2.0 RUN cd /staging/blockattack-game && \ ./packdata.sh && \ diff --git a/source/misc/standalone/build_standalone.sh b/source/misc/standalone/build_standalone.sh index e5411d3..eaa8935 100755 --- a/source/misc/standalone/build_standalone.sh +++ b/source/misc/standalone/build_standalone.sh @@ -47,7 +47,7 @@ ssh blockattack_build rm -rf /staging/blockattack-game scp -r . blockattack_build:/staging/blockattack-game ssh blockattack_build rm -f /staging/blockattack-game/CMakeCache.txt -ssh blockattack_build "BLOCKATTACK_VERSION=2.2.0-SNAPSHOT && cd /staging/blockattack-game && \ +ssh blockattack_build "BLOCKATTACK_VERSION=2.2.0 && cd /staging/blockattack-game && \ ./packdata.sh && \ cp source/misc/travis_help/utf8_v2_3_4/source/utf8.h source/code/ && \ cp source/misc/travis_help/utf8_v2_3_4/source/utf8.h source/code/sago/ && \ diff --git a/windows installer/install_script.nsi b/windows installer/install_script.nsi index 8822b1f..08708cd 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.2.0-SNAPSHOT" +!define PRODUCT_VERSION "2.2.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"