change version to 0.8.01 (#3)

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

@@ -1,13 +1,13 @@
 local GAME_INSTALL_SIZE = 705000000;
-local GAME_VERSION = "3.13-dev";
+local GAME_VERSION = "0.8.01";
 
 local _ = MojoSetup.translate
 
 Setup.Package
 {
-    vendor = "megaglest.org",
+    vendor = "github.com/ZetaGlest",
-    id = "megaglest",
+    id = "zetaglest",
-    description = _("MegaGlest v" .. GAME_VERSION),
+    description = _("ZetaGlest v" .. GAME_VERSION),
     version = GAME_VERSION,
     splash = "glestforumsheader.bmp",
     superuser = false,
@@ -21,20 +21,20 @@ Setup.Package
     },
 
     precheck = function(package)
-	-- MojoSetup.msgbox('Test#1', MojoSetup.info.homedir .. '/megaglest/uninstall-megaglest.sh')
+	-- MojoSetup.msgbox('Test#1', MojoSetup.info.homedir .. '/zetaglest/uninstall-zetaglest.sh')
 
 	local previousPath = ''
-        if MojoSetup.platform.exists(MojoSetup.info.homedir .. '/megaglest/uninstall-megaglest.sh') then
+        if MojoSetup.platform.exists(MojoSetup.info.homedir .. '/zetaglest/uninstall-zetaglest.sh') then
-		previousPath = MojoSetup.info.homedir .. '/megaglest/'
+		previousPath = MojoSetup.info.homedir .. '/zetaglest/'
-	elseif MojoSetup.platform.exists('/opt/games/megaglest/uninstall-megaglest.sh') then
+	elseif MojoSetup.platform.exists('/opt/games/zetaglest/uninstall-zetaglest.sh') then
-		previousPath = '/opt/games/megaglest/'
+		previousPath = '/opt/games/zetaglest/'
-	elseif MojoSetup.platform.exists('/usr/local/games/megaglest/uninstall-megaglest.sh') then
+	elseif MojoSetup.platform.exists('/usr/local/games/zegaglest/uninstall-zetaglest.sh') then
-		previousPath = '/usr/local/games/megaglest/'
+		previousPath = '/usr/local/games/zegaglest/'
 	end
 
 	if previousPath ~= '' then
-		if MojoSetup.promptyn(_("MegaGlest Uninstall Title"), _("MegaGlest Uninstall Prompt") .. '\n\n[' .. previousPath .. ']') then
+		if MojoSetup.promptyn(_("ZetaGlest Uninstall Title"), _("ZetaGlest Uninstall Prompt") .. '\n\n[' .. previousPath .. ']') then
-			os.execute(previousPath .. 'uninstall-megaglest.sh')
+			os.execute(previousPath .. 'uninstall-zegaglest.sh')
 		end
 
 	end
@@ -42,17 +42,17 @@ Setup.Package
 
     preinstall = function(package)
 	local previousPath = ''
-        if MojoSetup.platform.exists(MojoSetup.info.homedir .. '/megaglest/mydata/') then
+        if MojoSetup.platform.exists(MojoSetup.info.homedir .. '/zetaglest/mydata/') then
-		previousPath = MojoSetup.info.homedir .. '/megaglest/'
+		previousPath = MojoSetup.info.homedir .. '/zetaglest/'
-	elseif MojoSetup.platform.exists('/opt/games/megaglest/mydata/') then
+	elseif MojoSetup.platform.exists('/opt/games/zetaglest/mydata/') then
-		previousPath = '/opt/games/megaglest/'
+		previousPath = '/opt/games/zetaglest/'
-	elseif MojoSetup.platform.exists('/usr/local/games/megaglest/mydata/') then
+	elseif MojoSetup.platform.exists('/usr/local/games/zetaglest/mydata/') then
-		previousPath = '/usr/local/games/megaglest/'
+		previousPath = '/usr/local/games/zetaglest/'
 	end
 
 	-- Move mod data folder to new location if we find it
 	if previousPath ~= '' then
-		local instPathData =  MojoSetup.info.homedir .. '/.megaglest/'
+		local instPathData =  MojoSetup.info.homedir .. '/.zetaglest/'
 		local instPath =  instPathData
 		-- MojoSetup.msgbox('Moving mod folder','About to move mod folder from [' .. previousPath .. '] to [' .. instPath .. ']')
 
@@ -63,8 +63,8 @@ Setup.Package
     end,
 
     postinstall = function(package)
-	if MojoSetup.promptyn(_("MegaGlest Visit Website Title"), _("MegaGlest Visit Website Prompt")) then
+	if MojoSetup.promptyn(_("ZetaGlest Visit Website Title"), _("ZetaGlest Visit Website Prompt")) then
-        	MojoSetup.launchbrowser("http://megaglest.org/get-started.html")
+        	MojoSetup.launchbrowser("http://zetaglest.org/get-started.html")
 	end
     end,
 
@@ -85,19 +85,19 @@ Setup.Package
 
     Setup.Eula
     {
-        description = _("MegaGlest Game License"),
+        description = _("ZetaGlest Game License"),
         source = _("docs/gnu_gpl_3.0.txt")
     },
 
     Setup.Eula
     {
-        description = _("MegaGlest Data License"),
+        description = _("ZetaGlest Data License"),
         source = _("docs/cc-by-sa-3.0-unported.txt")
     },
 
     Setup.Readme
     {
-        description = _("MegaGlest README"),
+        description = _("ZetaGlest README"),
         source = _("docs/README.txt")
     },
 
@@ -107,7 +107,7 @@ Setup.Package
         required = true,
         disabled = false,
         bytes = GAME_INSTALL_SIZE,
-        description = _("MegaGlest v" .. GAME_VERSION),
+        description = _("ZetaGlest v" .. GAME_VERSION),
 
         Setup.File
         {
@@ -118,24 +118,24 @@ Setup.Package
         Setup.DesktopMenuItem
         {
             disabled = false,
-            name = _("MegaGlest v" .. GAME_VERSION),
+            name = _("ZetaGlest v" .. GAME_VERSION),
-            genericname = _("MegaGlest"),
+            genericname = _("ZetaGlest"),
             tooltip = _("A real time strategy game."),
             builtin_icon = false,
-            icon = "megaglest.png",
+            icon = "zetaglest.png",
-            commandline = "%0/start_megaglest",
+            commandline = "%0/start_zetaglest",
             category = "Game;StrategyGame"
         },
 
         Setup.DesktopMenuItem
         {
             disabled = false,
-            name = _("MegaGlest Map Editor v" .. GAME_VERSION),
+            name = _("ZetaGlest Map Editor v" .. GAME_VERSION),
-            genericname = _("MegaGlest"),
+            genericname = _("ZetaGlest"),
             tooltip = _("A real time strategy game."),
             builtin_icon = false,
-            icon = "megaglest.png",
+            icon = "zetaglest.png",
-            commandline = "%0/start_megaglest_mapeditor",
+            commandline = "%0/start_zetaglest_mapeditor",
             category = "Game;StrategyGame",
             --mimetype = {"application/x-gbm", "application/mgm"}
         },
@@ -143,12 +143,12 @@ Setup.Package
         Setup.DesktopMenuItem
         {
             disabled = false,
-            name = _("MegaGlest G3D Model Viewer v" .. GAME_VERSION),
+            name = _("ZetaGlest G3D Model Viewer v" .. GAME_VERSION),
-            genericname = _("MegaGlest"),
+            genericname = _("ZetaGlest"),
             tooltip = _("A real time strategy game."),
             builtin_icon = false,
-            icon = "megaglest.png",
+            icon = "zetaglest.png",
-            commandline = "%0/start_megaglest_g3dviewer",
+            commandline = "%0/start_zetaglest_g3dviewer",
             category = "Game;StrategyGame",
             --mimetype = {"application/x-g3d"}
         },
@@ -156,12 +156,12 @@ Setup.Package
         Setup.DesktopMenuItem
         {
             disabled = false,
-            name = _("MegaGlest Uninstall v" .. GAME_VERSION),
+            name = _("ZetaGlest Uninstall v" .. GAME_VERSION),
-            genericname = _("MegaGlest"),
+            genericname = _("ZetaGlest"),
             tooltip = _("A real time strategy game."),
             builtin_icon = false,
-            icon = "megaglest-uninstall.ico",
+            icon = "zetaglest-uninstall.ico",
-            commandline = "%0/uninstall-megaglest.sh",
+            commandline = "%0/uninstall-zetaglest.sh",
             category = "Game;StrategyGame"
         }
 

mk/macos/bundle_resources/Info.plist.in

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>MegaGlest</string>
 	<key>CFBundleGetInfoString</key>
-	<string>v${MEGAGLEST_VERSION}, © 2001-2017 The MegaGlest Team.</string>
+	<string>v${MEGAGLEST_VERSION}, © 2018 The ZetaGlest Team.</string>
 	<key>CFBundleIconFile</key>
 	<string>MegaGlest</string>
 	<key>CFBundleIdentifier</key>

mk/windows/Installer/MegaGlestInstaller.nsi

@@ -1,10 +1,10 @@
 ;--------------------------------
 ; General Attributes
 
-!define APNAME MegaGlest
+!define APNAME ZetaGlest
 !define APNAME_OLD Mega-Glest
 !define APVER_OLD 3.13.0
-!define APVER 3.13-dev
+!define APVER 0.8.01
 
 !ifdef NSIS_WIN32_MAKENSIS
 !define NSISCONF_3 ";" ; NSIS 2 tries to parse some preprocessor instructions inside "!if 0" blocks!

mk/windows/Installer/MegaGlestUpdater.nsi

@@ -1,11 +1,11 @@
 ;--------------------------------
 ; General Attributes
 
-!define APNAME MegaGlest
+!define APNAME ZetaGlest
-!define APVER 3.13-dev
+!define APVER 0.8.01
 !define APNAME_OLD Mega-Glest
 !define APVER_OLD 3.13.0
-!define APVER_UPDATE 3.13-dev
+!define APVER_UPDATE 0.8.01
 
 Name "${APNAME} ${APVER_UPDATE}"
 SetCompressor /FINAL /SOLID lzma

source/g3d_viewer/main.cpp

@@ -1,13 +1,24 @@
-// ==============================================================
-// This file is part of MegaGlest (www.glest.org)
 //
-// Copyright (C) 2011 - by Mark Vejvoda <mark_vejvoda@hotmail.com>
+//	g3d_viewer:main.cpp:
 //
-//	You can redistribute this code and/or modify it under
+//	This file is part of ZetaGlest <https://github.com/ZetaGlest>
-//	the terms of the GNU General Public License as published
+//
-//	by the Free Software Foundation; either version 2 of the
+//	Copyright (C) 2018  The ZetaGlest team
-//	License, or (at your option) any later version
+//
-// ==============================================================
+//	ZetaGlest is a fork of MegaGlest <https://megaglest.org>
+//
+//	This program is free software: you can redistribute it and/or modify
+//	it under the terms of the GNU General Public License as published by
+//	the Free Software Foundation, either version 3 of the License, or
+//	(at your option) any later version.
+
+//	This program is distributed in the hope that it will be useful,
+//	but WITHOUT ANY WARRANTY; without even the implied warranty of
+//	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//	GNU General Public License for more details.
+//
+//	You should have received a copy of the GNU General Public License
+//	along with this program.  If not, see <https://www.gnu.org/licenses/>
 
 #include "main.h"
 
@@ -62,7 +73,7 @@ const char *folderDelimiter = "/";
 //int GameConstants::updateFps= 40;
 //int GameConstants::cameraFps= 100;
 
-const string g3dviewerVersionString= "v3.13-dev";
+const string g3dviewerVersionString= "v0.8.01";
 
 // Because g3d should always support alpha transparency
 string fileFormat = "png";

source/glest_game/facilities/game_util.cpp

@@ -1,13 +1,24 @@
-// ==============================================================
-//	This file is part of Glest (www.glest.org)
 //
-//	Copyright (C) 2001-2008 Martiño Figueroa
+//	game_util.cpp:
 //
-//	You can redistribute this code and/or modify it under
+//	This file is part of ZetaGlest <https://github.com/ZetaGlest>
-//	the terms of the GNU General Public License as published
+//
-//	by the Free Software Foundation; either version 2 of the
+//	Copyright (C) 2018  The ZetaGlest team
-//	License, or (at your option) any later version
+//
-// ==============================================================
+//	ZetaGlest is a fork of MegaGlest <https://megaglest.org>
+//
+//	This program is free software: you can redistribute it and/or modify
+//	it under the terms of the GNU General Public License as published by
+//	the Free Software Foundation, either version 3 of the License, or
+//	(at your option) any later version.
+
+//	This program is distributed in the hope that it will be useful,
+//	but WITHOUT ANY WARRANTY; without even the implied warranty of
+//	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//	GNU General Public License for more details.
+//
+//	You should have received a copy of the GNU General Public License
+//	along with this program.  If not, see <https://www.gnu.org/licenses/>
 
 #include "game_util.h"
 
@@ -27,12 +38,12 @@ using namespace Shared::Platform;
 
 namespace Glest { namespace Game {
 
-const char *mailString				= " http://bugs.megaglest.org";
+const char *mailString				= " https://github.com/ZetaGlest";
 
 // !! Use minor versions !!  Only major and minor version control compatibility!
 // typical version numbers look like this: v3.13-beta1.0   v3.12-dev   v3.12.1
 // don't forget to update file: source/version.txt
-const string glestVersionString 	= "v3.13-dev";
+const string glestVersionString 	= "v0.8.01";
 const string lastCompatibleSaveGameVersionString 	= "v3.11.1";
 
 #if defined(GITVERSIONHEADER)
@@ -41,7 +52,7 @@ const string lastCompatibleSaveGameVersionString 	= "v3.11.1";
 #if defined(GITVERSION) || defined(GITVERSIONHEADER)
 	const string GIT_RawRev		= string(GITVERSION);
 #else
-	const string GIT_RawRev		= "$5608.a3c8464$";
+	const string GIT_RawRev		= "$5733.147264d$";
 #endif
 const string GIT_Rev 			= string("Rev: ") + string(GIT_RawRev);
 
@@ -212,16 +223,16 @@ string getAboutString1(int i) {
 	case 0: return "MegaGlest " + glestVersionString + " (" + "Shared Library " + sharedLibVersionString + ")";
 	case 1: return GIT_Rev;
 	case 2: return "Copyright 2001-2010 The Glest Team";
-	case 3: return "Copyright 2010-2017 The MegaGlest Team";
+	case 3: return "Copyright 2018 The ZetaGlest Team";
 	}
 	return "";
 }
 
 string getAboutString2(int i) {
 	switch(i) {
-	case 0: return "Web: http://megaglest.org";
+	case 0: return "Web: https://github.com/ZetaGlest";
 	case 1: return "Bug reports: " + string(mailString);
-	case 2: return "IRC: irc://irc.freenode.net/megaglest";
+	case 2: return "IRC: irc://irc.freenode.net/zegaglest-dev";
 	}
 	return "";
 }

source/glest_map_editor/main.cpp

@@ -1,13 +1,24 @@
-// ==============================================================
-//	This file is part of Glest (www.glest.org)
 //
-//	Copyright (C) 2001-2008 Martiño Figueroa
+//	map_editor:main.cpp:
 //
-//	You can redistribute this code and/or modify it under
+//	This file is part of ZetaGlest <https://github.com/ZetaGlest>
-//	the terms of the GNU General Public License as published
+//
-//	by the Free Software Foundation; either version 2 of the
+//	Copyright (C) 2018  The ZetaGlest team
-//	License, or (at your option) any later version
+//
-// ==============================================================
+//	ZetaGlest is a fork of MegaGlest <https://megaglest.org>
+//
+//	This program is free software: you can redistribute it and/or modify
+//	it under the terms of the GNU General Public License as published by
+//	the Free Software Foundation, either version 3 of the License, or
+//	(at your option) any later version.
+
+//	This program is distributed in the hope that it will be useful,
+//	but WITHOUT ANY WARRANTY; without even the implied warranty of
+//	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//	GNU General Public License for more details.
+//
+//	You should have received a copy of the GNU General Public License
+//	along with this program.  If not, see <https://www.gnu.org/licenses/>
 
 #include "main.h"
 #include <ctime>
@@ -47,7 +58,7 @@ string getGameReadWritePath(const string &lookupKey) {
 
 namespace MapEditor {
 
-const string mapeditorVersionString = "v3.13-dev";
+const string mapeditorVersionString = "v0.8.01";
 const string MainWindow::winHeader = "MegaGlest Map Editor " + mapeditorVersionString;
 
 // ===============================================
@@ -1187,7 +1198,7 @@ void MainWindow::onMenuHideWater(wxCommandEvent &event) {
 void MainWindow::onMenuViewAbout(wxCommandEvent &event) {
 	MsgDialog(
 		this,
-		wxT("\n    Glest Map Editor\n    Copyright 2004-2010 The Glest Team\n    Copyright 2010-2017 The MegaGlest Team    \n"),
+		wxT("\n    Glest Map Editor\n    Copyright 2004-2010 The Glest Team\n    Copyright 2010-2018 The MegaGlest Team    \n"),
 		wxT("About")).ShowModal();
 }
 

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.13-dev";
+CurrentGameVersion = "0.8.01";
 # ^ typical version numbers look like this: "3.14-beta1.0", "3.13-dev", "3.13.1"
 
 OldReleaseGameVersion = "3.13.0";
 LastCompatibleSaveGameVersion = "3.11.1";
 
-GitCommitForRelease = "5608.a3c8464";
+GitCommitForRelease = "5733.147264d";
 # ^ will be automatically generated