Merge branch 'next'

This commit is contained in:
Sally Cochenour 2019-02-05 22:02:08 -05:00
commit 3d84c7c6c5
13 changed files with 8688 additions and 8689 deletions

View file

@ -37,7 +37,7 @@
* Last updated 2015 / 05 / 03 - SRB2 v2.1.15 - srb2.srb
* Last updated 2018 / 12 / 23 - SRB2 v2.1.22 - patch.dta
* Last updated 2019 / 01 / 18 - Kart v1.0.2 - Main assets
* Last updated 2019 / 01 / 15 - Kart v1.0.2 - patch.kart
* Last updated 2019 / 02 / 04 - Kart v1.0.3 - patch.kart
*/
// Base SRB2 hashes
@ -52,7 +52,7 @@
#define ASSET_HASH_CHARS_KART "e2c428347dde52858a3dacd29fc5b964"
#define ASSET_HASH_MAPS_KART "1335cd064656aedca359cfbb5233ac4a"
#ifdef USE_PATCH_KART
#define ASSET_HASH_PATCH_KART "899aee1b63e731b7e2098406c85608b4"
#define ASSET_HASH_PATCH_KART "e06c1c90e5645c886026311964f8e1f5"
#endif
#endif

View file

@ -150,9 +150,9 @@ extern FILE *logstream;
// we use comprevision and compbranch instead.
#else
#define VERSION 100 // Game version
#define SUBVERSION 2 // more precise version number
#define VERSIONSTRING "v1.0.2"
#define VERSIONSTRINGW L"v1.0.2"
#define SUBVERSION 3 // more precise version number
#define VERSIONSTRING "v1.0.3"
#define VERSIONSTRINGW L"v1.0.3"
// Hey! If you change this, add 1 to the MODVERSION below!
// Otherwise we can't force updates!
#endif
@ -221,7 +221,7 @@ extern FILE *logstream;
// 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.1.0 is not version "1".
#define MODVERSION 2
#define MODVERSION 3
// Filter consvars by version
// To version config.cfg, MAJOREXECVERSION is set equal to MODVERSION automatically.

View file

@ -9845,4 +9845,3 @@ void P_PlayerAfterThink(player_t *player)
K_KartPlayerAfterThink(player);
}