From b50efbb75e69bf83e2cb0d3db4a973a8ff7bd99c Mon Sep 17 00:00:00 2001 From: filux Date: Mon, 9 Mar 2015 01:05:24 +0100 Subject: [PATCH] updated version number for development --- data/glest_game | 2 +- mk/linux/mojosetup/megaglest-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 e92df160a..9fa1c0ea9 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit e92df160ae6b5495d2590be1e8b4a9efaf91b995 +Subproject commit 9fa1c0ea978c19c22e45db00643c0b5683430cc7 diff --git a/mk/linux/mojosetup/megaglest-installer/scripts/config.lua b/mk/linux/mojosetup/megaglest-installer/scripts/config.lua index 218933b49..04319face 100644 --- a/mk/linux/mojosetup/megaglest-installer/scripts/config.lua +++ b/mk/linux/mojosetup/megaglest-installer/scripts/config.lua @@ -1,5 +1,5 @@ local GAME_INSTALL_SIZE = 680000000; -local GAME_VERSION = "3.11.1"; +local GAME_VERSION = "3.12-dev"; local _ = MojoSetup.translate diff --git a/mk/windoze/Installer/MegaGlestInstaller.nsi b/mk/windoze/Installer/MegaGlestInstaller.nsi index 20a8a5147..b3cacf681 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.11.0 -!define APVER 3.11.1 +!define APVER_OLD 3.11.1 +!define APVER 3.12-dev Name "${APNAME} ${APVER}" SetCompressor /FINAL /SOLID lzma diff --git a/mk/windoze/Installer/MegaGlestUpdater.nsi b/mk/windoze/Installer/MegaGlestUpdater.nsi index 7f10a2deb..d002afb7c 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.11.1 +!define APVER 3.12-dev !define APNAME_OLD Mega-Glest -!define APVER_OLD 3.11.0 -!define APVER_UPDATE 3.11.1 +!define APVER_OLD 3.11.1 +!define APVER_UPDATE 3.12-dev Name "${APNAME} ${APVER_UPDATE}" SetCompressor /FINAL /SOLID lzma diff --git a/source/g3d_viewer/main.cpp b/source/g3d_viewer/main.cpp index f655a9305..624fca2c9 100644 --- a/source/g3d_viewer/main.cpp +++ b/source/g3d_viewer/main.cpp @@ -58,7 +58,7 @@ const char *folderDelimiter = "/"; //int GameConstants::updateFps= 40; //int GameConstants::cameraFps= 100; -const string g3dviewerVersionString= "v3.11.1"; +const string g3dviewerVersionString= "v3.12-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 e83b0a7bf..bde3d1077 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.11-beta1.0 v3.12-dev v3.12.0 // don't forget to update mk/linux/mg-version.sh -const string glestVersionString = "v3.11.1"; +const string glestVersionString = "v3.12-dev"; const string lastCompatibleSaveGameVersionString = "v3.9.0"; #if defined(GITVERSION) @@ -43,7 +43,7 @@ const string lastCompatibleSaveGameVersionString = "v3.9.0"; const string GIT_RawRev = string(GITVERSION); const string GIT_Rev = string("Rev: ") + string(GITVERSION); #else -const string GIT_RawRev = "$5088.9d98d2e$"; +const string GIT_RawRev = "$5091.787074b$"; const string GIT_Rev = "$Rev$"; #endif diff --git a/source/glest_map_editor/main.cpp b/source/glest_map_editor/main.cpp index ec014ae21..d4ae98b66 100644 --- a/source/glest_map_editor/main.cpp +++ b/source/glest_map_editor/main.cpp @@ -46,7 +46,7 @@ string getGameReadWritePath(string lookupKey) { namespace MapEditor { -const string mapeditorVersionString = "v3.11.1"; +const string mapeditorVersionString = "v3.12-dev"; const string MainWindow::winHeader = "MegaGlest Map Editor " + mapeditorVersionString; // =============================================== diff --git a/source/version.txt b/source/version.txt index 26b456f9a..e7c4b6880 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.11.1"; +CurrentGameVersion = "3.12-dev"; # ^ typical version numbers look like this: "3.11-beta1.0", "3.12-dev", "3.12.0" -OldReleaseGameVersion = "3.11.0"; +OldReleaseGameVersion = "3.11.1"; LastCompatibleSaveGameVersion = "3.9.0"; -GitCommitForRelease = "5088.9d98d2e"; +GitCommitForRelease = "5091.787074b"; # ^ will be automatically generated