Merge branch 'master' into merge-next

This commit is contained in:
TehRealSalt 2018-11-29 09:46:46 -05:00
commit 936bd43266
2 changed files with 5 additions and 5 deletions

View file

@ -52,7 +52,7 @@
#define ASSET_HASH_CHARS_KART "784ee9177b01c8cb26edff43eaf93d87" #define ASSET_HASH_CHARS_KART "784ee9177b01c8cb26edff43eaf93d87"
#define ASSET_HASH_MAPS_KART "84018d9b35d181ca9fcc2be5a9d43a45" #define ASSET_HASH_MAPS_KART "84018d9b35d181ca9fcc2be5a9d43a45"
#ifdef USE_PATCH_KART #ifdef USE_PATCH_KART
#define ASSET_HASH_PATCH_KART "bb055c2cbbe1547f44606d394df1e068" #define ASSET_HASH_PATCH_KART "20e5dbae7609787d135f0e52850e6545"
#endif #endif
#endif #endif

View file

@ -150,9 +150,9 @@ extern FILE *logstream;
// we use comprevision and compbranch instead. // we use comprevision and compbranch instead.
#else #else
#define VERSION 100 // Game version #define VERSION 100 // Game version
#define SUBVERSION 1 // more precise version number #define SUBVERSION 2 // more precise version number
#define VERSIONSTRING "v1.0.1" #define VERSIONSTRING "v1.0.2"
#define VERSIONSTRINGW L"v1.0.1" #define VERSIONSTRINGW L"v1.0.2"
// Hey! If you change this, add 1 to the MODVERSION below! // Hey! If you change this, add 1 to the MODVERSION below!
// Otherwise we can't force updates! // Otherwise we can't force updates!
#endif #endif
@ -218,7 +218,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. // 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. // 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". // Note that we use this to help keep internal testing in check; this is why v2.1.0 is not version "1".
#define MODVERSION 1 #define MODVERSION 2
// ========================================================================= // =========================================================================