SoftCoder
3bb4f7ab40
Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source
2013-12-08 20:09:47 -08:00
SoftCoder
e718f78931
- corrected compile warnings for unit test
2013-12-08 20:08:44 -08:00
Tom Reynolds
21bda9f691
testing travis changes
2013-12-09 01:56:11 +01:00
Tom Reynolds
78eb119c29
get build system info for travis CI
2013-12-09 01:15:06 +01:00
Tom Reynolds
09fb20182a
- Enable clang builds for Travis CI
...
- build-mg.sh: Switch to clang build if CC and CXX env vars both contain 'clang'
2013-12-08 23:00:25 +01:00
Tom Reynolds
2a3ff97813
YML is not XML
2013-12-08 22:12:33 +01:00
Tom Reynolds
a6ae9ec79b
- mk/linux/setupBuildDeps.sh:
...
- add option for silent installs (APT only for now)
- remove autotools, subversion dependency
- add check for availability of 'git' command
- replace svnversion by git commit output
- add .travis.xml as per http://about.travis-ci.org/docs/user/languages/cpp/
- make git ignore megaglest man page as generated by Linux builds
2013-12-08 22:03:34 +01:00
SoftCoder
822f7884f2
update ignore list
2013-12-06 12:09:51 -08:00
SoftCoder
02d41bd5f7
fixed windows build
2013-12-06 09:08:47 -08:00
SoftCoder
25dfdb7e08
- added missing file
2013-12-05 23:35:24 -08:00
SoftCoder
16c857d1b0
- added missing file
2013-12-05 23:21:05 -08:00
SoftCoder
6ae1d179bb
- updated for proper build on Mac
2013-12-04 14:54:02 -08:00
SoftCoder
f9e217df94
- bugfix so Mac builds
2013-12-04 13:34:00 -08:00
SoftCoder
1e50f1cb93
- updated vc++ 2010 build file to use git
2013-12-02 12:59:36 -08:00
SoftCoder
7d4bbeadfd
- added windows deps to ignore list
2013-12-02 09:48:23 -08:00
SoftCoder
c97825d898
- updated windows x64 build to use git revision stamp
2013-12-02 09:45:46 -08: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
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
Mark Vejvoda
8480748d47
Merge pull request #2 from williame/master
...
Colour picking uses prng sequence; Option to disable G3D interpolation
2013-11-28 20:25:07 -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
Tom Reynolds
fb749c6af3
Ensure gameserver start script is included in binary archives
2013-11-24 15:17:37 +00:00
Tom Reynolds
75298fcd72
Add script to start a headless game server
2013-11-24 15:15:34 +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
fe07998816
- updated with patches from hasufell related to fribidi detection
2013-11-19 16:23:31 +00:00
Mark Vejvoda
983b4ca9a2
- experimental CLANG compile support
2013-11-19 08:04:38 +00:00
Mark Vejvoda
5284d9c45c
- disabled microsoft specific warning which is trying to coax us into writing non friendly cross platform code
2013-11-19 07:50:08 +00:00
Mark Vejvoda
36a440f9e3
- disabled microsoft specific warning which is trying to coax us into writing non friendly cross platform code
2013-11-19 07:45:53 +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
