diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d2199bff9..bec1226ef 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,9 +3,7 @@ Welcome to the Glest project! Thank you for reading this document and considering contributing. -Anyone is welcome to join our [Discord server](https://discord.gg/WaAaXS7). - -The Discord rooms are for players, developers, and curiosity/adventure-seekers. +Anyone is welcome to join our [Discord server](https://discord.gg/es3EyBB) to meet us players, developers, and memers. Please remember to "star" this project. diff --git a/README.md b/README.md index 859d753b3..458cb0db8 100644 --- a/README.md +++ b/README.md @@ -21,10 +21,10 @@ CPU is also available. 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). +instructions](https://github.com/Glest/glest-source/blob/master/mk/windows/README.md). For other operating systems, you must [**build and install from -source**](https://github.com/Glest/glest-source/blob/develop/BUILD.md) +source**](https://github.com/Glest/glest-source/blob/master/BUILD.md) (Later, we'll be providing binary packages). ## Quick Build Guide for Linux @@ -40,28 +40,23 @@ Then run the following command to start the game: ## Links * **[Screenshots](https://github.com/Glest/screenshots)** -* **[Discord](https://discord.gg/WaAaXS7)** +* **[Join us on Discord](https://discord.gg/es3EyBB)** * **[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) +* [Compiling](https://github.com/Glest/glest-source/blob/master/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) +* [ChangeLog](https://github.com/Glest/glest-source/blob/master/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) -* [SCENARIOS.md](https://github.com/Glest/glest-data/blob/develop/SCENARIOS.md) +* [MODS.md](https://github.com/Glest/glest-data/blob/master/MODS.md) +* [TILESETS.md](https://github.com/Glest/glest-data/blob/master/TILESETS.md) +* [SCENARIOS.md](https://github.com/Glest/glest-data/blob/master/SCENARIOS.md) ### Contributing and Testing If you'll be contributing code or changes to data, the procedures for -forking and cloning are outlined in [CONTRIBUTING.md](https://github.com/Glest/glest-source/blob/develop/CONTRIBUTING.md) +forking and cloning are outlined in [CONTRIBUTING.md](https://github.com/Glest/glest-source/blob/master/CONTRIBUTING.md) To run your own headless (dedicated) server, see [the FAQ](https://glest.io/docs/faq.html#headlessserver). - -### Contact Us - -* [Discord](https://discord.gg/WaAaXS7) -* Email: mathusum.mut@gmail.com diff --git a/mk/shared/glest.ini b/mk/shared/glest.ini index 97e59b450..3718cd15e 100644 --- a/mk/shared/glest.ini +++ b/mk/shared/glest.ini @@ -87,4 +87,7 @@ UpdateCheckURL=https://glest.io/version.txt UpdateDownloadURL=https://github.com/glest/glest-source#download-for-windows UpdateNotifier=true UserData_Root=$HOME/.glest/ +Website=https://glest.io +JoinUs=https://discord.gg/es3EyBB +BugReportUrl=https://github.com/Glest/glest-source/issues Windowed=false diff --git a/mk/windows/glest.ini b/mk/windows/glest.ini index 0d36b9e05..b87ee9793 100644 --- a/mk/windows/glest.ini +++ b/mk/windows/glest.ini @@ -86,4 +86,7 @@ UpdateCheckURL=https://glest.io/version.txt UpdateDownloadURL=https://github.com/glest/glest-source#download-for-windows UpdateNotifier=true UserData_Root=$APPDATA\glest\ +Website=https://glest.io +JoinUs=https://discord.gg/es3EyBB +BugReportUrl=https://github.com/Glest/glest-source/issues Windowed=false diff --git a/mk/windows/glest_release.ini b/mk/windows/glest_release.ini index a3f946934..e94b15561 100644 --- a/mk/windows/glest_release.ini +++ b/mk/windows/glest_release.ini @@ -86,4 +86,7 @@ UpdateCheckURL=https://glest.io/version.txt UpdateDownloadURL=https://github.com/glest/glest-source#download-for-windows UpdateNotifier=true UserData_Root=$APPDATA\glest\ +Website=https://glest.io +JoinUs=https://discord.gg/es3EyBB +BugReportUrl=https://github.com/Glest/glest-source/issues Windowed=false diff --git a/source/game/facilities/game_util.cpp b/source/game/facilities/game_util.cpp index 29839fb10..8b0a56f07 100644 --- a/source/game/facilities/game_util.cpp +++ b/source/game/facilities/game_util.cpp @@ -36,8 +36,6 @@ using namespace Shared::Util; using namespace Shared::Platform; namespace Game { - const char *mailString = "https://github.com/Glest"; - string getCrashDumpFileName() { return "glest.dmp"; } @@ -184,11 +182,11 @@ namespace Game { string getAboutString2(int i) { switch (i) { case 0: - return "Website: https://glest.io"; + return "Website: " + Config::getInstance().getString("Website", "https://glest.io"); case 1: - return "Discord: https://discord.gg/WaAaXS7"; + return "Join Us: " + Config::getInstance().getString("JoinUs", "https://discord.gg/es3EyBB"); case 2: - return "Bug reports: " + string(mailString); + return "Bug reports: " + Config::getInstance().getString("BugReportUrl", "https://github.com/Glest/glest-source/issues"); } return ""; } diff --git a/source/game/facilities/game_util.h b/source/game/facilities/game_util.h index 55ea788e7..15e350317 100644 --- a/source/game/facilities/game_util.h +++ b/source/game/facilities/game_util.h @@ -33,8 +33,6 @@ using std::string; namespace Game { - extern const char *mailString; - void initSpecialStrings(); string getCrashDumpFileName(); string getPlatformTypeNameString(); diff --git a/source/game/main/main.cpp b/source/game/main/main.cpp index ed1f41092..274e75f05 100644 --- a/source/game/main/main.cpp +++ b/source/game/main/main.cpp @@ -707,7 +707,7 @@ namespace Game { string msg = "#1 An error occurred and " + string(appNameString) + - " will close.\nPlease report this bug to: " + string(mailString); + " will close.\nPlease report this bug to: " + Config::getInstance().getString("BugReportUrl", "https://github.com/Glest/glest-source/issues"); msg += ", attaching the generated " + getCrashDumpFileName() + " file."; @@ -733,7 +733,7 @@ namespace Game { string msg = "#1 An error occurred and " + string(appNameString) + - " will close.\nPlease report this bug to: " + string(mailString); + " will close.\nPlease report this bug to: " + Config::getInstance().getString("BugReportUrl", "https://github.com/Glest/glest-source/issues"); #ifdef WIN32 msg += ", attaching the generated " + getCrashDumpFileName() + " file."; @@ -5719,7 +5719,7 @@ namespace Game { PlatformExceptionHandler::application_binary = executable_path(argv[0], true); appNameString = GameConstants::application_name; - mailStringSupport = mailString; + mailStringSupport = Config::getInstance().getString("BugReportUrl", "https://github.com/Glest/glest-source/issues"); SystemFlags::ENABLE_THREADED_LOGGING = false; disableBacktrace = false; bool