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

308 commits

Author SHA1 Message Date
Enno Rehling
0675c50c7f keyword lookup macro 2014-06-16 23:05:39 -07:00
Enno Rehling
5c78a3883e cleaning up terrains, reading race flags from a JSON array 2014-06-16 22:43:40 -07:00
Enno Rehling
33928568cf finally have all the scaffolding to write a test with ships. 
configure terrain flags from json.
ships are always allowed to enter SEA regions.
 2014-06-16 22:19:19 -07:00
Enno Rehling
b40ddaeaa1 add test for keyword aliases, add keyword to strings for reverse lookup 2014-06-16 20:41:08 -07:00
Enno Rehling
0af5e96e3a Renaming keyword tokens to English. 2014-06-16 20:16:06 -07:00
Enno Rehling
27374a9329 put keywords into a namespace before giving them english keys (tbd). 2014-06-16 18:45:32 -07:00
Enno Rehling
249a4390c4 read keyword translations from JSON configuration. 2014-06-16 11:30:23 -07:00
Enno Rehling
645a7fcde6 fix keyword translations, they use critbit, not tokens 2014-06-16 10:32:30 -07:00
Enno Rehling
6a20594fd3 renamedtest files in the rest of the makefiles, too. oops. 2014-06-16 08:07:08 -07:00
Enno Rehling
125fd519a8 rename test files. 
add tests for keyword.c, incomplete.
 2014-06-16 08:01:59 -07:00
Enno Rehling
c8dc6be6f2 rename get_keyword, because something else should have that name. 2014-06-16 07:19:22 -07:00
Enno Rehling
64e0c221ec directions can now be read from json configuration. 
rename a couple of functions for more consistency across modules.
 2014-06-15 22:17:08 -07:00
Enno Rehling
acbef7a3a0 fix missing locales initialization 2014-06-15 21:19:47 -07:00
Enno Rehling
a9f0538d8e keyword_t and direction_t are moving into their own module. 
direction parser gets new initialization function, for use in jsonconf later.
add unit tests for directions.
 2014-06-15 18:34:39 -07:00
Enno Rehling
812cb98dff begin binding locales (need to init_locales in the right place, still). 
fix indentation in some places.
add some assertions.
 2014-06-14 07:52:32 -07:00
Enno Rehling
24dc006e43 fix json config for terrains, some other stuff. 2014-06-13 17:36:05 -07:00
Enno Rehling
e27bde06ac bindings for error logging, phase 1. 
better error reporting for json parse errors.
 2014-06-13 13:02:03 -07:00
Enno Rehling
97c17b1afa Merge branch 'master' of github.com:eressea/server 2014-06-13 08:29:01 -07:00
Enno Rehling
6e56c56d39 read ships from config file (only very basic) and create them in a lua test. 2014-06-13 08:28:33 -07:00
Enno Rehling
5a82350037 fix broken xmlreader after most recent cahnges to 
race/ship_type/building_type creation functions.
 2014-06-12 22:30:13 -07:00
Enno Rehling
d503937999 working on making json config understand ships and buildings. 
new tests in progress.
remove giveitem.c attribute, the name clashed with a trigger,
and it was only part of an arena that is gone from the game, I think.
 2014-06-12 22:14:07 -07:00
Enno Rehling
b84bf7ba56 add json configuration parser to lua bindings. 2014-06-12 17:39:09 -07:00
Enno Rehling
8d2df36430 clean up indentation. 
fix duplicate header guard names.
 2014-06-12 17:38:45 -07:00
Enno Rehling
fa98528d72 remove old SQL patch code, we have sqlite now. 
rearrange the SlickEdit projects.
 2014-06-11 22:21:52 -07:00
Enno Rehling
28726e2bea update cmake to compile without sqlite3, curses or libxml2 installed. 
This is not actually recommended, but your system may not have
this,and you should still be able to contribute. also, libxml2 is on
the way out, I am beginning to really hate it.

Moving a couple of files around.
 2014-06-11 20:30:34 -07:00
Enno Rehling
9605fe27ae add a version number header for release management. 
add build number to creport.
 2014-06-11 07:01:06 -07:00
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
Steffen Mecke
dc3eea0c70 take best unit and count amulet at most once for guards blocking movement 2014-06-04 11:04:17 +02: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
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
0ae8737062 rename MIN/MAX to _min/_max 2014-03-16 05:03:17 +01:00
Enno Rehling
70cee3c6e5 remove any dependency on stat. 2014-03-15 20:41:58 -07:00
Enno Rehling
1a4cb16ea8 fix the unused macro, remove inline functions 
simplification is good
 2014-03-15 20:33:43 -07:00
Enno Rehling
8e42cb8143 remove old inline cruft 
fewer macros = better
 2014-03-15 14:52:04 -07:00
Enno Rehling
8db8dbeefd fix usage of access() 
those were the wrong constants.
 2014-03-15 14:36:55 -07:00
Enno Rehling
9fc926864e Fixes for Visual C++ 
snprintf and strncasecmp are not that.
_access needs to be fixed on gcc, next.
 2014-03-15 12:35:20 -07:00
Enno Rehling
1a7d892a96 use cmake for autoconf, slim down platform.h 2014-03-15 19:29:11 +01:00
Enno Rehling
fc1a56d46a rename export to json. 
this may or may not have been a good idea, but for now, that is what I
choose.
 2014-03-14 22:30:07 -07:00
Enno Rehling
7256b4c04f fix json export test 
using features from new storage module version.
 2014-03-13 23:59:26 -07:00
Enno Rehling
dd3de9a1d7 bindings for the json export. 
+ unit test (incomplete).
 2014-03-13 15:33:44 +01:00
Enno Rehling
e8b28725e1 do not run tolua inside MSVC 
The cmake rules for this do not work.
 2014-03-08 04:28:04 -08:00
Enno Rehling
e9bc92608c add the .pkg files so we do not need to build them. sometimes tolua is not installed. 2014-03-08 10:30:39 +01:00
Enno Rehling
e9b9c9783a export factions, too 
give this a header and some flags so we can choose in detail what to
export.
 2014-03-07 08:03:53 -08:00
Enno Rehling
804b8192ea Merge branch 'master' of https://github.com/eressea/server 2014-03-06 19:14:16 -08:00
Enno Rehling
528dd4b81f remove latin1 characters from some files 
experimenting with .gitattributes some more
 2014-03-06 19:12:12 -08:00
Enno Rehling
40d7d236ac export to a stream 
can write a dict of simple regions now.
 2014-03-06 08:05:26 -08:00
Enno Rehling
18203cfdbf begin writing a map exporter 2014-03-06 07:15:43 -08:00
Enno Rehling
afe355e9b9 begin creating a make install target. 
add a script to set up PATHs for cmake
 2014-03-02 12:20:49 -08:00
Enno Rehling
ace886a2d3 added a test for saving/loading descriptions (bug 1984). 
added bindings for ship descriptions.
fixed test framework, so make test will show failures in lua.
 2014-03-02 10:55:35 -08:00
Enno Rehling
bf2bb7449b move bindings into src/ make the code compile from scratch again. 2014-02-22 00:32:59 -08:00
Enno Rehling
d9abce13a1 add lua integration tests to make test. 2014-02-18 06:08:37 +01:00