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
|
39a5b55753
|
bugfix? mine grants +1 to laen production.
not certain that this is actually a bug.
|
2017-03-26 17:40:13 +02:00 |
|
Enno Rehling
|
acfb666539
|
remove rtype->uget funpointer, and lua callbacks.
fix a missing lua_pop that trashed the heap.
|
2017-03-04 20:59:43 +01:00 |
|
Enno Rehling
|
d976ee6f67
|
special cases, not callbacks, for money and horses.
|
2017-03-03 19:17:20 +01:00 |
|
Enno Rehling
|
6e27adb892
|
remove pointless <resourcelimit/> wrapper from XML.
|
2017-02-26 14:00:20 +01:00 |
|
Enno Rehling
|
c3b0b9e8b3
|
fix missing limit-flags.
|
2017-02-26 13:47:22 +01:00 |
|
Enno Rehling
|
84c6a4b7b5
|
remove last vestiges of the rm_* material names
|
2017-02-25 21:25:55 +01:00 |
|
Enno Rehling
|
d039ca2b2e
|
fix display of sapling and mallornsapling.
remove mateiral from XML where it's not needed.
|
2017-02-25 21:07:13 +01:00 |
|
Enno Rehling
|
f06d86007c
|
seed normalization (broken)
|
2017-02-23 22:08:16 +01:00 |
|
Enno Rehling
|
5e2903258c
|
kill old <guard/> element from XML
|
2017-02-23 14:45:19 +01:00 |
|
Enno Rehling
|
2c0f708d1b
|
WIP: remove at_guard, GUARD_TREES and GUARD_MINING
TODO: fix tests
TODO: write new guard coverage
|
2016-10-30 09:18:19 +01:00 |
|
Enno Rehling
|
e2808eeea9
|
reqsize defaults to 1.
remove default values from xml to make it smaller and simpler.
|
2016-08-06 13:53:07 +02:00 |
|
Enno Rehling
|
c634a01a3f
|
Bug 1949: Zauberbeutelverhalten (magic bag tests & config changes)
https://bugs.eressea.de/view.php?id=1949
|
2015-07-01 22:13:24 +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 |
|