Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
4787 commits 10 branches 0 tags 41 MiB
Commit graph

4787 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
1588d31a7e fix test runner 2014-04-24 15:39:14 +02:00
Enno Rehling
921ab4947e fixing xml config for e2 and e3 2014-04-24 06:24:35 -07:00
Enno Rehling
985b4376df Merge branch 'master' of github.com:eressea/server 2014-04-24 05:50:20 -07:00
Enno Rehling
ac1149add5 this catalog does not work. why? 2014-04-24 14:47:44 +02:00
Enno Rehling
fece511afb Merge branch 'master' of github.com:eressea/server 2014-04-24 05:43:44 -07:00
Enno Rehling
bf8d37e4f8 reworded acknowledgements 2014-04-24 05:43:09 -07:00
Enno Rehling
e5b54ba953 Merge branch 'master' of github.com:eressea/server 2014-04-24 14:41:21 +02:00
Enno Rehling
c1b840b0b2 remove -Cef, parse any arguments as a file to run. 
new xml config file, work in progress, xinclude is broken
 2014-04-24 14:41:04 +02:00
Enno Rehling
a485f65562 new config files 2014-04-24 09:14:29 +02:00
Enno Rehling
b875ec872b Do not forget a chapter of orders. 2014-04-23 21:48:21 -07:00
Enno Rehling
cdcc8ae1d3 draft documentation, chapter overview and introduction 2014-04-23 21:36:34 -07:00
Enno Rehling
2cc21b265d remove GM command, remove gm-attributes from data when writing. 2014-04-22 21:42:32 -07:00
Enno Rehling
45168eb7e9 Merge branch 'master' of github.com:eressea/server 2014-04-22 07:21:34 -07:00
Enno Rehling
0d05ae77a3 remove stupid pragmas 2014-04-22 07:21:29 -07:00
Enno Rehling
a9986329d3 configuration data for E3, with new catalog. 2014-04-20 19:20:36 +02:00
Enno Rehling
fa5dc43b98 reorganizing the way configuration data is read (WIP) 2014-04-20 09:36:25 -07:00
Enno Rehling
ae68a1beaf add a script that runs all tests 
clean up the build scripta bit
bind ship type
 2014-04-12 05:25:21 +02:00
Enno Rehling
9aeb0f6b86 make build script figure out how many jobs to run 2014-04-11 19:41:17 -07:00
Enno Rehling
7358c48580 removing some naming conflicts that hapen when trying to re-enable amalgamation builds. 2014-04-11 19:41:17 -07:00
Enno Rehling
e99b69d76e need to cast this to (char) after all, for non-arm architectures. 2014-04-11 18:25:07 -07:00
Enno Rehling
bcc116825b latest cutest revision 2014-04-11 09:51:37 -07:00
Enno Rehling
b769be0f60 invalid tests for some architectures (char is not guaranteed to be signed or unsigned) 
fix tests on ARM
 2014-04-11 09:46:03 -07:00
Enno Rehling
0d8a196491 create report directory before writing reports.txt 2014-03-22 23:14:36 +01:00
Enno Rehling
b399356971 Revert "remove GM command" 
there is a saved attribute that needs this
This reverts commit 7e529f2b4c.
 2014-03-22 21:49:18 +01:00
Enno Rehling
5374332c00 Merge branch 'master' of github.com:eressea/server 2014-03-22 21:48:54 +01:00
Enno Rehling
dde8d35b3d test that EXPORT_REGIONS doesn't export anything else 2014-03-22 17:46:08 +01:00
Enno Rehling
6e0286b9a9 fix broken test 2014-03-22 17:43:34 +01:00
Enno Rehling
a986640ef6 json export for planes. untested. old tests broken. WIP 2014-03-22 01:56:00 -07:00
Enno Rehling
443583a6d6 fix intermittent test for e3 building owners 2014-03-17 08:52:33 +01:00
Enno Rehling
52e64ac418 this single-use macro doesn't belong there 2014-03-17 00:42:46 -07:00
Enno Rehling
1ec18b8fd9 better SWAP() macro 2014-03-17 00:28:13 -07:00
Enno Rehling
6e3ed568ea fix lua test for blessed harvest. 2014-03-17 08:21:35 +01:00
Enno Rehling
7e529f2b4c remove GM command 
this was a command from the very early days, when we had player-made
quests. It is no longer in use.
 2014-03-16 23:40:51 -07:00
Enno Rehling
0a0d70bb1d fix recruiting tests. peasant growth is too random to calculate. 
add current critbit module
 2014-03-17 06:47:57 +01:00
Enno Rehling
edae097591 updated bindings 2014-03-17 04:01:52 +01:00
Enno Rehling
fe7eb0bdeb fix gitmodules urls 2014-03-16 23:24:38 +01:00
Thomas Troeger
d2267db53a - minor spelling fix. 2014-03-16 23:18:00 +01:00
Thomas Troeger
33b68ecc19 - moved test for bug 1738 to better location. 2014-03-16 23:17:48 +01:00
Thomas Troeger
5b86fcb744 - added test to reproduce bug 1738. 2014-03-16 23:16:40 +01:00
Enno Rehling
a32e1cd127 fix missing includes 2014-03-16 22:34:05 +01:00
Enno Rehling
ac3401431c all build scripts get smart directory detection 2014-03-16 14:19:52 -07:00
Enno Rehling
632322a445 additional testing 
improved directory detection in build script
 2014-03-16 14:19:51 -07:00
Enno Rehling
5647905db3 Merge branch 'master' of github.com:eressea/server 2014-03-16 22:19:06 +01:00
Enno Rehling
480891ea2b new cutest submodule 2014-03-16 22:18:42 +01:00
Enno Rehling
eba61c1cda handle empty world 
and add tests for it
 2014-03-16 11:17:47 -07:00
Enno Rehling
e350b8a146 rebuild lua bindings 
fix json export
add a script to reset submodules
 2014-03-16 02:12:49 -07:00
Enno Rehling
7845de0403 json import of regions 
this is terribly untested, it barely compiles.
 2014-03-16 01:51:08 -07:00
Enno Rehling
3c706cf29b replace bool.h with autoconf 
Most of the bool configuration was already happening there, no reason
for a separate file.
 2014-03-15 22:24:18 -07:00
Enno Rehling
82aeb4b241 fix windows slashes 
cmake doesn't like backslashes, but has the tools to fix them
added a build script for VS2013 (Version 12)
 2014-03-15 22:02:49 -07:00
Enno Rehling
0ae8737062 rename MIN/MAX to _min/_max 2014-03-16 05:03:17 +01:00