mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-02-24 19:52:25 +01:00
Code Issues Projects Releases Wiki Activity
5,844 Commits 1 Branch 32 Tags
Commit Graph

4798 Commits

Author SHA1 Message Date
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
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
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
a1f13cbc13
faction.cpp:change '>>' to '> >' 2018-02-14 02:22:02 -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
andy5995
c8726d7899
type_instances:reformat source 
indent -i2 -nut -bl -bli0 -ppi3 -nce -npsl
 2018-02-14 01:03:04 -06:00
andy5995
3ff4f25766
game_util.cpp:add "-dev" to glestVersionString 2018-02-14 00:36:32 -06:00
andy5995
148315a2a0
unit.cpp:change default command to attack 
We'll try this again... :)
 2018-02-13 21:10:21 -06:00
andy5995
5caa88fe23
unit.cpp:reformat source 
indent -i2 -nut -bl -bli0 -ppi3 -nce -npsl
 2018-02-11 21:56:36 -06:00
andy5995
964f6f4d02 game.cpp:reformat source 
indent -i2 -nut -bl -bli0 -ppi3 -nce -npsl
 2018-02-11 21:37:07 -06:00
andy5995
fc72932ca7
menu_state_custom_game:add FIXME comment 2018-02-11 04:49:49 -06:00
andy5995
af3ff60cb6 menu_state_connected_game:disable slots > max map players 
This disables slots >= mapInfo.hardMaxPlayers from headless admin
control.

I forgot to check how the menu looked when connecting to a headless
server when I "completed" #13.
 2018-02-11 04:40:46 -06:00
andy5995
f703e6193e [#21]join running game:change value in for statement 
This may  help with #21
 2018-02-05 16:49:11 -06:00
Andy Alt
a8255e5c97
[closes #13] enhanced observer mode additions and cleanup (#45) 
* additions and cleanup [skip ci]

* disallow observers to change their faction and team [skip ci]

* disable observer slots from admin control

* when checkboxObserversAllowed is toggled, update correctly

* Also adjusted the labels better

* when scenario is checked, observer mode is disabled and extra slots are
closed

* attempted to add a feature that would allow the admin to change to a
different slot (doesn't work yet)

* graphics still needs some adjustment

* host can not go to a slot > mapInfo.maxPlayers
 2018-02-05 16:01:29 -06:00
andy5995
b03e62f57b
unit.cpp:revert default right-click to move 
I think this will help until #48 is straightened out.

See Also: #8
 2018-02-03 14:20:41 -06:00
Andy Alt
b6a891d6c1 types:reformat/style (#47) 
`indent -i2 -nut -bl -bli0 -ppi3 -nce -npsl` Merging @andy5995 's code reformatting.
 2018-02-03 11:49:20 +00:00
andy5995
8f19404e7f
Cmakelists.txt:change filename to start_zetaglest_gameserver 2018-02-02 11:42:34 -06:00
andy5995
c4f3535cd9
add -Wall to build flags 
This will output extra warnings that may be useful
 2018-02-01 21:18:39 -06:00
andy5995
040ef8c895
remove git revision string 
This will help speed up build-time when small changes are made.
 2018-02-01 20:50:50 -06:00
Andy Alt
c0251145f8 when scenario xml file not present, don't err (#43) 
* when scenario xml file not present, don't err

For ZetaGlest/zetaglest-data#30

* remove 'else' clause
Accepted @andy5995 's scenario browser improvement (does not throw major error if scenario is malformed).
 2018-02-01 23:51:46 +00:00
andy5995
8858e119bc
game_camera.cpp:add space between angle brackets 2018-02-01 14:08:19 -06:00
andy5995
7136acffc2
add space between right angle brackets 
build fails on travis otherwise
 2018-02-01 13:55:34 -06:00
andy5995
0cbb7d518a
game & ai:restyle/reformat code 2018-02-01 13:39:41 -06:00
Jammyjamjamman
38de15878d Added comments to buildCommand in commander.cpp . Also slightly changed a comment in unit_updater.cpp. 2018-02-01 14:52:51 +00:00
andy5995
acedc2bf3c
restyle/reformat 4 files 
reformatted before I work on them
 2018-02-01 01:03:00 -06:00
andy5995
494c68dc88
renderer.cpp:revert/uncomment throw statement 
I commented this out to get rid of a warning. Perhaps unwise.
 2018-01-31 23:49:06 -06:00
andy5995
87b85c9a50
change megaglest to zetaglest 
* Among other minor name changes, this also puts "ZetaGlest" in the
window title bar
 2018-01-31 23:48:00 -06:00
andy5995
a97d4c85c1 moved unit html site generate to zetaglest.github.io 
I added these in this commit, on the web site repo:

04a619efa3
 2018-01-28 20:45:15 -06:00
Jammyjamjamman
25bdead5e5 Some extra comments added to code. [skip ci] 2018-01-28 12:56:44 +00:00
andy5995
bf5a04be18 add hotkey value for "move" 
This is needed now that
2c4fc340de
has been implemented
 2018-01-28 03:36:51 -06:00
Jammyjamjamman
a8fe68c7a9 Fixed the typo I created in a comment. 2018-01-27 21:52:12 +00:00
Jammyjamjamman
2e1b197c23 Unit produce/ upgrade progress is now reset when completed or cancelled instead of when it starts (which fixes issue #30). 2018-01-27 21:08:08 +00:00
Jammyjamjamman
0b3b562b35
Update unit.cpp 
Added a missing bracket in a comment.
 2018-01-27 20:11:08 +00:00
Jammyjamjamman
2c4fc340de Change the default command for attacking units to attack. 2018-01-27 13:42:18 -06:00
andy5995
d69afe16bc
menu_state_custom_game:correct spelling 
* correct to updateControllers
 2018-01-26 00:59:31 -06:00
andy5995
ec5346a2cd
html template:change title in head [skip ci] 2018-01-25 16:25:52 -06:00
andy5995
1327f06fa7
html template:add link to Discord [skip ci] 2018-01-25 16:15:52 -06:00
andy5995
af5a9beef6 tools:update files that generate html unit docs 
This was needed for ZetaGlest/zetaglest.github.io#1
 2018-01-25 16:03:07 -06:00
andy5995
d52c3e1693
menu_state_connected/custom.cpp: add space between >> 
Same problems as 71c9e59b6a9958a87a2b565d5a0424ba8eaba1ca
 2018-01-25 14:30:00 -06:00
andy5995
71c9e59b6a
main.cpp:add space between >> 
Attempt to fix failing build

https://travis-ci.org/ZetaGlest/zetaglest-source/jobs/333402071#L1426

Build passes on my system, but travis doesn't like it.
 2018-01-25 13:40:41 -06:00