diff --git a/CMakeLists.txt b/CMakeLists.txt index 07e391f..fde8f42 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.5.1...3.18.4) project (blockattack) set(BIN_DIR ${blockattack_SOURCE_DIR}/Game) -SET(CPACK_PACKAGE_VERSION "2.7.0-SNAPSHOT") +SET(CPACK_PACKAGE_VERSION "2.8.0-SNAPSHOT") SET(CPACK_PACKAGE_VERSION_MAJOR "2") -SET(CPACK_PACKAGE_VERSION_MINOR "7") +SET(CPACK_PACKAGE_VERSION_MINOR "8") 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 365b21c..406910d 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.13. -.TH BLOCKATTACK "6" "September 2020" "blockattack 2.7.0-SNAPSHOT" "Games" +.TH BLOCKATTACK "6" "October 2021" "blockattack 2.8.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.7.0\-SNAPSHOT +Block Attack \- Rise of the blocks 2.8.0\-SNAPSHOT .PP Block Attack \- Rise of the Blocks is a puzzle/blockfall game inspired by Tetris Attack for the SNES. .PP @@ -57,6 +57,9 @@ Overwrites the bind text domain used for finding translations. Default: "/usr/lo .TP \fB\-\-homepath\fR arg Set the home folder where settings are saved. The directory will be created if it does not exist. Default: "$HOME/.local/share/blockattack" +.TP +\fB\-m\fR [ \fB\-\-mod\fR ] arg +Loads a mod. Later mods have preference .SH EXAMPLES .TP blockattack diff --git a/source/code/version.h b/source/code/version.h index b16f5ed..d058320 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.7.0-SNAPSHOT" +#define VERSION_NUMBER "2.8.0-SNAPSHOT" #endif diff --git a/source/misc/docker/Dockerfile.Fedora25build b/source/misc/docker/Dockerfile.Fedora25build index 9b228f2..1215fe3 100644 --- a/source/misc/docker/Dockerfile.Fedora25build +++ b/source/misc/docker/Dockerfile.Fedora25build @@ -14,7 +14,7 @@ zip \ COPY . /staging/blockattack-game -ENV BLOCKATTACK_VERSION 2.7.0-SNAPSHOT +ENV BLOCKATTACK_VERSION 2.8.0-SNAPSHOT RUN cd /staging/blockattack-game && \ ./packdata.sh && \ diff --git a/source/misc/docker/Dockerfile.Fedora29build b/source/misc/docker/Dockerfile.Fedora29build index 2b6e4df..624eb81 100644 --- a/source/misc/docker/Dockerfile.Fedora29build +++ b/source/misc/docker/Dockerfile.Fedora29build @@ -14,7 +14,7 @@ zip \ COPY . /staging/blockattack-game -ENV BLOCKATTACK_VERSION 2.7.0-SNAPSHOT +ENV BLOCKATTACK_VERSION 2.8.0-SNAPSHOT RUN cd /staging/blockattack-game && \ ./packdata.sh && \ diff --git a/source/misc/docker/Dockerfile.Ubuntu16.04build_Standalone b/source/misc/docker/Dockerfile.Ubuntu16.04build_Standalone index 4ab2533..63da5fe 100644 --- a/source/misc/docker/Dockerfile.Ubuntu16.04build_Standalone +++ b/source/misc/docker/Dockerfile.Ubuntu16.04build_Standalone @@ -15,7 +15,7 @@ RUN /compile_requirements.sh COPY . /staging/blockattack-game -ENV BLOCKATTACK_VERSION 2.7.0-SNAPSHOT +ENV BLOCKATTACK_VERSION 2.8.0-SNAPSHOT RUN cd /staging/blockattack-game && \ ./packdata.sh && \ diff --git a/source/misc/docker/Dockerfile.Ubuntu18.04build b/source/misc/docker/Dockerfile.Ubuntu18.04build index 22238f3..9a3416b 100644 --- a/source/misc/docker/Dockerfile.Ubuntu18.04build +++ b/source/misc/docker/Dockerfile.Ubuntu18.04build @@ -6,7 +6,7 @@ RUN mkdir -p /staging/blockattack-game COPY . /staging/blockattack-game -ENV BLOCKATTACK_VERSION 2.7.0-SNAPSHOT +ENV BLOCKATTACK_VERSION 2.8.0-SNAPSHOT RUN cd /staging/blockattack-game && \ ./packdata.sh && \ diff --git a/source/misc/docker/Dockerfile.Ubuntu20.04build b/source/misc/docker/Dockerfile.Ubuntu20.04build index f0c8dcf..93a1b73 100644 --- a/source/misc/docker/Dockerfile.Ubuntu20.04build +++ b/source/misc/docker/Dockerfile.Ubuntu20.04build @@ -11,7 +11,7 @@ RUN mkdir -p /staging/blockattack-game COPY . /staging/blockattack-game -ENV BLOCKATTACK_VERSION 2.7.0-SNAPSHOT +ENV BLOCKATTACK_VERSION 2.8.0-SNAPSHOT RUN cd /staging/blockattack-game && \ ./packdata.sh && \ diff --git a/source/misc/docker/Dockerfile.WindoesBuild b/source/misc/docker/Dockerfile.WindoesBuild index 7673b13..80eea4e 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.7.0-SNAPSHOT +ENV BLOCKATTACK_VERSION 2.8.0-SNAPSHOT RUN cd /staging/blockattack-game && \ ./packdata.sh && \ diff --git a/windows installer/install_script.nsi b/windows installer/install_script.nsi index 7eef3bc..40501a8 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.7.0-SNAPSHOT" +!define PRODUCT_VERSION "2.8.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"