From 307125e84e06b16364c9342ce7bc343778091714 Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Fri, 10 Jul 2020 17:29:03 -0400 Subject: [PATCH 1/4] Update version number --- CMakeLists.txt | 2 +- appveyor.yml | 2 +- src/doomdef.h | 6 +++--- src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 34cc12f3c5..e12b0d3453 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0) # DO NOT CHANGE THIS SRB2 STRING! Some variable names depend on this string. # Version change is fine. project(SRB2 - VERSION 2.2.5 + VERSION 2.2.6 LANGUAGES C) if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR}) diff --git a/appveyor.yml b/appveyor.yml index 2a8183b200..820c77e8b0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 2.2.5.{branch}-{build} +version: 2.2.6.{branch}-{build} os: MinGW environment: diff --git a/src/doomdef.h b/src/doomdef.h index a994d5990a..2e35f1e06a 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -144,8 +144,8 @@ extern char logfilename[1024]; #else #define VERSION 202 // Game version #define SUBVERSION 5 // more precise version number -#define VERSIONSTRING "v2.2.5" -#define VERSIONSTRINGW L"v2.2.5" +#define VERSIONSTRING "v2.2.6" +#define VERSIONSTRINGW L"v2.2.6" // Hey! If you change this, add 1 to the MODVERSION below! // Otherwise we can't force updates! #endif @@ -213,7 +213,7 @@ extern char logfilename[1024]; // it's only for detection of the version the player is using so the MS can alert them of an update. // Only set it higher, not lower, obviously. // Note that we use this to help keep internal testing in check; this is why v2.2.0 is not version "1". -#define MODVERSION 45 +#define MODVERSION 46 // To version config.cfg, MAJOREXECVERSION is set equal to MODVERSION automatically. // Increment MINOREXECVERSION whenever a config change is needed that does not correspond diff --git a/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj b/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj index a7d9022f1b..eeae1c2de7 100644 --- a/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj +++ b/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj @@ -1215,7 +1215,7 @@ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CURRENT_PROJECT_VERSION = 2.2.5; + CURRENT_PROJECT_VERSION = 2.2.6; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", NORMALSRB2, @@ -1227,7 +1227,7 @@ C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CURRENT_PROJECT_VERSION = 2.2.5; + CURRENT_PROJECT_VERSION = 2.2.6; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( From dcd56a7fe3346937a5fd37c9897df4efd6ebc1b1 Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Fri, 10 Jul 2020 18:13:01 -0400 Subject: [PATCH 2/4] Update patch.pk3 hash and Srb2win.rc --- src/config.h.in | 3 ++- src/win32/Srb2win.rc | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/config.h.in b/src/config.h.in index def5d67ce3..ef7ad7a09b 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -31,12 +31,13 @@ * Last updated 2020 / 05 / 10 - v2.2.3 - player.dta & patch.pk3 * Last updated 2020 / 05 / 11 - v2.2.4 - patch.pk3 * Last updated 2020 / 07 / 07 - v2.2.5 - player.dta & patch.pk3 + * Last updated 2020 / 07 / 10 - v2.2.6 - patch.pk3 */ #define ASSET_HASH_SRB2_PK3 "0277c9416756627004e83cbb5b2e3e28" #define ASSET_HASH_ZONES_PK3 "f7e88afb6af7996a834c7d663144bead" #define ASSET_HASH_PLAYER_DTA "3a48810db46c7790bd373d7e05af5221" #ifdef USE_PATCH_DTA -#define ASSET_HASH_PATCH_PK3 "57af2ba105dc4eb1e5b8e39e6aafaa4d" +#define ASSET_HASH_PATCH_PK3 "50f78724b5e1b6129c22c069e1229703" #endif #endif diff --git a/src/win32/Srb2win.rc b/src/win32/Srb2win.rc index c6ec8dff32..b90947a9ec 100644 --- a/src/win32/Srb2win.rc +++ b/src/win32/Srb2win.rc @@ -66,8 +66,8 @@ END #include "../doomdef.h" // Needed for version string VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,2,5,0 - PRODUCTVERSION 2,2,5,0 + FILEVERSION 2,2,6,0 + PRODUCTVERSION 2,2,6,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L From 759f9171a21b33a31222810a67a48d95c90b61db Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Fri, 10 Jul 2020 19:09:49 -0400 Subject: [PATCH 3/4] Update patch.pk3 hash again --- src/config.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.h.in b/src/config.h.in index ef7ad7a09b..ca17a0f349 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -37,7 +37,7 @@ #define ASSET_HASH_ZONES_PK3 "f7e88afb6af7996a834c7d663144bead" #define ASSET_HASH_PLAYER_DTA "3a48810db46c7790bd373d7e05af5221" #ifdef USE_PATCH_DTA -#define ASSET_HASH_PATCH_PK3 "50f78724b5e1b6129c22c069e1229703" +#define ASSET_HASH_PATCH_PK3 "ecf00060f03c76b3e49c6ae3925b627f" #endif #endif From db6fc75b4fb9a26819e3063866152de23423abbc Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Fri, 10 Jul 2020 20:53:42 -0400 Subject: [PATCH 4/4] Update player.dta hash --- src/config.h.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config.h.in b/src/config.h.in index ca17a0f349..595bea7b38 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -31,11 +31,11 @@ * Last updated 2020 / 05 / 10 - v2.2.3 - player.dta & patch.pk3 * Last updated 2020 / 05 / 11 - v2.2.4 - patch.pk3 * Last updated 2020 / 07 / 07 - v2.2.5 - player.dta & patch.pk3 - * Last updated 2020 / 07 / 10 - v2.2.6 - patch.pk3 + * Last updated 2020 / 07 / 10 - v2.2.6 - player.dta & patch.pk3 */ #define ASSET_HASH_SRB2_PK3 "0277c9416756627004e83cbb5b2e3e28" #define ASSET_HASH_ZONES_PK3 "f7e88afb6af7996a834c7d663144bead" -#define ASSET_HASH_PLAYER_DTA "3a48810db46c7790bd373d7e05af5221" +#define ASSET_HASH_PLAYER_DTA "49dad7b24634c89728cc3e0b689e12bb" #ifdef USE_PATCH_DTA #define ASSET_HASH_PATCH_PK3 "ecf00060f03c76b3e49c6ae3925b627f" #endif