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
..
eressea	repair update_long_order and K_DESTROY handling according to discussion in https://bugs.eressea.de/view.php?id=2080	2015-08-04 22:47:55 +02:00
tests	Merge branch 'develop' into feature/bug-1588-magicpower-limit	2015-08-06 19:16:05 +02:00
tools	useful scripts for setting up the game.	2014-10-10 20:19:04 +02:00
config.lua	minimal script to load configuration in an interactive session	2015-03-07 14:33:38 +01:00
fix1984.lua	refactor, move give_cmd into give.c	2014-11-03 08:44:26 +01:00
map.lua	map script needs to set up the script folder.	2014-08-12 23:06:44 +02:00
newplayer.lua	try setting origin manually	2015-07-31 14:10:30 +02:00
populate.lua	require trees for new player regions	2015-07-28 10:51:14 +02:00
reports.lua	fix string concatenation operator	2014-10-16 14:33:20 +02:00
run-tests-e2.lua	failed tests abort runtests and return an error code	2015-05-21 08:29:22 +02:00
run-tests-e3.lua	failed tests abort runtests and return an error code	2015-05-21 08:29:22 +02:00
run-tests.lua	failed tests abort runtests and return an error code	2015-05-21 08:29:22 +02:00
run-turn.lua	use the syntax_error function where appropriate.	2015-05-18 11:34:52 +02:00