mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-03 04:52:34 +02:00
Code Issues Projects Releases Wiki Activity
6,309 Commits 1 Branch 32 Tags
85a873cd907a627eb12ba92d59f030e26c948c73
Commit Graph

6309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mathusummut
55348d6c2a Added Windows build 2018-03-14 13:10:55 +01:00
mathusummut
aabdfab3b9 Added Windows build 2018-03-14 13:08:03 +01:00
Andy Alt
51bf09ad9f .travis.yml: specify osx images (#95) 
* .travis.yml:specify osx images

* remove allow_failures

* don't specify core num
 2018-03-13 02:09:09 -05:00
andy5995
fdfbc6ad57 windows:pull submodule update 2018-03-10 01:12:49 -06:00
Andy Alt
dc4fc33243 BUILD.md: comment out windows temp instructions [skip ci] 2018-03-10 00:22:47 -06:00
andy5995
cf0babdd2c windows64:pull update from submodule 
`cd mk/windows64`

`git pull`

`cd ..`

commit

These were part of PR
https://github.com/ZetaGlest/zetaglest-source/pull/92 by @mathusummut
 2018-03-09 14:54:21 -06:00
andy5995
54121b7164 windows32:add submodules 
These were part of PR #92 by @mathusummut
 2018-03-09 14:48:38 -06:00
andy5995
361126c8c9 windows64:pull down update from submodule 2018-03-09 12:50:42 -06:00
andy5995
30baf6b327 windows64:create submodule 
*removed the windows directory
 2018-03-09 12:43:08 -06:00
andy5995
67b6c3f9f4 allow hosts of custom games to use slots > hardMaxPlayers 
This allows the host of a custom game to switch himself to a slot >
mapInfo.hardMaxPlayers for the purpose of being an observer. The 10th
slot is enabled and editable (listBoxControls).

The 8 lines removed from menu_state_custom_game.cpp was some code I
tried last month and forgot to remove.
 2018-03-08 01:03:54 -06:00
andy5995
a31c86e987 menu_state_custom_game_update.cpp:fixes #89 2018-03-08 00:02:43 -06:00
andy5995
c29485803d menu_state_custom_game.cpp:split off functions to another file 2018-03-05 14:57:48 -06:00
MathuSum Mut
ca283f781d Changed icon name to zetaglest.ico (#88) 
* Changed icon name to zetaglest.ico
 2018-03-04 21:20:26 -06:00
Jammyjamjamman
d999bc87da Merge branch 'develop' of https://github.com/ZetaGlest/zetaglest-source into develop 2018-03-04 19:37:39 +00:00
andy5995
bca7d9e9ad menu_state_custom_game:add condition 
Fixes disallowing switching cpu to another faction
 2018-03-04 13:36:54 -06:00
Jammyjamjamman
cf3a2242a6 Removed unnecessary template usage. 2018-03-04 19:36:45 +00:00
andy5995
6dbb62cafa menu_state_custom_game.cpp:when slots open, switch to British 
With enhanced observer mode, When a map is changed from 8 players to 4,
this switches factions 5-8 from Observer to British (used faction "0"
for the default, which translates to British in this situation) and
allows teams to be changed.
 2018-03-04 12:27:05 -06:00
andy5995
e135baba85 server_interface:lag:allow a greater grace period before dropping player 2018-03-02 15:29:07 -06:00
andy5995
ef7c0ad5a5 system_requirements:remove, now on docs website [skip ci] 
This file is now at

https://zetaglest.github.io/docs/system_requirements.html
 2018-03-01 22:39:50 -06:00
andy5995
3c9d259f84 README.md:point some links toward new web site [skip ci] 2018-03-01 22:25:12 -06:00
Andy Alt
e5f6b7a91d Update CONTRIBUTING.md 
add probably about reading the commit log [skip ci]
 2018-03-01 13:18:06 -06:00
Andy Alt
988e8f966c Update CONTRIBUTING.md 
grammar [skip ci]
 2018-03-01 13:13:50 -06:00
Andy Alt
6613f91350 Update CONTRIBUTING.md 
grammar, add link [skip ci]
 2018-03-01 13:13:09 -06:00
Andy Alt
6d3a094db0 Update CONTRIBUTING.md 
Moved info about Practice Git
 2018-03-01 13:11:00 -06:00
Andy Alt
4786258188 Update CONTRIBUTING.md 
add info about Practice Git repository
 2018-03-01 13:08:02 -06:00
Andy Alt
cd1e1cf45a Update CONTRIBUTING.md 
add info about one patch per pull request
 2018-03-01 12:13:56 -06:00
Andy Alt
4da0c45c5a Merge pull request #83 from ZetaGlest/andy5995-patch-2 [skip ci] 
Update WEBSITE_DESIGN.md
 2018-03-01 11:50:50 -06:00
Andy Alt
25990aa138 Merge pull request #82 from ZetaGlest/andy5995-patch-1 [skip ci] 
Update CONTRIBUTING.md
 2018-03-01 11:50:33 -06:00
Andy Alt
267c6e48bc Update WEBSITE_DESIGN.md 2018-03-01 11:01:20 -06:00
Andy Alt
3ab2130648 Update CONTRIBUTING.md 2018-03-01 10:51:56 -06:00
andy5995
a0c05c79ab CONTRIBUTING.md:fix web site design doc link [skip ci] 2018-02-27 18:58:57 -06:00
andy5995
51e29e4c38 BUILD.md:Windows:add temporary build instructions [skip ci] 
Thank you for documenting this @mathusummut

(see also #37)
 2018-02-24 20:28:38 -06:00
andy5995
a138b05f42 ChangeLog.md:fix formatting [skip ci] 2018-02-22 12:18:05 -06:00
andy5995
d30904cbda ChangeLog.md:update [skip ci] 2018-02-22 12:15:07 -06:00
Andy Alt
73aa999de7 add new function for playing sfx (#68) 
(#63)
 2018-02-22 10:02:04 -06:00
Jammyjamjamman
996ba5e27d Added more meaningful comment to the command progress resetter. [skip ci] 2018-02-21 20:19:22 +00:00
andy5995
92176afd77 menu_connected.cpp:use new function to play sfx 
https://github.com/ZetaGlest/zetaglest-data/issues/44

(#63)
 2018-02-21 09:12:06 -06:00
andy5995
c0006da18a core_data.cpp: add function to play sounds 
This function can be used to pass different arguments to it, so the
other play sfx functions (below it) can be removed.

(#63)
 2018-02-21 09:10:26 -06:00
andy5995
1f1233e0db menu_masterserver.cpp:add function to play different sound 
This adds a function to play a different sound when a server becomes
available.

The sound hasn't changed, but now the separate function has been added,
the sound can be changed very easily.

The ticket to create the new sound is at
https://github.com/ZetaGlest/zetaglest-data/issues/44

Can be customized by adding the variable to
$HOME/.zetaglest/glestuser.ini

closes #63
 2018-02-21 08:38:19 -06:00
Jammyjamjamman
dbe6697f16 Unit task no longer resets when a different task in a queue is cancelled, fixes bug #67. 2018-02-21 02:17:48 +00:00
Guillaume Beaurain
66a1d6b255 Dependencies for Linux in BUILD.MD not up to date #61 [skip ci] 2018-02-19 17:18:49 -06:00
andy5995
3d812be8aa core_data.h:add ' ' between '>>' 
Fixes the travis build

```
/home/travis/build/ZetaGlest/zetaglest-source/source/g3d_viewer/../glest_game/global/core_data.h:132:40:
error: ‘>>’ should be ‘> >’ within a nested template argument list
         FontChangedCallbackInterface *
>>registeredFontChangedCallbacks;```
 2018-02-19 07:57:22 -06:00
andy5995
7f44a83c87 global:reformat source 
indent -i2 -nut -bl -bli0 -ppi3 -nce -npsl
 2018-02-19 07:41:13 -06:00
andy5995
a6a02af157 core_data.cpp:allow user-configurable sfx 
This allows users to set their own sound effects using glestuser.ini

Any values from glest.ini can be used in glestuser.ini, and when in
glestuser.ini, they override the values in glest.ini.

Not yet documented.

This adds only 2 sfx, and shows how to do it.

This will change how #63 is done
 2018-02-19 07:36:40 -06:00
andy5995
f974fcf15a ChangeLog.md:fixed formatting [skip ci] 2018-02-15 04:28:03 -06:00
andy5995
10969a527c ChangeLog.md:update [skip ci] 2018-02-15 04:26:02 -06:00
andy5995
a1f13cbc13 faction.cpp:change '>>' to '> >' 2018-02-14 02:22:02 -06:00
andy5995
11c0ae1b0a installer:[incomplete]worked on the scripts 2018-02-14 01:50:53 -06:00
andy5995
986837fe7a tests:output file changed to zetaglest_tests 2018-02-14 01:11:31 -06:00
andy5995
bdef7fc6f3 remove code related to blocking lobby access 
This is no longer used, and the related feature was removed in a commit
a few weeks ago
 2018-02-14 01:08:13 -06:00