mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-13 20:03:58 +02:00
Code Issues Projects Releases Wiki Activity

Links are now in glest.ini

Browse Source
This commit is contained in:
mathusummut
2019-03-29 02:13:07 +01:00
parent ad19e35a5f
commit 0037df1100
8 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTING.md
View File

@@ -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.

23
README.md
View File

@@ -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

3
mk/shared/glest.ini
View File

@@ -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

3
mk/windows/glest.ini
View File

@@ -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

3
mk/windows/glest_release.ini
View File

@@ -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

8
source/game/facilities/game_util.cpp
View File

@@ -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 "";
}

2
source/game/facilities/game_util.h
View File

@@ -33,8 +33,6 @@
using std::string;
namespace Game {
extern const char *mailString;
void initSpecialStrings();
string getCrashDumpFileName();
string getPlatformTypeNameString();

6
source/game/main/main.cpp
View File

@@ -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