mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-02-24 11:42:31 +01:00
Code Issues Projects Releases Wiki Activity

Merge tag '3.12.0' into develop

Browse Source 
release 3.12.0
This commit is contained in:
filux 2016-01-24 12:35:58 +01:00
commit 18cad36255
7 changed files with 10 additions and 10 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_INSTALL_SIZE = 680000000;
local GAME_VERSION = "3.12-dev"; local GAME_VERSION = "3.12.0";
local _ = MojoSetup.translate local _ = MojoSetup.translate

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

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

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

@ -2,10 +2,10 @@
; General Attributes ; General Attributes
!define APNAME MegaGlest !define APNAME MegaGlest
!define APVER 3.12-dev !define APVER 3.12.0
!define APNAME_OLD Mega-Glest !define APNAME_OLD Mega-Glest
!define APVER_OLD 3.11.1 !define APVER_OLD 3.11.1
!define APVER_UPDATE 3.12-dev !define APVER_UPDATE 3.12.0
Name "${APNAME} ${APVER_UPDATE}" Name "${APNAME} ${APVER_UPDATE}"
SetCompressor /FINAL /SOLID lzma 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::updateFps= 40;
//int GameConstants::cameraFps= 100; //int GameConstants::cameraFps= 100;
const string g3dviewerVersionString= "v3.12-dev"; const string g3dviewerVersionString= "v3.12.0";
// Because g3d should always support alpha transparency // Because g3d should always support alpha transparency
string fileFormat = "png"; string fileFormat = "png";

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

@ -32,7 +32,7 @@ const char *mailString = " http://bugs.megaglest.org";
// !! Use minor versions !! Only major and minor version control compatibility! // !! 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 // typical version numbers look like this: v3.11-beta1.0 v3.12-dev v3.12.0
// don't forget to update source/version.txt // 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"; const string lastCompatibleSaveGameVersionString = "v3.9.0";
#if defined(GITVERSION) #if defined(GITVERSION)
@ -43,7 +43,7 @@ const string lastCompatibleSaveGameVersionString = "v3.9.0";
const string GIT_RawRev = string(GITVERSION); const string GIT_RawRev = string(GITVERSION);
const string GIT_Rev = string("Rev: ") + string(GITVERSION); const string GIT_Rev = string("Rev: ") + string(GITVERSION);
#else #else
const string GIT_RawRev = "$5091.787074b$"; const string GIT_RawRev = "$5419.034576d$";
const string GIT_Rev = "$Rev$"; const string GIT_Rev = "$Rev$";
#endif #endif

2
source/glest_map_editor/main.cpp
View File

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

4
source/version.txt
View File

@ -3,11 +3,11 @@
# Versions will be updated everywhere automatically. # Versions will be updated everywhere automatically.
# Then you should commit changed files and that's all. # 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" # ^ typical version numbers look like this: "3.11-beta1.0", "3.12-dev", "3.12.0"
OldReleaseGameVersion = "3.11.1"; OldReleaseGameVersion = "3.11.1";
LastCompatibleSaveGameVersion = "3.9.0"; LastCompatibleSaveGameVersion = "3.9.0";
GitCommitForRelease = "5091.787074b"; GitCommitForRelease = "5419.034576d";
# ^ will be automatically generated # ^ will be automatically generated