From 95bf40e5912074fd1b47d952b26d167b12601aee Mon Sep 17 00:00:00 2001 From: mathusummut Date: Thu, 14 Feb 2019 19:36:35 +0100 Subject: [PATCH] Updated link --- ChangeLog.md | 2 +- README.md | 6 +- WEBSITE_DESIGN.md | 2 +- mk/macos/build.sh | 2 +- packaging/Slackbuild/glest/README.Slackware | 93 ++++++------------- packaging/Slackbuild/glest/glest.info | 8 +- packaging/Slackbuild/glest/slack-desc | 2 +- source/game/facilities/game_util.cpp | 2 +- source/game/menu/menu_state_root.cpp | 2 +- .../sources/platform/posix/socket.cpp | 6 +- 10 files changed, 46 insertions(+), 79 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 7288946e0..64facdc23 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -28,7 +28,7 @@ v1.0 (pressing "a" not needed anymore); ["m" key can be used for "move"](https://github.com/Glest/glest-source/commit/bf5a04be18f2b16b8a565acff4baabc5fbfed293). - Updated UI to look more modern - Improved OOS detection, which also helps detect cheating -- [Transparency of the alpha component of textures can now be set](https://glest.github.io/docs/modelling/textures.html#Transparency)/ +- [Transparency of the alpha component of textures can now be set](https://glest.io/docs/modelling/textures.html#Transparency)/ - Updated [miniz](https://github.com/richgel999/miniz) library. Thanks to [richgel999](https://github.com/richgel999) and the miniz contributors. - CMakeLists.txt files have had a major tune-up (doesn't affect Windows users) diff --git a/README.md b/README.md index 1a53abfb2..048f73d2f 100644 --- a/README.md +++ b/README.md @@ -42,11 +42,11 @@ Then run the following command to start the game: * **[Screenshots](https://github.com/Glest/screenshots)** * **[Discord](https://discord.gg/WaAaXS7)** * **[Server list and player stats](http://master.glest.org)** -* [FAQ](https://glest.github.io/docs/faq.html) +* [FAQ](https://glest.io/docs/faq.html) * [Compiling](https://github.com/Glest/glest-source/blob/develop/BUILD.md) * [Contributing and Testing](https://github.com/Glest/glest-source#contributing-and-testing) * [ChangeLog](https://github.com/Glest/glest-source/blob/develop/ChangeLog.md) -* [Detailed information about units in the game](https://glest.github.io/docs) +* [Detailed information about units in the game](https://glest.io/docs) ### Extra Tech trees, mods, tilesets, scenarios @@ -62,7 +62,7 @@ forking and cloning are outlined in [CONTRIBUTING.md](https://github.com/Glest/g Please see [CONTRIBUTING.md](https://github.com/Glest/glest-source/blob/develop/CONTRIBUTING.md) for extended, important instructions and guidelines for contributing. -To run your own headless (dedicated) server, see [the FAQ](https://glest.github.io/docs/faq.html#headlessserver). +To run your own headless (dedicated) server, see [the FAQ](https://glest.io/docs/faq.html#headlessserver). ### Contact Us diff --git a/WEBSITE_DESIGN.md b/WEBSITE_DESIGN.md index df76b23a9..004d86ee8 100644 --- a/WEBSITE_DESIGN.md +++ b/WEBSITE_DESIGN.md @@ -2,7 +2,7 @@ ## Unit Documentation -### https://glest.github.io/ +### https://glest.io The repo is at https://github.com/Glest/glest.github.io diff --git a/mk/macos/build.sh b/mk/macos/build.sh index 0a637adb0..323688564 100644 --- a/mk/macos/build.sh +++ b/mk/macos/build.sh @@ -7,7 +7,7 @@ # ---------------------------------------------------------------------------- # Default to English language output so we can understand your bug reports # -# Modified by Andy Alt for Glest +# Modified by Andy Alt for Glest export LANG=C diff --git a/packaging/Slackbuild/glest/README.Slackware b/packaging/Slackbuild/glest/README.Slackware index ba8fd6aa0..048f73d2f 100644 --- a/packaging/Slackbuild/glest/README.Slackware +++ b/packaging/Slackbuild/glest/README.Slackware @@ -1,67 +1,25 @@ -[![Build Status](https://travis-ci.org/Glest/glest-source.svg?branch=develop)](https://travis-ci.org/Glest/glest-source) -[![Coverity Scan Build Status](https://scan.coverity.com/projects/16606/badge.svg)](https://scan.coverity.com/projects/glest) +[![Build Status](https://travis-ci.org/glest/glest-source.svg?branch=develop)](https://travis-ci.org/glest/glest-source) -**This is the game engine source code repository.** +# Glest -[Glest](https://glest.github.io/docs/) is a fork of [Glest](http://glest.org/), -a libre software cross platform real-time strategy game. +**Official Website: https://glest.io** -Glest is a network multi-player real-time strategy game engine. -It's shipped with the GlestPack mod, which includes several factions, -each one consisting of many 3d characters. The factions are loosely +[Glest](https://glest.io) is a network multi-player real-time strategy game engine. +It includes several factions, each one consisting of many 3d characters. The factions are loosely based on historical empires with added elements of fantasy, such as -mummies produced by Egyptian priests, Indian shamans who summon +mummies produced by Egyptian priests, shamans who summon thunderbirds for air assaults, and Norsemen who can build flying valkries and "Thors". Start the game by harvesting natural resources, then use the cash to produce an army. Single-player mode against the CPU is also available. -**README Contents** +![Glest Screenshot](https://glest.io/docs/assets/screenshots/screen147.jpg) -* [Stay Informed (Updates)](https://github.com/Glest/glest-source#stay-informed-updates) -* [Project Goals](https://github.com/Glest/glest-source#why-this-fork-project-goals) -* [FAQ](https://github.com/Glest/glest-source#faq) -* [Download executable files](https://github.com/Glest/glest-source#download-executable-files) -* [Running](https://github.com/Glest/glest-source#running) -* [Extra Tech trees, mods, tilesets, scenarious (not yet available on the Glest server)](https://github.com/Glest/glest-source#extra-tech-trees-mods-tilesets-scenarious-not-yet-available-on-the-glest-server) -* [Contributing and Testing](https://github.com/Glest/glest-source#contributing-and-testing) -* [Contact](https://github.com/Glest/glest-source#contact) +## Download for Windows -**[System Requirements](https://glest.github.io/docs/system_requirements.html)** +#### [Download Glest from here](https://codeload.github.com/glest/windows-installer/zip/master). -**[Screenshots](https://github.com/Glest/screenshots)** - -Open games and [Server list and player stats](https://glest.dreamhosters.com/) - -[Detailed information about units in the game](https://glest.github.io/) - -## Stay Informed (Updates) - -* [ChangeLog.md](https://github.com/Glest/glest-source/blob/develop/ChangeLog.md)
-* [![RSS](rss_23x23.jpeg)](https://glest.github.io/feed.xml) -[The Glest Blog](https://glest.github.io/blog/)
-* [![RSS](rss_23x23.jpeg)](https://github.com/Glest/glest-source/commits/develop.atom) -[Recent Commits to glest-source:develop](https://github.com/Glest/glest-source/commits/develop.atom)
-* [![RSS](rss_23x23.jpeg)](https://github.com/Glest/glest-data/commits/develop.atom) -[Recent Commits to glest-data:develop](https://github.com/Glest/glest-data/commits/develop.atom)
-* [![RSS](rss_23x23.jpeg)](https://github.com/Glest/glest.github.io/commits/master.atom) -[Recent Commits to the web site](https://github.com/Glest/glest.github.io/commits/master.atom) - -## Why this fork? (Project Goals) - -Because we love Glest! We wanted to take the project into a -slightly different direction, and therefore we forked Glest into -the Glest project. - -## FAQ - -The FAQ is located at -[https://glest.github.io/docs/faq.html](https://glest.github.io/docs/faq.html). - -## Download executable files - -On Windows, the easiest way to get started is to [download and run the -installer](https://github.com/Glest/windows-installer). If you want +Additionally, if you want to contribute with the code on Windows, [please follow these instructions](https://github.com/Glest/glest-source/blob/develop/mk/windows/README.md). @@ -69,20 +27,28 @@ For other operating systems, you must [**build and install from source**](https://github.com/Glest/glest-source/blob/develop/BUILD.md) (Later, we'll be providing binary packages). -(The ETA for the first official release can be viewed from the [development -milestone](https://github.com/Glest/glest-source/milestone/1).) +## Quick Build Guide for Linux -## Running +For Linux, run the following command: - ./glest (if you didn't install) + git clone https://github.com/Glest/glest-source.git glest; sudo glest/mk/linux/setup.sh -OR +Then run the following command to start the game: - glest (if you installed and the binary is in your PATH) + glest/mk/linux/build/glest -To run your own headless (dedicated) server, see [the FAQ](https://glest.github.io/docs/faq.html#headlessserver). +## Links -### Extra Tech trees, mods, tilesets, scenarious (not yet available on the Glest server) +* **[Screenshots](https://github.com/Glest/screenshots)** +* **[Discord](https://discord.gg/WaAaXS7)** +* **[Server list and player stats](http://master.glest.org)** +* [FAQ](https://glest.io/docs/faq.html) +* [Compiling](https://github.com/Glest/glest-source/blob/develop/BUILD.md) +* [Contributing and Testing](https://github.com/Glest/glest-source#contributing-and-testing) +* [ChangeLog](https://github.com/Glest/glest-source/blob/develop/ChangeLog.md) +* [Detailed information about units in the game](https://glest.io/docs) + +### Extra Tech trees, mods, tilesets, scenarios * [MODS.md](https://github.com/Glest/glest-data/blob/develop/MODS.md) * [TILESETS.md](https://github.com/Glest/glest-data/blob/develop/TILESETS.md) @@ -96,8 +62,9 @@ forking and cloning are outlined in [CONTRIBUTING.md](https://github.com/Glest/g Please see [CONTRIBUTING.md](https://github.com/Glest/glest-source/blob/develop/CONTRIBUTING.md) for extended, important instructions and guidelines for contributing. -## Contact +To run your own headless (dedicated) server, see [the FAQ](https://glest.io/docs/faq.html#headlessserver). + +### Contact Us * [Discord](https://discord.gg/WaAaXS7) -* [Message Board](https://groups.google.com/forum/#!forum/glest) -* Email: glest@gmail.com +* Email: mathusum.mut@gmail.com diff --git a/packaging/Slackbuild/glest/glest.info b/packaging/Slackbuild/glest/glest.info index 235160a74..af914badc 100644 --- a/packaging/Slackbuild/glest/glest.info +++ b/packaging/Slackbuild/glest/glest.info @@ -1,6 +1,6 @@ PRGNAM="glest" -VERSION="0.8.02" -HOMEPAGE="https://glest.github.io/" +VERSION="2.0" +HOMEPAGE="https://glest.io/" DOWNLOAD="source-placeholder \ data-placeholder" MD5SUM="source \ @@ -8,5 +8,5 @@ MD5SUM="source \ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libircclient SDL2 xerces-c OpenAL lua ftgl wxPython" -MAINTAINER="Andy Alt" -EMAIL="andy400-dev@yahoo.com" +MAINTAINER="MathuSum Mut" +EMAIL="mathusum.mut@gmail.com" diff --git a/packaging/Slackbuild/glest/slack-desc b/packaging/Slackbuild/glest/slack-desc index 4dea71ff1..f2b546cbc 100644 --- a/packaging/Slackbuild/glest/slack-desc +++ b/packaging/Slackbuild/glest/slack-desc @@ -16,6 +16,6 @@ glest: mummies produced by Egyptian priests, Indian shamans who summon glest: thunderbirds for air assaults, and Norsemen who can build flying glest: valkries and "Thors". Start the game by harvesting natural resources, glest: then use the cash to produce an army. -glest: Homepage: https://glest.github.io/ +glest: Homepage: https://glest.io/ diff --git a/source/game/facilities/game_util.cpp b/source/game/facilities/game_util.cpp index e044a4351..29839fb10 100644 --- a/source/game/facilities/game_util.cpp +++ b/source/game/facilities/game_util.cpp @@ -184,7 +184,7 @@ namespace Game { string getAboutString2(int i) { switch (i) { case 0: - return "Website: https://glest.github.io"; + return "Website: https://glest.io"; case 1: return "Discord: https://discord.gg/WaAaXS7"; case 2: diff --git a/source/game/menu/menu_state_root.cpp b/source/game/menu/menu_state_root.cpp index d4bda0027..4f6b461b1 100644 --- a/source/game/menu/menu_state_root.cpp +++ b/source/game/menu/menu_state_root.cpp @@ -864,7 +864,7 @@ namespace Game { || ftpFileURL == "") { char szMsg[8096] = ""; snprintf(szMsg, 8096, - "A new update was detected: %s\nUpdate Date: %s\nPlease visit glest.github.io for details!", + "A new update was detected: %s\nUpdate Date: %s\nPlease visit glest.io for details!", props.getString("LatestGameVersion", "unknown").c_str(), props.getString("LatestGameVersionReleaseDate", "unknown").c_str()); showFTPMessageBox(szMsg, "Update", false, true); diff --git a/source/shared_lib/sources/platform/posix/socket.cpp b/source/shared_lib/sources/platform/posix/socket.cpp index 5861a6f4c..d5acd96d4 100644 --- a/source/shared_lib/sources/platform/posix/socket.cpp +++ b/source/shared_lib/sources/platform/posix/socket.cpp @@ -2785,12 +2785,12 @@ namespace Shared { //int r = 0; #ifndef MINIUPNPC_VERSION_PRE1_5 #ifndef MINIUPNPC_VERSION_PRE1_6 - int r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, ext_port_str, int_port_str, lanaddr, "Glest - glest.github.io", "TCP", 0, NULL); + int r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, ext_port_str, int_port_str, lanaddr, "Glest", "TCP", 0, NULL); #else - int r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, ext_port_str, int_port_str, lanaddr, "Glest - glest.github.io", "TCP", 0); + int r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, ext_port_str, int_port_str, lanaddr, "Glest", "TCP", 0); #endif #else - int r = UPNP_AddPortMapping(urls.controlURL, data.servicetype, ext_port_str, int_port_str, lanaddr, "Glest - glest.github.io", "TCP", 0); + int r = UPNP_AddPortMapping(urls.controlURL, data.servicetype, ext_port_str, int_port_str, lanaddr, "Glest", "TCP", 0); #endif if (r != UPNPCOMMAND_SUCCESS) { if (SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork, "In [%s::%s Line: %d] AddPortMapping(%s, %s, %s) failed\n", __FILE__, __FUNCTION__, __LINE__, ext_port_str, int_port_str, lanaddr);