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

- changing version to v3.10.0-dev for new development

This commit is contained in:
SoftCoder 2014-01-27 11:21:22 -08:00
parent d56069488f
commit 338f156a95
7 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/glest_game

@ -1 +1 @@
Subproject commit 8e0dc1b0a3f856da10fb66e3b703e79f86a78b18
Subproject commit 3611cad67a63234d89b69bcda19be447e4f456ee

6
mk/linux/mg-version.sh
View File

@ -4,9 +4,9 @@
# Written by Mark Vejvoda <mark_vejvoda@hotmail.com>
# Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+
OLD_MG_VERSION=3.9.0
OLD_MG_VERSION_BINARY=3.9.0
MG_VERSION=3.9.1
OLD_MG_VERSION=3.9.1
OLD_MG_VERSION_BINARY=3.9.1
MG_VERSION=3.10.0-dev
if [ "$1" = "--oldversion" ]; then
echo "$OLD_MG_VERSION"

2
mk/linux/mojosetup/megaglest-installer/scripts/config.lua
View File

@ -1,5 +1,5 @@
local GAME_INSTALL_SIZE = 730000000;
local GAME_VERSION = "3.9.1";
local GAME_VERSION = "3.10.0-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.9.0
!define APVER 3.9.1
!define APVER_OLD 3.9.1
!define APVER 3.10.0-dev
Name "${APNAME} ${APVER}"
SetCompressor /FINAL /SOLID lzma

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

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

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

@ -27,7 +27,7 @@ using namespace Shared::Platform;
namespace Glest { namespace Game {
const char *mailString = " http://bugs.megaglest.org";
const string glestVersionString = "v3.9.3-dev";
const string glestVersionString = "v3.10.0-dev";
#if defined(GITVERSION)
const string GIT_RawRev = string(GITVERSION);
const string GIT_Rev = string("Rev: ") + string(GITVERSION);

4
source/glest_game/types/upgrade_type.cpp
View File

@ -851,9 +851,7 @@ void TotalUpgrade::sum(const UpgradeTypeBase *ut, const Unit *unit) {
if(ut->getMaxEpIsMultiplier() == true) {
maxEp += ((double)unit->getEp() * ((double)ut->getMaxEp() / (double)100));
// TODO: SoftCoder - Fix the bug below on next major release
// if(ut->getMaxEpRegeneration() != 0) {
if(ut->getMaxHpRegeneration() != 0) {
if(ut->getMaxEpRegeneration() != 0) {
maxEpRegeneration += ((double)unit->getType()->getEpRegeneration() + ((double)max(maxEp,unit->getEp()) * ((double)ut->getMaxEpRegeneration() / (double)100)));
}
}