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 382b037ec..75f54d5c6 100644 --- a/mk/linux/tools-for-standalone-client/installer/scripts/config.lua +++ b/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", - id = "megaglest", - description = _("MegaGlest v" .. GAME_VERSION), + vendor = "github.com/ZetaGlest", + id = "zetaglest", + 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 - previousPath = MojoSetup.info.homedir .. '/megaglest/' - elseif MojoSetup.platform.exists('/opt/games/megaglest/uninstall-megaglest.sh') then - previousPath = '/opt/games/megaglest/' - elseif MojoSetup.platform.exists('/usr/local/games/megaglest/uninstall-megaglest.sh') then - previousPath = '/usr/local/games/megaglest/' + if MojoSetup.platform.exists(MojoSetup.info.homedir .. '/zetaglest/uninstall-zetaglest.sh') then + previousPath = MojoSetup.info.homedir .. '/zetaglest/' + elseif MojoSetup.platform.exists('/opt/games/zetaglest/uninstall-zetaglest.sh') then + previousPath = '/opt/games/zetaglest/' + elseif MojoSetup.platform.exists('/usr/local/games/zegaglest/uninstall-zetaglest.sh') then + previousPath = '/usr/local/games/zegaglest/' end if previousPath ~= '' then - if MojoSetup.promptyn(_("MegaGlest Uninstall Title"), _("MegaGlest Uninstall Prompt") .. '\n\n[' .. previousPath .. ']') then - os.execute(previousPath .. 'uninstall-megaglest.sh') + if MojoSetup.promptyn(_("ZetaGlest Uninstall Title"), _("ZetaGlest Uninstall Prompt") .. '\n\n[' .. previousPath .. ']') then + 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 - previousPath = MojoSetup.info.homedir .. '/megaglest/' - elseif MojoSetup.platform.exists('/opt/games/megaglest/mydata/') then - previousPath = '/opt/games/megaglest/' - elseif MojoSetup.platform.exists('/usr/local/games/megaglest/mydata/') then - previousPath = '/usr/local/games/megaglest/' + if MojoSetup.platform.exists(MojoSetup.info.homedir .. '/zetaglest/mydata/') then + previousPath = MojoSetup.info.homedir .. '/zetaglest/' + elseif MojoSetup.platform.exists('/opt/games/zetaglest/mydata/') then + previousPath = '/opt/games/zetaglest/' + elseif MojoSetup.platform.exists('/usr/local/games/zetaglest/mydata/') then + 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,14 +63,14 @@ Setup.Package end, postinstall = function(package) - if MojoSetup.promptyn(_("MegaGlest Visit Website Title"), _("MegaGlest Visit Website Prompt")) then - MojoSetup.launchbrowser("http://megaglest.org/get-started.html") + if MojoSetup.promptyn(_("ZetaGlest Visit Website Title"), _("ZetaGlest Visit Website Prompt")) then + MojoSetup.launchbrowser("http://zetaglest.org/get-started.html") end end, postuninstall = function(package) - -- Cleanup additional files - if MojoSetup.destination ~= '' then + -- Cleanup additional files + if MojoSetup.destination ~= '' then if MojoSetup.platform.exists(MojoSetup.destination .. '/lib/') then os.execute('rm -rf ' .. MojoSetup.destination .. '/lib/') 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), - genericname = _("MegaGlest"), + name = _("ZetaGlest v" .. GAME_VERSION), + genericname = _("ZetaGlest"), tooltip = _("A real time strategy game."), builtin_icon = false, - icon = "megaglest.png", - commandline = "%0/start_megaglest", + icon = "zetaglest.png", + commandline = "%0/start_zetaglest", category = "Game;StrategyGame" }, Setup.DesktopMenuItem { disabled = false, - name = _("MegaGlest Map Editor v" .. GAME_VERSION), - genericname = _("MegaGlest"), + name = _("ZetaGlest Map Editor v" .. GAME_VERSION), + genericname = _("ZetaGlest"), tooltip = _("A real time strategy game."), builtin_icon = false, - icon = "megaglest.png", - commandline = "%0/start_megaglest_mapeditor", + icon = "zetaglest.png", + 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), - genericname = _("MegaGlest"), + name = _("ZetaGlest G3D Model Viewer v" .. GAME_VERSION), + genericname = _("ZetaGlest"), tooltip = _("A real time strategy game."), builtin_icon = false, - icon = "megaglest.png", - commandline = "%0/start_megaglest_g3dviewer", + icon = "zetaglest.png", + commandline = "%0/start_zetaglest_g3dviewer", category = "Game;StrategyGame", --mimetype = {"application/x-g3d"} }, @@ -156,15 +156,15 @@ Setup.Package Setup.DesktopMenuItem { disabled = false, - name = _("MegaGlest Uninstall v" .. GAME_VERSION), - genericname = _("MegaGlest"), + name = _("ZetaGlest Uninstall v" .. GAME_VERSION), + genericname = _("ZetaGlest"), tooltip = _("A real time strategy game."), builtin_icon = false, - icon = "megaglest-uninstall.ico", - commandline = "%0/uninstall-megaglest.sh", + icon = "zetaglest-uninstall.ico", + commandline = "%0/uninstall-zetaglest.sh", category = "Game;StrategyGame" } - + } } diff --git a/mk/macos/bundle_resources/Info.plist.in b/mk/macos/bundle_resources/Info.plist.in index 4b1896546..b01daa05d 100644 --- a/mk/macos/bundle_resources/Info.plist.in +++ b/mk/macos/bundle_resources/Info.plist.in @@ -7,7 +7,7 @@ CFBundleExecutable MegaGlest CFBundleGetInfoString - v${MEGAGLEST_VERSION}, © 2001-2017 The MegaGlest Team. + v${MEGAGLEST_VERSION}, © 2018 The ZetaGlest Team. CFBundleIconFile MegaGlest CFBundleIdentifier diff --git a/mk/windows/Installer/MegaGlestInstaller.nsi b/mk/windows/Installer/MegaGlestInstaller.nsi index 9b9b78d7b..8379cfff9 100644 --- a/mk/windows/Installer/MegaGlestInstaller.nsi +++ b/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! @@ -93,7 +93,7 @@ Function un.myGUIInit FindWindow $0 '_Nb' #EBanner::show /NOUNLOAD /FIT=BOTH /HWND=$0 "$PLUGINSDIR\megaglestinstallscreen.jpg" FunctionEnd - + Function MUIGUIInit Call myGUIInit @@ -101,7 +101,7 @@ Function MUIGUIInit # look for known older versions StrCpy $R2 ${APVER} - + ReadRegStr $R0 HKLM Software\${APNAME} "Install_Dir" StrCmp $R0 "" +2 0 ReadRegStr $R1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APNAME}" "UninstallString" @@ -182,7 +182,7 @@ doneInit: CreateDirectory "$APPDATA\megaglest\" Rename "$R0\glestuser.ini" "$APPDATA\megaglest\glestuser.ini" ClearErrors - + FunctionEnd @@ -196,7 +196,7 @@ Function .onInstSuccess MessageBox MB_YESNO "Would you like to view our getting started page on megaglest.org?" IDNO noLaunchWebsite ExecShell open 'http://megaglest.org/get-started.html' - + noLaunchWebsite: MessageBox MB_YESNO "Would you like to view the README file? This is heavily recommended." IDNO noViewReadme @@ -246,14 +246,14 @@ Section "${APNAME} (required)" File "..\..\shared\servers.ini" File /NONFATAL "..\..\..\data\glest_game\openal32.dll" File /NONFATAL "..\openal64.dll" - + File "..\NetworkThrottleFix.reg" - + #File /NONFATAL "..\libvlccore.dll" #File /NONFATAL "..\libvlc.dll" #File /NONFATAL /r /x .gitignore /x .svn /x mydata "..\plugins" #File /NONFATAL /r /x .gitignore /x .svn /x mydata "..\lua" - + SetOutPath "$INSTDIR\blender\" #File /NONFATAL "..\..\..\data\glest_game\xml2g.exe" #File /NONFATAL "..\..\..\data\glest_game\g2xml.exe" @@ -339,7 +339,7 @@ RequestExecutionLevel none Section "Uninstall" Call un.myGUIInit - + ; Remove registry keys DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APNAME}" DeleteRegKey HKLM SOFTWARE\${APNAME} diff --git a/mk/windows/Installer/MegaGlestUpdater.nsi b/mk/windows/Installer/MegaGlestUpdater.nsi index c35a41f33..1f24d6e1d 100644 --- a/mk/windows/Installer/MegaGlestUpdater.nsi +++ b/mk/windows/Installer/MegaGlestUpdater.nsi @@ -1,11 +1,11 @@ ;-------------------------------- ; General Attributes -!define APNAME MegaGlest -!define APVER 3.13-dev +!define APNAME ZetaGlest +!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 @@ -64,7 +64,7 @@ Function MUIGUIInit SetOutPath '$PLUGINSDIR' File megaglestinstallscreen.jpg - + FindWindow $0 '_Nb' EBanner::show /NOUNLOAD /FIT=BOTH /HWND=$0 "$PLUGINSDIR\megaglestinstallscreen.jpg" @@ -108,7 +108,7 @@ Function MUIGUIInit foundInst: StrCpy $INSTDIR "$R0" - + MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \ "${APNAME} v${APVER} installation found in [$R0]. $\n$\nClick `OK` to update \ the previous installation or `Cancel` to exit." \ @@ -134,7 +134,7 @@ uninstInit: ClearErrors ;ExecWait '$R0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file ;Exec $INSTDIR\uninst.exe ; instead of the ExecWait line - + doneInit: FunctionEnd @@ -164,7 +164,7 @@ Section "${APNAME} (required)" SectionIn RO #MUI_PAGE_INSTFILES - + ; Set output path to the installation directory. SetOutPath $INSTDIR diff --git a/source/g3d_viewer/main.cpp b/source/g3d_viewer/main.cpp index bd321fd45..aa420ae41 100644 --- a/source/g3d_viewer/main.cpp +++ b/source/g3d_viewer/main.cpp @@ -1,13 +1,24 @@ -// ============================================================== -// This file is part of MegaGlest (www.glest.org) // -// Copyright (C) 2011 - by Mark Vejvoda +// g3d_viewer:main.cpp: // -// You can redistribute this code and/or modify it under -// the terms of the GNU General Public License as published -// by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version -// ============================================================== +// This file is part of ZetaGlest +// +// Copyright (C) 2018 The ZetaGlest team +// +// ZetaGlest is a fork of MegaGlest +// +// 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 #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"; @@ -465,7 +476,7 @@ MainWindow::MainWindow( std::pair > unitToLoad, RegCreateKeyEx(HKEY_CURRENT_USER,subKey.c_str(),0, NULL, 0, KEY_ALL_ACCESS, NULL, &keyHandle, &dwDisposition); //Set the value. auto_ptr wstr(Ansi2WideString(appPath.c_str())); - + wstring launchApp = wstring(wstr.get()) + L" \"%1\""; DWORD len = (launchApp.size() + 1) * sizeof(wchar_t); RegSetValueEx(keyHandle, NULL, 0, REG_SZ, (PBYTE)launchApp.c_str(), len); @@ -613,7 +624,7 @@ void MainWindow::onPaint(wxPaintEvent &event) { event.Skip(); return; } - + bool isFirstWindowShownEvent = !startupSettingsInited ; if(startupSettingsInited == false) { startupSettingsInited = true; @@ -675,7 +686,7 @@ void MainWindow::onPaint(wxPaintEvent &event) { } renderer->renderParticleManager(); - + if(isFirstWindowShownEvent) { this->Refresh(); glCanvas->Refresh(); @@ -694,7 +705,7 @@ void MainWindow::onPaint(wxPaintEvent &event) { Close(); return; } - + glCanvas->SwapBuffers(); if(autoScreenShotAndExit == true && viewportW == 0 && viewportH == 0) { @@ -2548,7 +2559,7 @@ if( hasCommandArgument(knownArgCount, (wxChar**)&GAME_ARGS[0], (const char *)tmp // appPath = wxFNCONV(argv[0]); //#endif // printf("appPath [%s]\n",argv[0]); - + wxString exe_path = wxStandardPaths::Get().GetExecutablePath(); //wxString path_separator = wxFileName::GetPathSeparator(); //exe_path = exe_path.BeforeLast(path_separator[0]); @@ -2585,7 +2596,7 @@ if( hasCommandArgument(knownArgCount, (wxChar**)&GAME_ARGS[0], (const char *)tmp if(autoScreenShotAndExit == true) { #if !defined(WIN32) mainWindow->Iconize(true); -#endif +#endif } mainWindow->Show(); mainWindow->init(); diff --git a/source/glest_game/facilities/game_util.cpp b/source/glest_game/facilities/game_util.cpp index 3c8b9063e..1c03519d6 100644 --- a/source/glest_game/facilities/game_util.cpp +++ b/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 -// the terms of the GNU General Public License as published -// by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version -// ============================================================== +// This file is part of ZetaGlest +// +// Copyright (C) 2018 The ZetaGlest team +// +// ZetaGlest is a fork of MegaGlest +// +// 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 #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 ""; } diff --git a/source/glest_map_editor/main.cpp b/source/glest_map_editor/main.cpp index dfad0aeb9..69a3a241c 100644 --- a/source/glest_map_editor/main.cpp +++ b/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 -// the terms of the GNU General Public License as published -// by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version -// ============================================================== +// This file is part of ZetaGlest +// +// Copyright (C) 2018 The ZetaGlest team +// +// ZetaGlest is a fork of MegaGlest +// +// 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 #include "main.h" #include @@ -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(); } diff --git a/source/version.txt b/source/version.txt index bf4ca99af..cd715fc56 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.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