Commit Graph

15 Commits

Author SHA1 Message Date
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
Enno Rehling 27d66adc74 eliminate duplicate keyword warning 2017-03-18 21:33:47 +01:00
Enno Rehling 1b93c14806 Test E2 items in E2 only.
Remove eye of demon (broken item).
2017-02-27 18:50:48 +01:00
Enno Rehling 794dae11cf remove artsculpture and genericbuilding.
deal with buildings having an unknown type.
2017-02-24 14:29:14 +01:00
Enno Rehling 979f3460d6 Bug 1805: re-enable NMR warnings
https://bugs.eressea.de/view.php?id=1805
move warnings to the top of the list of errors in the NR
2015-07-03 15:31:57 +02:00
Enno Rehling 90dd700487 BREED/PLANT/GROW are technically the same command, merge them.
The new parser makes this easy.
2015-01-04 15:11:49 +01:00
Enno Rehling bbd4e31cf9 Merge branch 'loot' of github.com:CTD1/eressea-server-bugfixing into CTD1-loot
Conflicts:
	res/core/de/strings.xml
2014-11-02 10:02:30 +01:00
Enno Rehling 96d5544b1f Bug 2032: rename FIGHT back to COMBAT 2014-10-20 17:13:32 +02:00
CTD 1c7075573b Plündern
Neues Kommando Plündern für die Monster (kann über XML-Option auch für
Spieler freigeschaltet werden)
2014-10-16 14:45:21 +02:00
Enno Rehling 3e829e2880 support for itoab with smaller bases and larger numbers.
also a missing English message (museum-related)
2014-09-29 18:32:12 +02:00
Enno Rehling e87b1cf372 an experiment to have deterministic sort order for known factions in the report. 2014-08-25 00:06:33 +02:00
Enno Rehling beacb850c6 fix MAKE TEMP, for real this time. I hate skip_token and all that stuff. 2014-08-23 00:37:33 +02:00
Enno Rehling 59ccf23db6 Repair MAKE, which broke when I changed MAKE TEMP.
You can now also write MAKETEMP as one word, and we treat it that way.
Added unit test coverage for MAKE order parsing.
2014-08-17 14:47:39 +02:00
Enno Rehling c79dd33bfb smarter processing of MAKE TEMP.
the order gets its own keyword. parsing is hard - composite commands are an anti-pattern.
this eliminates a lot of unnecessary mallocs for pushing/poping parser state.
2014-08-16 11:41:19 +02:00
Enno Rehling bd2809a975 removing the core directory (moving to res and scripts).
it's from when open-source Eressea was limited, and we no longer need the separation.
JSON configuration for ship flags.
2014-07-28 14:27:30 +02:00