Enno Rehling 51ec560f72 Merge branch 'master' into develop ... Conflicts: scripts/tests/e2/init.lua scripts/tests/e3/init.lua src/economy.c src/economy.test.c src/kernel/item.c src/modules/arena.c		2017-03-11 14:41:25 +01:00
..
castles.lua	bug 2281: add a failing test	2017-02-14 20:30:24 +01:00
init.lua	Merge branch 'master' into develop	2017-03-11 14:41:25 +01:00
items.lua	test giving stuff to 0.	2017-03-03 18:03:34 +01:00
morale.lua	fix morale change when region owner changes	2015-11-12 16:09:26 +01:00
parser.lua	functional test for GROW/BREED horses (Bug 1886)	2015-01-04 15:42:36 +01:00
rules.lua	Merge branch 'master' into develop	2017-03-11 14:41:25 +01:00
spells-e2.lua	configuration type-fixes: int to bool where appropriate (possibly incomplete)	2015-09-11 10:04:08 +02:00
spells.lua	add unit-test for casting spells, fix spell-casting (was looking for thisorder), all E3 tests pass again	2015-08-05 10:25:25 +02:00
stealth.lua	some tests don't belong in Lua	2015-11-09 14:06:55 +01:00