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

Updated link

Browse Source
This commit is contained in:
mathusummut
2019-02-14 19:36:35 +01:00
parent d69b75b607
commit 95bf40e591
10 changed files with 46 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog.md
View File

@@ -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). (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 - Updated UI to look more modern
- Improved OOS detection, which also helps detect cheating - 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 - Updated [miniz](https://github.com/richgel999/miniz) library. Thanks
to [richgel999](https://github.com/richgel999) and the miniz contributors. to [richgel999](https://github.com/richgel999) and the miniz contributors.
- CMakeLists.txt files have had a major tune-up (doesn't affect Windows users) - CMakeLists.txt files have had a major tune-up (doesn't affect Windows users)

6
README.md
View File

@@ -42,11 +42,11 @@ Then run the following command to start the game:
* **[Screenshots](https://github.com/Glest/screenshots)** * **[Screenshots](https://github.com/Glest/screenshots)**
* **[Discord](https://discord.gg/WaAaXS7)** * **[Discord](https://discord.gg/WaAaXS7)**
* **[Server list and player stats](http://master.glest.org)** * **[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) * [Compiling](https://github.com/Glest/glest-source/blob/develop/BUILD.md)
* [Contributing and Testing](https://github.com/Glest/glest-source#contributing-and-testing) * [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/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 ### 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) Please see [CONTRIBUTING.md](https://github.com/Glest/glest-source/blob/develop/CONTRIBUTING.md)
for extended, important instructions and guidelines for contributing. 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 ### Contact Us

2
WEBSITE_DESIGN.md
View File

@@ -2,7 +2,7 @@
## Unit Documentation ## Unit Documentation
### https://glest.github.io/ ### https://glest.io
The repo is at https://github.com/Glest/glest.github.io The repo is at https://github.com/Glest/glest.github.io

2
mk/macos/build.sh
View File

@@ -7,7 +7,7 @@
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# Default to English language output so we can understand your bug reports # Default to English language output so we can understand your bug reports
# #
# Modified by Andy Alt for Glest <https://glest.github.io/> # Modified by Andy Alt for Glest
export LANG=C export LANG=C

93
packaging/Slackbuild/glest/README.Slackware
View File

@@ -1,67 +1,25 @@
[![Build Status](https://travis-ci.org/Glest/glest-source.svg?branch=develop)](https://travis-ci.org/Glest/glest-source) [![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)
**This is the game engine source code repository.** # Glest
[Glest](https://glest.github.io/docs/) is a fork of [Glest](http://glest.org/), **Official Website: https://glest.io**
a libre software cross platform real-time strategy game.
Glest is a network multi-player real-time strategy game engine. [Glest](https://glest.io) is a network multi-player real-time strategy game engine.
It's shipped with the GlestPack mod, which includes several factions, It includes several factions, each one consisting of many 3d characters. The factions are loosely
each one consisting of many 3d characters. The factions are loosely
based on historical empires with added elements of fantasy, such as 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 thunderbirds for air assaults, and Norsemen who can build flying
valkries and "Thors". Start the game by harvesting natural resources, valkries and "Thors". Start the game by harvesting natural resources,
then use the cash to produce an army. Single-player mode against the then use the cash to produce an army. Single-player mode against the
CPU is also available. 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) ## Download for Windows
* [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)
**[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)** Additionally, if you want
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)<br >
* [![RSS](rss_23x23.jpeg)](https://glest.github.io/feed.xml)
[The Glest Blog](https://glest.github.io/blog/)<br >
* [![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)<br >
* [![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)<br >
* [![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
to contribute with the code on Windows, [please follow these 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/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) source**](https://github.com/Glest/glest-source/blob/develop/BUILD.md)
(Later, we'll be providing binary packages). (Later, we'll be providing binary packages).
(The ETA for the first official release can be viewed from the [development ## Quick Build Guide for Linux
milestone](https://github.com/Glest/glest-source/milestone/1).)
## 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) * [MODS.md](https://github.com/Glest/glest-data/blob/develop/MODS.md)
* [TILESETS.md](https://github.com/Glest/glest-data/blob/develop/TILESETS.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) Please see [CONTRIBUTING.md](https://github.com/Glest/glest-source/blob/develop/CONTRIBUTING.md)
for extended, important instructions and guidelines for contributing. 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) * [Discord](https://discord.gg/WaAaXS7)
* [Message Board](https://groups.google.com/forum/#!forum/glest) * Email: mathusum.mut@gmail.com
* Email: glest@gmail.com

8
packaging/Slackbuild/glest/glest.info
View File

@@ -1,6 +1,6 @@
PRGNAM="glest" PRGNAM="glest"
VERSION="0.8.02" VERSION="2.0"
HOMEPAGE="https://glest.github.io/" HOMEPAGE="https://glest.io/"
DOWNLOAD="source-placeholder \ DOWNLOAD="source-placeholder \
data-placeholder" data-placeholder"
MD5SUM="source \ MD5SUM="source \
@@ -8,5 +8,5 @@ MD5SUM="source \
DOWNLOAD_x86_64="" DOWNLOAD_x86_64=""
MD5SUM_x86_64="" MD5SUM_x86_64=""
REQUIRES="libircclient SDL2 xerces-c OpenAL lua ftgl wxPython" REQUIRES="libircclient SDL2 xerces-c OpenAL lua ftgl wxPython"
MAINTAINER="Andy Alt" MAINTAINER="MathuSum Mut"
EMAIL="andy400-dev@yahoo.com" EMAIL="mathusum.mut@gmail.com"

2
packaging/Slackbuild/glest/slack-desc
View File

@@ -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: thunderbirds for air assaults, and Norsemen who can build flying
glest: valkries and "Thors". Start the game by harvesting natural resources, glest: valkries and "Thors". Start the game by harvesting natural resources,
glest: then use the cash to produce an army. glest: then use the cash to produce an army.
glest: Homepage: https://glest.github.io/ glest: Homepage: https://glest.io/

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

@@ -184,7 +184,7 @@ namespace Game {
string getAboutString2(int i) { string getAboutString2(int i) {
switch (i) { switch (i) {
case 0: case 0:
return "Website: https://glest.github.io"; return "Website: https://glest.io";
case 1: case 1:
return "Discord: https://discord.gg/WaAaXS7"; return "Discord: https://discord.gg/WaAaXS7";
case 2: case 2:

2
source/game/menu/menu_state_root.cpp
View File

@@ -864,7 +864,7 @@ namespace Game {
|| ftpFileURL == "") { || ftpFileURL == "") {
char szMsg[8096] = ""; char szMsg[8096] = "";
snprintf(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("LatestGameVersion", "unknown").c_str(),
props.getString("LatestGameVersionReleaseDate", "unknown").c_str()); props.getString("LatestGameVersionReleaseDate", "unknown").c_str());
showFTPMessageBox(szMsg, "Update", false, true); showFTPMessageBox(szMsg, "Update", false, true);

6
source/shared_lib/sources/platform/posix/socket.cpp
View File

@@ -2785,12 +2785,12 @@ namespace Shared {
//int r = 0; //int r = 0;
#ifndef MINIUPNPC_VERSION_PRE1_5 #ifndef MINIUPNPC_VERSION_PRE1_5
#ifndef MINIUPNPC_VERSION_PRE1_6 #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 #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 #endif
#else #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 #endif
if (r != UPNPCOMMAND_SUCCESS) { 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); 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);