# HG changeset patch # User Wuzzy # Date 1544744843 -3600 # Node ID d4bd2b455247356333e0b63620e60e3529f0eca3 # Parent 05de066ab21253420df66c6de1a567378139b5e1 Append -dev to version string if built in non-release mode diff -r 05de066ab212 -r d4bd2b455247 CMakeLists.txt --- a/CMakeLists.txt Fri Dec 14 00:37:13 2018 +0100 +++ b/CMakeLists.txt Fri Dec 14 00:47:23 2018 +0100 @@ -86,7 +86,11 @@ set(CPACK_PACKAGE_VERSION_MINOR 9) set(CPACK_PACKAGE_VERSION_PATCH 25) set(HEDGEWARS_PROTO_VER 58) -set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") +if((CMAKE_BUILD_TYPE MATCHES "RELEASE") OR (CMAKE_BUILD_TYPE MATCHES "RELWITHDEBUGINFO")) + set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") +else() + set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-dev") +endif() include(${CMAKE_MODULE_PATH}/revinfo.cmake) message(STATUS "Building ${HEDGEWARS_VERSION}-r${HEDGEWARS_REVISION} (${HEDGEWARS_HASH})") diff -r 05de066ab212 -r d4bd2b455247 ChangeLog.txt --- a/ChangeLog.txt Fri Dec 14 00:37:13 2018 +0100 +++ b/ChangeLog.txt Fri Dec 14 00:47:23 2018 +0100 @@ -1,6 +1,6 @@ + features * bugfixes -=============== 1.0.0 (unreleased) ================= +============== 1.0.0-dev (unreleased) ============== + New chat command: “/help room” (shows room chat commands within the game) + Colorize switching arrows, pointing arrow and target cross in clan color + Longer delays between turns so its easier to see damage and messages