Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
server/scripts/tests
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
..
e2 Merge branch 'master' into develop 2017-03-26 21:01:21 +02:00
e3 Merge branch 'master' into develop 2017-03-26 21:01:21 +02:00
bindings.lua move renumber command to a separate module. 2016-11-15 23:34:20 +01:00
common.lua Merge branch 'master' into develop 2017-03-26 21:01:21 +02:00
config.lua remove attribs from rtype (it's only in rtype->construction that we use it?) 2017-03-17 22:46:10 +01:00
economy.lua cherry-pick test for mine and smithy 2017-03-26 12:45:38 +02:00
faction.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 feature/test-cleanup 2015-07-01 21:24:44 +02:00
items.lua additional testing for production rules. 2017-03-26 17:38:45 +02:00
laws.lua Neuer Befehlespräfix: ! zur Unterdrückung von Fehlern. 2017-03-25 11:18:48 +01:00
locale.lua new test script, rule-independent tests. 2014-08-07 13:19:19 +02:00
magicbag.lua remove attribs from rtype (it's only in rtype->construction that we use it?) 2017-03-17 22:46:10 +01: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
orders.lua Neuer Befehlespräfix: ! zur Unterdrückung von Fehlern. 2017-03-25 11:18:48 +01:00
pool.lua remove attribs from rtype (it's only in rtype->construction that we use it?) 2017-03-17 22:46:10 +01:00
process.lua remove attribs from rtype (it's only in rtype->construction that we use it?) 2017-03-17 22:46:10 +01:00
regions.lua new test script, rule-independent tests. 2014-08-07 13:19:19 +02:00
report.lua remove attribs from rtype (it's only in rtype->construction that we use it?) 2017-03-17 22:46:10 +01:00
settings.lua new test script, rule-independent tests. 2014-08-07 13:19:19 +02:00
storage.lua remove attribs from rtype (it's only in rtype->construction that we use it?) 2017-03-17 22:46:10 +01:00
study.lua remove attribs from rtype (it's only in rtype->construction that we use it?) 2017-03-17 22:46:10 +01:00
xmas.lua remove attribs from rtype (it's only in rtype->construction that we use it?) 2017-03-17 22:46:10 +01:00