From ded902678cbf69e70ad48b52f2a82d50d509e242 Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Mon, 6 Jul 2020 21:22:57 -0400 Subject: [PATCH 1/6] Update md5 hash for player.dta and patch.pk3 --- src/config.h.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/config.h.in b/src/config.h.in index 3b2579965..ad3123d79 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -30,12 +30,13 @@ * Last updated 2020 / 02 / 22 - v2.2.2 - patch.pk3 * 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 / 06 - v2.2.5 - player.dta & patch.pk3 */ #define ASSET_HASH_SRB2_PK3 "0277c9416756627004e83cbb5b2e3e28" #define ASSET_HASH_ZONES_PK3 "f7e88afb6af7996a834c7d663144bead" -#define ASSET_HASH_PLAYER_DTA "8a4507ddf9bc0682c09174400f26ad65" +#define ASSET_HASH_PLAYER_DTA "3a48810db46c7790bd373d7e05af5221" #ifdef USE_PATCH_DTA -#define ASSET_HASH_PATCH_PK3 "bbbf6af3b20349612ee06e0b55979a76" +#define ASSET_HASH_PATCH_PK3 "f69f3808637edfb8118537b99ac320c4" #endif #endif From 7d75c72263cca65a9871ce75654fbcb87dfa10b7 Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Mon, 6 Jul 2020 21:29:02 -0400 Subject: [PATCH 2/6] Update the version number --- CMakeLists.txt | 2 +- appveyor.yml | 2 +- src/doomdef.h | 8 ++++---- src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e46f5dc3..34cc12f3c 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.4 + VERSION 2.2.5 LANGUAGES C) if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR}) diff --git a/appveyor.yml b/appveyor.yml index 5d599a516..4a389dca7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 2.2.4.{branch}-{build} +version: 2.2.5.{branch}-{build} os: MinGW environment: diff --git a/src/doomdef.h b/src/doomdef.h index 1f90a6f7f..9c601fbd6 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -143,9 +143,9 @@ extern char logfilename[1024]; // we use comprevision and compbranch instead. #else #define VERSION 202 // Game version -#define SUBVERSION 4 // more precise version number -#define VERSIONSTRING "v2.2.4" -#define VERSIONSTRINGW L"v2.2.4" +#define SUBVERSION 5 // more precise version number +#define VERSIONSTRING "v2.2.5" +#define VERSIONSTRINGW L"v2.2.5" // 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 44 +#define MODVERSION 45 // 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 745513eeb..1a8094745 100644 --- a/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj +++ b/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj @@ -1219,7 +1219,7 @@ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CURRENT_PROJECT_VERSION = 2.2.4; + CURRENT_PROJECT_VERSION = 2.2.5; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", NORMALSRB2, @@ -1231,7 +1231,7 @@ C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CURRENT_PROJECT_VERSION = 2.2.4; + CURRENT_PROJECT_VERSION = 2.2.5; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( From d31c6ac5b51507bfd3a75e20aca404e3ec8c4a33 Mon Sep 17 00:00:00 2001 From: James R Date: Mon, 6 Jul 2020 19:15:40 -0700 Subject: [PATCH 3/6] Contact the master server admims --- src/doomdef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doomdef.h b/src/doomdef.h index 9c601fbd6..a994d5990 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -204,7 +204,7 @@ extern char logfilename[1024]; // Will always resemble the versionstring, 205 = 2.0.5, 210 = 2.1, etc. #define CODEBASE 220 -// The Modification ID; must be obtained from Rob ( https://mb.srb2.org/private.php?do=newpm&u=546 ). +// The Modification ID; must be obtained from a Master Server Admin ( https://mb.srb2.org/showgroups.php ). // DO NOT try to set this otherwise, or your modification will be unplayable through the Master Server. // "18" is the default mod ID for version 2.2 #define MODID 18 From 706b3c509d516a3886195b1d9c1426c2c514cdf7 Mon Sep 17 00:00:00 2001 From: lachwright Date: Tue, 7 Jul 2020 20:42:00 +0800 Subject: [PATCH 4/6] Make A_FlickyCenter usable in SOC/Lua --- src/dehacked.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dehacked.c b/src/dehacked.c index 258cc1f46..99d4883f6 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -3082,6 +3082,7 @@ static actionpointer_t actionpointers[] = {{A_NapalmScatter}, "A_NAPALMSCATTER"}, {{A_SpawnFreshCopy}, "A_SPAWNFRESHCOPY"}, {{A_FlickySpawn}, "A_FLICKYSPAWN"}, + {{A_FlickyCenter}, "A_FLICKYCENTER"}, {{A_FlickyAim}, "A_FLICKYAIM"}, {{A_FlickyFly}, "A_FLICKYFLY"}, {{A_FlickySoar}, "A_FLICKYSOAR"}, From 129fd2e27b074f03aaf8daa664b765d88440da00 Mon Sep 17 00:00:00 2001 From: lachwright Date: Wed, 8 Jul 2020 00:42:31 +0800 Subject: [PATCH 5/6] Update patch.pk3 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 ad3123d79..def5d67ce 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -30,13 +30,13 @@ * Last updated 2020 / 02 / 22 - v2.2.2 - patch.pk3 * 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 / 06 - v2.2.5 - player.dta & patch.pk3 + * Last updated 2020 / 07 / 07 - v2.2.5 - player.dta & 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 "f69f3808637edfb8118537b99ac320c4" +#define ASSET_HASH_PATCH_PK3 "57af2ba105dc4eb1e5b8e39e6aafaa4d" #endif #endif From 994bf78fe2419d39c14c8c5716d168f60dc8682a Mon Sep 17 00:00:00 2001 From: lachwright Date: Wed, 8 Jul 2020 00:48:01 +0800 Subject: [PATCH 6/6] Update Srb2win.rc --- src/win32/Srb2win.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/win32/Srb2win.rc b/src/win32/Srb2win.rc index d7e3383b0..c6ec8dff3 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,0,0 - PRODUCTVERSION 2,2,0,0 + FILEVERSION 2,2,5,0 + PRODUCTVERSION 2,2,5,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L