3930 Commits

Author SHA1 Message Date
SoftCoder
209458adee - removed deprecated gl2 code as it was not used 2013-12-14 02:22:30 -08:00
SoftCoder
b9d6b38e8f - coverity based bug fixes - round #1 2013-12-13 23:04:12 -08:00
SoftCoder
c887b0c357 - attempt to cleanup a few warnings
- attempt to get git rev info each compile (not just when running cmake)
2013-12-11 23:16:56 -08:00
SoftCoder
c91b92901b - added ignore folder 2013-12-11 19:18:33 -08:00
SoftCoder
a567fe159d - bugfix for headless mode segfault reported by titi 2013-12-11 19:07:24 -08:00
SoftCoder
ad81692331 Merge branch 'master' of https://github.com/williame/megaglest-source 2013-12-09 18:07:42 -08:00
titiger
3bc5901a01 From Bugreport: cannot delete characters after clicking on player name in lobby
https://forum.megaglest.org/index.php?topic=9302.0
2013-12-10 01:52:08 +01:00
titiger
dcada00514 as there are already several changes to originla 3.9.0 we better set a new version number 2013-12-09 23:14:33 +01:00
SoftCoder
e718f78931 - corrected compile warnings for unit test 2013-12-08 20:08:44 -08:00
Will
2d6da27807 Merge branch 'master' of github.com:MegaGlest/megaglest-source 2013-12-07 20:41:44 +01:00
SoftCoder
02d41bd5f7 fixed windows build 2013-12-06 09:08:47 -08:00
Will
46a0dab916 moved model constructor always behind factory 2013-12-05 21:28:20 +01:00
Will
6afadafa1e Start to abstract model 2013-12-05 16:17:41 +01:00
SoftCoder
6ae1d179bb - updated for proper build on Mac 2013-12-04 14:54:02 -08:00
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
f9e217df94 - bugfix so Mac builds 2013-12-04 13:34:00 -08:00
Will
7e4e98857b integrate upstream 2013-12-04 08:49:33 +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
f7bc5e8f92 - bugfix and additional code (for now) to track duplicates and problems in color picking. We now use will's implementation as it supports 64K colors. 2013-11-30 17:20:30 -08:00
Will
a869dd0fee Tweak to see if we can get the new colour picking code working 2013-12-01 00:43:49 +01:00
SoftCoder
b36244fcbd updated unit test to show max colors supported and when each algorithm fails. 2013-11-30 14:48:11 -08:00
SoftCoder
c2929e3d2b merged 2013-11-30 14:31:05 -08:00
SoftCoder
2ff75c54e2 merged updates 2013-11-30 14:29:02 -08:00
SoftCoder
0400312810 Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source 2013-11-30 14:23:52 -08:00
SoftCoder
d5b3972807 added new color picking tests to repo 2013-11-30 14:07:26 -08:00
williame
125e1c53dc Got the colour conversion wrong in colour picking 2013-11-30 21:44:53 +01:00
SoftCoder
f217db38f1 - changed to git version stamp 2013-11-29 13:13:30 -08:00
SoftCoder
1a8673feb3 - bugfix for will's color pick optimization (was not properly doing cell selection) 2013-11-28 22:58:13 -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
filux
d0836a6573 transfered .tx and tx-cleanup to data, added license/readme, basic configuration 2013-11-28 07:58:09 +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
f6806bd1ea - added unit tests for arabic handling in fribidi
- added default property value for right to left mixed in english.lng
- fixed bug in arabic.lng file
2013-11-20 00:22:39 +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
39b41cdfea - code cleanup based on additional gcc warnings 2013-11-19 06:29:30 +00:00
Mark Vejvoda
4a4c7fbfde - code cleanup based on additional gcc warnings 2013-11-19 06:24:22 +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