From c81dea00294a3b50bc99b0ab9e6f11ae6adb953f Mon Sep 17 00:00:00 2001 From: filux Date: Wed, 8 Mar 2017 21:44:28 +0100 Subject: [PATCH] version number for the development --- data/glest_game | 2 +- .../installer/scripts/config.lua | 2 +- mk/windoze/Installer/MegaGlestInstaller.nsi | 4 ++-- mk/windoze/Installer/MegaGlestUpdater.nsi | 6 +++--- source/g3d_viewer/main.cpp | 2 +- source/glest_game/facilities/game_util.cpp | 4 ++-- source/glest_map_editor/main.cpp | 2 +- source/version.txt | 6 +++--- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/data/glest_game b/data/glest_game index 2bafae40..32a8f459 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit 2bafae40da1a8c358920970bff46b08b0e8daf90 +Subproject commit 32a8f459f095185bb503a876433ebefac77fd24e diff --git a/mk/linux/tools-for-standalone-client/installer/scripts/config.lua b/mk/linux/tools-for-standalone-client/installer/scripts/config.lua index 8cc7088e..b29298e5 100644 --- a/mk/linux/tools-for-standalone-client/installer/scripts/config.lua +++ b/mk/linux/tools-for-standalone-client/installer/scripts/config.lua @@ -1,5 +1,5 @@ local GAME_INSTALL_SIZE = 705000000; -local GAME_VERSION = "3.13.0"; +local GAME_VERSION = "3.13-dev"; local _ = MojoSetup.translate diff --git a/mk/windoze/Installer/MegaGlestInstaller.nsi b/mk/windoze/Installer/MegaGlestInstaller.nsi index e7530f88..9b9b78d7 100644 --- a/mk/windoze/Installer/MegaGlestInstaller.nsi +++ b/mk/windoze/Installer/MegaGlestInstaller.nsi @@ -3,8 +3,8 @@ !define APNAME MegaGlest !define APNAME_OLD Mega-Glest -!define APVER_OLD 3.12.0 -!define APVER 3.13.0 +!define APVER_OLD 3.13.0 +!define APVER 3.13-dev !ifdef NSIS_WIN32_MAKENSIS !define NSISCONF_3 ";" ; NSIS 2 tries to parse some preprocessor instructions inside "!if 0" blocks! diff --git a/mk/windoze/Installer/MegaGlestUpdater.nsi b/mk/windoze/Installer/MegaGlestUpdater.nsi index d65a848a..c35a41f3 100644 --- a/mk/windoze/Installer/MegaGlestUpdater.nsi +++ b/mk/windoze/Installer/MegaGlestUpdater.nsi @@ -2,10 +2,10 @@ ; General Attributes !define APNAME MegaGlest -!define APVER 3.13.0 +!define APVER 3.13-dev !define APNAME_OLD Mega-Glest -!define APVER_OLD 3.12.0 -!define APVER_UPDATE 3.13.0 +!define APVER_OLD 3.13.0 +!define APVER_UPDATE 3.13-dev Name "${APNAME} ${APVER_UPDATE}" SetCompressor /FINAL /SOLID lzma diff --git a/source/g3d_viewer/main.cpp b/source/g3d_viewer/main.cpp index 68d3af88..e4c747ba 100644 --- a/source/g3d_viewer/main.cpp +++ b/source/g3d_viewer/main.cpp @@ -56,7 +56,7 @@ const char *folderDelimiter = "/"; //int GameConstants::updateFps= 40; //int GameConstants::cameraFps= 100; -const string g3dviewerVersionString= "v3.13.0"; +const string g3dviewerVersionString= "v3.13-dev"; // Because g3d should always support alpha transparency string fileFormat = "png"; diff --git a/source/glest_game/facilities/game_util.cpp b/source/glest_game/facilities/game_util.cpp index 75eb27d6..8cb3d71f 100644 --- a/source/glest_game/facilities/game_util.cpp +++ b/source/glest_game/facilities/game_util.cpp @@ -32,7 +32,7 @@ const char *mailString = " http://bugs.megaglest.org"; // !! Use minor versions !! Only major and minor version control compatibility! // typical version numbers look like this: v3.13-beta1.0 v3.12-dev v3.12.1 // don't forget to update file: source/version.txt -const string glestVersionString = "v3.13.0"; +const string glestVersionString = "v3.13-dev"; const string lastCompatibleSaveGameVersionString = "v3.11.1"; #if defined(GITVERSIONHEADER) @@ -41,7 +41,7 @@ const string lastCompatibleSaveGameVersionString = "v3.11.1"; #if defined(GITVERSION) || defined(GITVERSIONHEADER) const string GIT_RawRev = string(GITVERSION); #else - const string GIT_RawRev = "$5604.3a5d459$"; + const string GIT_RawRev = "$5608.a3c8464$"; #endif const string GIT_Rev = string("Rev: ") + string(GIT_RawRev); diff --git a/source/glest_map_editor/main.cpp b/source/glest_map_editor/main.cpp index ed1cdbd9..b90decdb 100644 --- a/source/glest_map_editor/main.cpp +++ b/source/glest_map_editor/main.cpp @@ -47,7 +47,7 @@ string getGameReadWritePath(string lookupKey) { namespace MapEditor { -const string mapeditorVersionString = "v3.13.0"; +const string mapeditorVersionString = "v3.13-dev"; const string MainWindow::winHeader = "MegaGlest Map Editor " + mapeditorVersionString; // =============================================== diff --git a/source/version.txt b/source/version.txt index 6f565dd3..bf4ca99a 100644 --- a/source/version.txt +++ b/source/version.txt @@ -3,11 +3,11 @@ # Versions will be updated everywhere automatically. # Then you should commit changed files and that's all. -CurrentGameVersion = "3.13.0"; +CurrentGameVersion = "3.13-dev"; # ^ typical version numbers look like this: "3.14-beta1.0", "3.13-dev", "3.13.1" -OldReleaseGameVersion = "3.12.0"; +OldReleaseGameVersion = "3.13.0"; LastCompatibleSaveGameVersion = "3.11.1"; -GitCommitForRelease = "5604.3a5d459"; +GitCommitForRelease = "5608.a3c8464"; # ^ will be automatically generated