diff --git a/CMakeLists.txt b/CMakeLists.txt index 22e2091..7a0e114 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.5.1...4.1.0) project (blockattack) set(BIN_DIR ${blockattack_SOURCE_DIR}/Game) -SET(CPACK_PACKAGE_VERSION "2.10.0-SNAPSHOT") +SET(CPACK_PACKAGE_VERSION "2.11.0-SNAPSHOT") SET(CPACK_PACKAGE_VERSION_MAJOR "2") -SET(CPACK_PACKAGE_VERSION_MINOR "10") +SET(CPACK_PACKAGE_VERSION_MINOR "11") 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 2a03ee9..00426be 100644 --- a/man/blockattack.man +++ b/man/blockattack.man @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH BLOCKATTACK "6" "May 2024" "blockattack 2.10.0-SNAPSHOT" "Games" +.TH BLOCKATTACK "6" "October 2025" "blockattack 2.11.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.10.0\-SNAPSHOT +Block Attack \- Rise of the blocks 2.11.0\-SNAPSHOT .PP Block Attack \- Rise of the Blocks is a puzzle/blockfall game inspired by Tetris Attack for the SNES. .PP @@ -46,6 +46,12 @@ Do not automatically auto scale \fB\-\-always\-sixteen\-nine\fR Use 16:9 format even in Window mode .TP +\fB\-\-editor\fR +Start the sprite editor/browser +.TP +\fB\-\-puzzle\-editor\fR +Start the build in puzzle editor +.TP \fB\-\-puzzle\-level\-file\fR arg Sets the default puzzle file to load .TP diff --git a/source/code/version.h b/source/code/version.h index 33b018b..4006fad 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.10.0-SNAPSHOT" +#define VERSION_NUMBER "2.11.0-SNAPSHOT" #endif diff --git a/source/misc/docker/Dockerfile.Fedora42build b/source/misc/docker/Dockerfile.Fedora42build index 25ae487..c018ce2 100644 --- a/source/misc/docker/Dockerfile.Fedora42build +++ b/source/misc/docker/Dockerfile.Fedora42build @@ -15,7 +15,7 @@ zip \ COPY . /staging/blockattack-game -ENV BLOCKATTACK_VERSION 2.10.0-SNAPSHOT +ENV BLOCKATTACK_VERSION 2.11.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 7273e91..60e212e 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.10.0-SNAPSHOT +ENV BLOCKATTACK_VERSION 2.11.0-SNAPSHOT RUN cd /staging/blockattack-game && \ ./packdata.sh && \ diff --git a/source/misc/docker/Dockerfile.Ubuntu18.04build_Standalone b/source/misc/docker/Dockerfile.Ubuntu18.04build_Standalone index 33a5b97..255eb09 100644 --- a/source/misc/docker/Dockerfile.Ubuntu18.04build_Standalone +++ b/source/misc/docker/Dockerfile.Ubuntu18.04build_Standalone @@ -15,7 +15,7 @@ RUN /compile_requirements.sh COPY . /staging/blockattack-game -ENV BLOCKATTACK_VERSION 2.10.0-SNAPSHOT +ENV BLOCKATTACK_VERSION 2.11.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 4cedda6..afcf72e 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.10.0-SNAPSHOT +ENV BLOCKATTACK_VERSION 2.11.0-SNAPSHOT RUN cd /staging/blockattack-game && \ ./packdata.sh && \ diff --git a/source/misc/docker/Dockerfile.Ubuntu22.04build b/source/misc/docker/Dockerfile.Ubuntu22.04build index 70289d2..6a4d10f 100644 --- a/source/misc/docker/Dockerfile.Ubuntu22.04build +++ b/source/misc/docker/Dockerfile.Ubuntu22.04build @@ -11,7 +11,7 @@ RUN mkdir -p /staging/blockattack-game COPY . /staging/blockattack-game -ENV BLOCKATTACK_VERSION 2.10.0-SNAPSHOT +ENV BLOCKATTACK_VERSION 2.11.0-SNAPSHOT RUN cd /staging/blockattack-game && \ ./packdata.sh && \ diff --git a/source/misc/docker/Dockerfile.WindoesBuild b/source/misc/docker/Dockerfile.WindoesBuild index 934b872..8168ee9 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.10.0-SNAPSHOT +ENV BLOCKATTACK_VERSION 2.11.0-SNAPSHOT RUN cd /staging/blockattack-game && \ ./packdata.sh && ls -lrt source/misc/embedded_libs/fmt-11.0.2 && \ diff --git a/windows installer/install_script.nsi b/windows installer/install_script.nsi index f745b72..92ed9f7 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.10.0-SNAPSHOT" +!define PRODUCT_VERSION "2.11.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"