Merge branch 'update-228' into 'next'

2.2.8 prep

See merge request STJr/SRB2!1170
This commit is contained in:
James R 2020-10-03 01:45:06 -04:00
commit 17ce7d57c3
4 changed files with 7 additions and 6 deletions

View file

@ -1,4 +1,4 @@
version: 2.2.6.{branch}-{build}
version: 2.2.8.{branch}-{build}
os: MinGW
environment:

View file

@ -33,12 +33,13 @@
* Last updated 2020 / 07 / 07 - v2.2.5 - player.dta & patch.pk3
* Last updated 2020 / 07 / 10 - v2.2.6 - player.dta & patch.pk3
* Last updated 2020 / 09 / 27 - v2.2.7 - patch.pk3
* Last updated 2020 / 10 / 02 - v2.2.8 - patch.pk3
*/
#define ASSET_HASH_SRB2_PK3 "0277c9416756627004e83cbb5b2e3e28"
#define ASSET_HASH_ZONES_PK3 "f7e88afb6af7996a834c7d663144bead"
#define ASSET_HASH_PLAYER_DTA "49dad7b24634c89728cc3e0b689e12bb"
#ifdef USE_PATCH_DTA
#define ASSET_HASH_PATCH_PK3 "6b200f3f49af5478935b104eb972a898"
#define ASSET_HASH_PATCH_PK3 "466cdf60075262b3f5baa5e07f0999e8"
#endif
#endif

View file

@ -1,4 +1,4 @@
#define SRB2VERSION "2.2.7"/* this must be the first line, for cmake !! */
#define SRB2VERSION "2.2.8"/* this must be the first line, for cmake !! */
// 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.
@ -9,7 +9,7 @@
// 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 48
#define MODVERSION 49
// Define this as a prerelease version suffix
// #define BETAVERSION "RC1"

View file

@ -66,8 +66,8 @@ END
#include "../doomdef.h" // Needed for version string
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,2,7,0
PRODUCTVERSION 2,2,7,0
FILEVERSION 2,2,8,0
PRODUCTVERSION 2,2,8,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L