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
..
eressea	remove rtype->uget funpointer, and lua callbacks.	2017-03-04 20:59:43 +01:00
tests	Merge branch 'master' into develop	2017-03-11 14:41:25 +01:00
tools	always call close() in lua when you're done with a file.	2016-09-11 19:32:54 +02:00
config.lua
fix1984.lua
fixfamiliars.lua
kill-planes.lua	verify data after deleting planes, do not delete plane 50 (yet)	2016-08-18 19:11:26 +02:00
map.lua
newplayer.lua	control log level from command line (with -l, like -v)	2016-07-30 22:46:57 +02:00
populate.lua
reports.lua
run-tests-e2.lua	no snowglobe in E3	2015-12-26 11:20:37 +01:00
run-tests-e3.lua	no snowglobe in E3	2015-12-26 11:20:37 +01:00
run-tests.lua	failed tests abort runtests and return an error code	2015-05-21 08:29:22 +02:00
run-turn.lua	fix bad read_orders call	2017-02-12 06:24:25 +01:00