server

Author	SHA1	Message	Date
Enno Rehling	397a157fdc	Merge branch 'develop' into feature/bug-1588-magicpower-limit Conflicts: scripts/tests/e2/init.lua src/battle.c src/bind_unit.c src/kernel/spellid.h src/magic.c src/magic.h	2015-08-06 19:16:05 +02:00
Enno Rehling	4a8707b06d	fix a fall-through in jsonconf causing an error message. add tests for pool, not working because of missing GIVEITEM on JSON-configured races (TBD).	2014-07-05 18:21:20 -07:00
Enno Rehling	198e95d6e2	slickedit project updat	2014-06-21 07:33:55 -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	e27bde06ac	bindings for error logging, phase 1. better error reporting for json parse errors.	2014-06-13 13:02:03 -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	fa98528d72	remove old SQL patch code, we have sqlite now. rearrange the SlickEdit projects.	2014-06-11 22:21:52 -07:00
Enno Rehling	2578a15318	remove gmtool from static lib	2014-06-11 07:03:17 -07:00
Enno Rehling	bbc0efabe8	slickedit project files	2014-06-09 20:52:18 -07:00