Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
server/scripts/tests/e2
History
Enno Rehling f2bb51b3ab Merge branch 'master' into develop 
Conflicts:
	res/adamantium.xml
	res/core/resources/laen.xml
	scripts/tests/common.lua
	scripts/tests/e2/adamantium.lua
	scripts/tests/e2/e2features.lua
	scripts/tests/e2/items.lua
	scripts/tests/items.lua
	src/bind_unit.c
	src/economy.test.c
	src/kernel/resources.c
	src/util/attrib.c
 		2017-03-26 21:01:21 +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 Zwergenbonus gibt es nur in E2 2017-03-26 12:48:44 +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 make region:set_resource do the right thing 2017-03-26 14:33:14 +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
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