Commit Graph

3080 Commits

Author SHA1 Message Date
Will
03c0197437 merge from upstream 2013-12-04 23:37:04 +01:00
William Edwards
e71e7104dc Trying to build on OSX 2013-12-04 22:38:06 +01:00
SoftCoder
b868a8468b - bugfixes to winner / loser logic to keep calculating stats and publish to masterserver after we determine a winner or loser as the game may not yet be fully over and we want accurate game stats on the masterserver. 2013-11-30 20:33:25 -08:00
SoftCoder
4b50560ca9 - added color picking used colors count in debug view 2013-11-30 17:38:32 -08:00
SoftCoder
2ff75c54e2 merged updates 2013-11-30 14:29:02 -08:00
SoftCoder
f217db38f1 - changed to git version stamp 2013-11-29 13:13:30 -08:00
Will
c6530c2783 merging in all Will's changes 2013-11-29 02:12:34 +01:00
SoftCoder
be3d4d300c - bugfix for headless server mode (null pixmaps) shown by stacktrace on fakir 2013-11-28 16:20:40 -08:00
filux
00b4d9ab4e resolved conflicts by conversion CRLF to LF 2013-11-28 08:26:39 +01:00
Mark Vejvoda
8d040b9f63 - attempt to ensure color picking ALWAYS has unique colors 2013-11-25 07:26:23 +00:00
Mark Vejvoda
ceb799a66e - attempt to ensure color picking ALWAYS has unique colors
- better handling of scenario's that are missing techtrees
2013-11-24 04:44:12 +00:00
Mark Vejvoda
8414077d7a - bugfix for headless server's reporting of winning players and team.
- masterserver returns proper JSON header now
2013-11-22 21:17:38 +00:00
Mark Vejvoda
7d5b71b2cf - bugfix for compilation on windows 2013-11-19 22:47:22 +00:00
Mark Vejvoda
ab64b9343f - updated to support building with clang compiler (And cleaned up clang warnings from initial compile). Edit build-mg.sh and read the clang section as to how to build. 2013-11-19 21:57:28 +00:00
Mark Vejvoda
929cc07895 - code cleanup based on additional gcc warnings 2013-11-19 07:05:45 +00:00
Mark Vejvoda
ad7569ded1 - code cleanup based on additional gcc warnings 2013-11-19 07:02:26 +00:00
Mark Vejvoda
33d87512b0 - code cleanup based on additional gcc warnings 2013-11-19 06:58:52 +00:00
Mark Vejvoda
94684c66a4 - code cleanup based on additional gcc warnings 2013-11-19 06:56:09 +00:00
Mark Vejvoda
66761ba760 - code cleanup based on additional gcc warnings 2013-11-19 06:42:32 +00:00
Mark Vejvoda
9268aaf279 - a few minor bug fixes related to code warnings
- code cleanup based on additional gcc warnings
- enabled additional gcc compiler warnings
2013-11-19 06:14:06 +00:00
Mark Vejvoda
642a26bdb5 - bugfix for cmake builds handling of help2man for empty executable paths 2013-11-18 23:10:38 +00:00
Mark Vejvoda
e28097e0d7 - bugfix for cmake builds handling of help2man for empty executable paths 2013-11-18 22:37:12 +00:00
Mark Vejvoda
fe6886d273 - bugfix for cmake builds handling of help2man for empty executable paths 2013-11-18 22:05:16 +00:00
Mark Vejvoda
145b90d341 - updating version to 3.9.0 for release
- increase installer size on linux for more accurate progrerss bar
2013-11-17 18:27:41 +00:00
Titus Tscharntke
d2cb21d818 version is set to 3.9-dev until versioning system is discussed 2013-11-17 10:41:09 +00:00
Mark Vejvoda
4478b8d1df - fixed compiler warnings in linux 32 gcc 2013-11-17 09:03:57 +00:00
Mark Vejvoda
ff9faf7a4a - fixed warnings in 32 bit linux gcc 2013-11-17 09:01:32 +00:00
Mark Vejvoda
d0ac27353a - fixed compiler warnings in linux 32 gcc 2013-11-17 08:44:47 +00:00
Mark Vejvoda
e89210cf6c - updating version # to v3.9 in preparation for release 2013-11-16 21:50:54 +00:00
Mark Vejvoda
303746df80 - updated cmake scripts to fix build problems on debian 2013-11-16 19:18:09 +00:00
Mark Vejvoda
1dd1b8febb some minor bugfixes (proper variable init, added validation error message) 2013-11-16 18:36:54 +00:00
Mark Vejvoda
aa1efb5d3a added a check for missing data in menu 2013-11-16 10:02:32 +00:00
Mark Vejvoda
77fba5a65e bugfix for clients that have no data, no need to crash 2013-11-16 03:33:13 +00:00
Mark Vejvoda
09818dfdc1 - added a warning code comment to avoid this in the future 2013-11-16 02:12:26 +00:00
Mark Vejvoda
4c4bcd40a3 see if this helps stuttering 2013-11-16 00:28:55 +00:00
Mark Vejvoda
c9a6078689 revert network code back 2013-11-15 20:04:12 +00:00
Mark Vejvoda
98bc4b190e attempt to see how this affects network games for tomreyn 2013-11-15 19:21:14 +00:00
Mark Vejvoda
ea88a4c990 roll back last change 2013-11-15 18:58:28 +00:00
Mark Vejvoda
119a8cce4a attempt to see how this affects network games for tomreyn 2013-11-15 18:41:21 +00:00
Mark Vejvoda
9080ade759 small cleanup from cppcheck 2013-11-14 23:24:17 +00:00
Mark Vejvoda
445e39ab2d updated compressor to skip non mode game data by default unless additional parameter specified 2013-11-14 23:18:28 +00:00
Mark Vejvoda
9350b16c4a cleanup from cppcheck 1.62 2013-11-14 16:42:22 +00:00
Mark Vejvoda
b3a9ad5411 fixed some vc++ compiler warnings 2013-11-14 13:56:05 +00:00
Mark Vejvoda
cc21dbbc5c cpp check warnings cleanup 2013-11-14 13:22:55 +00:00
Mark Vejvoda
3671bd0617 - removed debug code 2013-11-14 13:17:58 +00:00
Mark Vejvoda
d48d63b1fa a bit more refactoring for command line parameters 2013-11-14 12:54:05 +00:00
Mark Vejvoda
53eca42a11 - Disable performance warnings by default. To enable, either press ' in a game top toggle on/off or add this key: PerformanceWarningEnabled=true
- refactor data compress into its own function
2013-11-14 12:38:03 +00:00
Mark Vejvoda
a300621415 - added a new commandline command to create data archives for network xfer for techtrees and tilesets:
megaglest --create-data-archives=all
2013-11-14 06:59:29 +00:00
Mark Vejvoda
5db18c76f4 bugfix for load games when xml is bad 2013-11-14 04:13:40 +00:00
Mark Vejvoda
85799eddc2 more user friendly handling of loading corrupt saved game files 2013-11-14 03:33:15 +00:00