Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

version number returns to 'dev'

This commit is contained in:
filux 2016-01-24 15:46:49 +01:00
parent 18cad36255
commit 570a49164e
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mk/linux/tools-for-standalone-client/installer/scripts/config.lua
View File

@ -1,5 +1,5 @@
local GAME_INSTALL_SIZE = 680000000;
local GAME_VERSION = "3.12.0";
local GAME_VERSION = "3.12-dev";
local _ = MojoSetup.translate

4
mk/windoze/Installer/MegaGlestInstaller.nsi
View File

@ -3,8 +3,8 @@
!define APNAME MegaGlest
!define APNAME_OLD Mega-Glest
!define APVER_OLD 3.11.1
!define APVER 3.12.0
!define APVER_OLD 3.12.0
!define APVER 3.12-dev
!ifdef NSIS_WIN32_MAKENSIS
!define NSISCONF_3 ";" ; NSIS 2 tries to parse some preprocessor instructions inside "!if 0" blocks!

6
mk/windoze/Installer/MegaGlestUpdater.nsi
View File

@ -2,10 +2,10 @@
; General Attributes
!define APNAME MegaGlest
!define APVER 3.12.0
!define APVER 3.12-dev
!define APNAME_OLD Mega-Glest
!define APVER_OLD 3.11.1
!define APVER_UPDATE 3.12.0
!define APVER_OLD 3.12.0
!define APVER_UPDATE 3.12-dev
Name "${APNAME} ${APVER_UPDATE}"
SetCompressor /FINAL /SOLID lzma

2
source/g3d_viewer/main.cpp
View File

@ -56,7 +56,7 @@ const char *folderDelimiter = "/";
//int GameConstants::updateFps= 40;
//int GameConstants::cameraFps= 100;
const string g3dviewerVersionString= "v3.12.0";
const string g3dviewerVersionString= "v3.12-dev";
// Because g3d should always support alpha transparency
string fileFormat = "png";

6
source/glest_game/facilities/game_util.cpp
View File

@ -32,8 +32,8 @@ 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.0";
const string lastCompatibleSaveGameVersionString = "v3.9.0";
const string glestVersionString = "v3.12-dev";
const string lastCompatibleSaveGameVersionString = "v3.11.1";
#if defined(GITVERSION)
const string GIT_RawRev = string(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 = "$5419.034576d$";
const string GIT_RawRev = "$5421.18cad36$";
const string GIT_Rev = "$Rev$";
#endif

2
source/glest_map_editor/main.cpp
View File

@ -47,7 +47,7 @@ string getGameReadWritePath(string lookupKey) {
namespace MapEditor {
const string mapeditorVersionString = "v3.12.0";
const string mapeditorVersionString = "v3.12-dev";
const string MainWindow::winHeader = "MegaGlest Map Editor " + mapeditorVersionString;
// ===============================================

10
source/version.txt
View File

@ -3,11 +3,11 @@
# Versions will be updated everywhere automatically.
# Then you should commit changed files and that's all.
CurrentGameVersion = "3.12.0";
# ^ typical version numbers look like this: "3.11-beta1.0", "3.12-dev", "3.12.0"
CurrentGameVersion = "3.12-dev";
# ^ typical version numbers look like this: "3.13-beta1.0", "3.12-dev", "3.12.1"
OldReleaseGameVersion = "3.11.1";
LastCompatibleSaveGameVersion = "3.9.0";
OldReleaseGameVersion = "3.12.0";
LastCompatibleSaveGameVersion = "3.11.1";
GitCommitForRelease = "5419.034576d";
GitCommitForRelease = "5421.18cad36";
# ^ will be automatically generated