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 04319fac..fd65b836 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 = 680000000; -local GAME_VERSION = "3.12-dev"; +local GAME_VERSION = "3.12.0"; local _ = MojoSetup.translate diff --git a/mk/windoze/Installer/MegaGlestInstaller.nsi b/mk/windoze/Installer/MegaGlestInstaller.nsi index d957b909..703f475d 100644 --- a/mk/windoze/Installer/MegaGlestInstaller.nsi +++ b/mk/windoze/Installer/MegaGlestInstaller.nsi @@ -4,7 +4,7 @@ !define APNAME MegaGlest !define APNAME_OLD Mega-Glest !define APVER_OLD 3.11.1 -!define APVER 3.12-dev +!define APVER 3.12.0 !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 d002afb7..9d20f99b 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.12-dev +!define APVER 3.12.0 !define APNAME_OLD Mega-Glest !define APVER_OLD 3.11.1 -!define APVER_UPDATE 3.12-dev +!define APVER_UPDATE 3.12.0 Name "${APNAME} ${APVER_UPDATE}" SetCompressor /FINAL /SOLID lzma diff --git a/source/g3d_viewer/main.cpp b/source/g3d_viewer/main.cpp index 0d3c9d8d..0859c53b 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.12-dev"; +const string g3dviewerVersionString= "v3.12.0"; // 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 3d8f7dd5..3dbe0ef9 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 source/version.txt -const string glestVersionString = "v3.12-dev"; +const string glestVersionString = "v3.12.0"; 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 = "$5091.787074b$"; +const string GIT_RawRev = "$5419.034576d$"; const string GIT_Rev = "$Rev$"; #endif diff --git a/source/glest_map_editor/main.cpp b/source/glest_map_editor/main.cpp index cd59c1f7..3c3f6048 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.12-dev"; +const string mapeditorVersionString = "v3.12.0"; const string MainWindow::winHeader = "MegaGlest Map Editor " + mapeditorVersionString; // =============================================== diff --git a/source/version.txt b/source/version.txt index e7c4b688..ab436eb0 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.12-dev"; +CurrentGameVersion = "3.12.0"; # ^ typical version numbers look like this: "3.11-beta1.0", "3.12-dev", "3.12.0" OldReleaseGameVersion = "3.11.1"; LastCompatibleSaveGameVersion = "3.9.0"; -GitCommitForRelease = "5091.787074b"; +GitCommitForRelease = "5419.034576d"; # ^ will be automatically generated