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

231 commits

Author SHA1 Message Date
Enno Rehling
42a86fc910 make sure that the skill bonus for races is signed, even on ARM where 
that is not necessarily the default.
 2014-06-09 21:36:43 -07:00
Enno Rehling
3dda5d3033 apply USE_LIBXML consistently, so tests can be built without libxml2 2014-06-09 20:51:29 -07:00
Enno Rehling
a304b981d5 remove archetypes, they are not used by any existing game. 
make compiling with libxml2 optional (USE_LIBXML2)
disable xml reports
 2014-06-09 19:05:17 -07:00
Enno Rehling
3c4b6b9dd4 rename message.[hc] to messages.[hc] in kernel because of naming conflict with util/ 
begin json config files (WIP)
 2014-06-09 09:56:49 -07:00
Enno Rehling
dceff481d7 json config files, beginning with races 2014-06-07 22:17:48 -07:00
Enno Rehling
f43d8a3297 remove old gamecode-diabling logic 
it was old, and not in use.
 2014-06-07 10:36:50 -07:00
Enno Rehling
9940025a96 eliminate multiple warnings about missing default order 
fix e3 catalog file syntax
 2014-06-02 07:31:46 +02:00
Enno Rehling
e17a3fc8fa eliminate remaining traces of the wisps spell 2014-06-02 07:22:07 +02:00
Enno Rehling
08c3d08d7d fix config.xml for test games 
update log levels for some common messages.
 2014-06-02 05:42:56 +02:00
Enno Rehling
6f29e4dab5 improve logging information (missing race, log levels) 
do nothing when thre is no peasant blood
 2014-06-01 11:07:22 +02:00
Enno Rehling
d388a94f36 report missing itemtype before crashing 2014-05-24 20:35:00 -07:00
Enno Rehling
7038b021de fix counting of units, making it slower but more correct 2014-05-24 20:25:06 -07:00
Enno Rehling
649a43a27e sqlite updater, rewrite 2014-05-16 22:49:28 -07:00
Enno Rehling
515b582144 Merge branch 'master' of github.com:eressea/server 2014-05-10 11:45:14 -07:00
Enno Rehling
c2329f7f2b changing unsigned flags to regular ints 
the storage library does not understand unsigned at the moment, and using the highest order bit causes trouble
new version of datafile
 2014-05-10 18:57:04 +02:00
Enno Rehling
0d087d6bb1 Merge branch 'master' of github.com:eressea/server 2014-05-05 19:15:32 -07:00
Enno Rehling
1e7e5877a1 Merge branch 'master' of github.com:eressea/server 2014-05-05 19:14:55 -07:00
Enno Rehling
86bc4e7aef reading and writing the NPC flag was broken, because flags were a fully loaded unsigned int. making it an int instead, and adding a test. 
fixing a bad test in which shadowmasters were deserting to faction null (causing a crash).
 2014-05-05 19:11:40 -07:00
Enno Rehling
465f3f7ce9 Merge branch 'master' of github.com:eressea/server 2014-05-05 00:00:10 -07:00
Enno Rehling
19a21772e4 stop tests from crashing 2014-05-04 15:54:56 -07:00
Enno Rehling
cb458db9a1 updating eressea.db, not with a fixed game-id 2014-05-04 22:49:06 +02:00
Enno Rehling
535a9e6e53 fix number of units in the report header 2014-04-26 12:24:51 -07:00
Enno Rehling
35c2baafbe do not read turn file for turn 0 2014-04-25 07:47:23 +02:00
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
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
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
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
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
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
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
edae097591 updated bindings 2014-03-17 04:01:52 +01:00
Enno Rehling
a32e1cd127 fix missing includes 2014-03-16 22:34:05 +01:00
Enno Rehling
632322a445 additional testing 
improved directory detection in build script
 2014-03-16 14:19:51 -07: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