4866 Commits

Author SHA1 Message Date
Jammyjamjamman
63eaa42e6f
Attempt to fix OOS bug in windows-linux games. 2018-04-08 13:01:09 +01:00
David CARLIER
6564320214 Clang gets confused when the derived has same methods (#104)
with different signatures than base's virtual.
But since the derived do not reimplement them, the base
do not need to be virtual.
2018-04-04 20:54:13 +01:00
David Carlier
e92cefd664 Backporting a pending MegaGlest PR.
In some platforms, time types are already 64 bits.
2018-04-02 16:59:21 +01:00
mathusummut
835c6efd92 Fixed X-button getting stuck on Windows 2018-03-31 17:38:33 +02:00
Jammyjamjamman
aa46b2a8a1
Fixed bug caused by 045b0b88e051f7163fbef42fa0adc63a326ca186, where user could not click on nick button to get real nick to ping. 2018-03-30 05:47:10 +01:00
Jammyjamjamman
01454a32e5
Resources can now be deposited at flying units, by land or air units. This fixes issue #100 . 2018-03-30 02:42:45 +01:00
MathuSum Mut
50de66d6da
Merge pull request #97 from alketii/develop
Make sure that the _nnn suffix is always 3 digits
2018-03-21 19:06:16 +01:00
Alket Rexhepi
24c3c86512
Make sure that the _nnn suffix is always 3 digits
Make sure that the _nnn suffix is always 3 digits
2018-03-21 19:02:11 +01:00
mathusummut
7c81a9a310 Renamed window from MG to ZetaGlest 2018-03-21 12:43:23 +01:00
Alket Rexhepi
045b0b88e0
Remove MG_ and _NNN from Players List
Remove MG_ and _NNN from Players List but not inside chat, that is for another day.
2018-03-21 00:50:20 +01:00
mathusummut
108fb26f36 Fixed curl issue on Windows 2018-03-15 16:16:03 +01:00
mathusummut
105d5fbb80 Fixed Windows build issue 2018-03-14 16:01:57 +01: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
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