Enno Rehling 091a8de6b6 Merge branch 'master' into develop ... Conflicts: src/kernel/race.c src/spy.c		2017-04-22 18:38:34 +02:00
..
adamantium.lua	Merge branch 'master' into develop	2017-03-26 21:01:21 +02:00
destroy.lua	remove attribs from rtype (it's only in rtype->construction that we use it?)	2017-03-17 22:46:10 +01:00
e2features.lua	Merge branch 'master' into develop	2017-04-22 18:38:34 +02:00
guard.lua	remove attribs from rtype (it's only in rtype->construction that we use it?)	2017-03-17 22:46:10 +01:00
init.lua	Merge branch 'test-races' into develop	2017-03-30 19:09:32 +02:00
items.lua	additional testing for production rules.	2017-03-26 17:38:45 +02:00
movement.lua	remove attribs from rtype (it's only in rtype->construction that we use it?)	2017-03-17 22:46:10 +01:00
production.lua	WIP: this error has a new message.	2017-04-02 15:39:50 +02:00
shiplanding.lua	remove attribs from rtype (it's only in rtype->construction that we use it?)	2017-03-17 22:46:10 +01:00
ships.lua	remove attribs from rtype (it's only in rtype->construction that we use it?)	2017-03-17 22:46:10 +01:00
spells.lua	remove attribs from rtype (it's only in rtype->construction that we use it?)	2017-03-17 22:46:10 +01:00
stealth.lua	remove attribs from rtype (it's only in rtype->construction that we use it?)	2017-03-17 22:46:10 +01:00
undead.lua	remove attribs from rtype (it's only in rtype->construction that we use it?)	2017-03-17 22:46:10 +01:00