Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,272 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

495 Commits

Author SHA1 Message Date
Enno Rehling 091a8de6b6 Merge branch 'master' into develop 
Conflicts:
	src/kernel/race.c
	src/spy.c
 2017-04-22 18:38:34 +02:00
Enno Rehling e530543022 demon stealth: cloak as other race. 
added a Lua test.
get_race oob fix (potential crash).
 2017-04-22 18:33:47 +02:00
Enno Rehling 7e4f55a1ac enable ponnuki 2017-04-22 13:53:06 +02:00
Enno Rehling 91fc9f9a1e enable ponnuki 2017-04-22 13:52:45 +02:00
Enno Rehling b9b1a71d89 Merge branch 'master' of github.com:eressea/server 2017-04-09 13:56:10 +02:00
Enno Rehling aebc7d4cac BUG 2138: Ponnuki is dead, long live Ponnuki 
https://bugs.eressea.de/view.php?id=2318
 2017-04-09 13:40:42 +02:00
Enno Rehling aeeb13bb53 BUG 2318: Go, Ponnuki, Go! 
https://bugs.eressea.de/view.php?id=2318
 2017-04-09 13:35:55 +02:00
Enno Rehling 1c509485f7 Merge pull request #682 from ennorehling/develop 
cmake changes, skillmod rewrite
 2017-04-08 22:14:53 +02:00
Enno Rehling 989ff65ca9 BUG 2318: disable ponnuki 2017-04-08 22:08:19 +02:00
Enno Rehling 599b4a8311 BUG 2318: disable ponnuki 2017-04-08 22:07:12 +02:00
Enno Rehling 7c680481de iron golems can build dwarf armor in E3. 2017-04-02 15:43:14 +02:00
Enno Rehling 8bb7cf8878 WIP: this error has a new message. 2017-04-02 15:39:50 +02:00
Enno Rehling e72155a563 WIP: reimplemented production modifiers. 
The system itself seems to work, but some Lua tests are still failing.
 2017-04-02 14:43:53 +02:00
Enno Rehling 37f3c02ceb do not write reports in tests. 2017-03-30 23:18:50 +02:00
Enno Rehling 4115b321b3 add tests for additional (race-related) production rules. 2017-03-30 21:00:35 +02:00
Enno Rehling 5479d94206 develop branch gives different error message for greatbow. 2017-03-30 20:40:03 +02:00
Enno Rehling 8187530794 disable a test that currently is not passing 2017-03-30 19:15:49 +02:00
Enno Rehling d7fa405dbe Merge branch 'test-races' into develop 2017-03-30 19:09:32 +02:00
Enno Rehling 570a25f6dd split production rules by games 2017-03-30 19:08:33 +02:00
Enno Rehling 29c2e0b8f4 additional testing for race-related production rules. 2017-03-29 17:59:39 +02:00
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 7c19746d84 adjust adamantium test to new rule. 2017-03-26 20:33:48 +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 bd40de1142 additional testing for production rules. 2017-03-26 17:38:45 +02:00
Enno Rehling dcf1c7138b make region:set_resource do the right thing 
also for adamantium
 2017-03-26 14:33:14 +02:00
Enno Rehling ec375baa03 Zwergenbonus gibt es nur in E2 2017-03-26 12:48:44 +02:00
Enno Rehling afd1cb4039 cherry-pick test for mine and smithy 2017-03-26 12:45:38 +02:00
Enno Rehling b44c5e54bf Neuer Befehlespräfix: ! zur Unterdrückung von Fehlern. 2017-03-25 11:18:48 +01:00
Enno Rehling 485e8f0ce4 Revert "add failing test for skill bonus from mine, start work" 
This reverts commit ab87b1da85.
 2017-03-23 19:28:56 +01:00
Enno Rehling ab87b1da85 add failing test for skill bonus from mine, start work 2017-03-23 18:51:30 +01:00
Enno Rehling 68e36e9252 test that adamantium requires a mine 2017-03-23 08:29:24 +01:00
Enno Rehling 17145eaf10 make region:set_resource do the right thing 
also for adamantium
 2017-03-22 20:37:09 +01:00
Enno Rehling bdf7411954 backfill a test for smithies 2017-03-18 10:33:52 +01:00
Enno Rehling ae6d9f0e1a Zwergenbonus gibt es nur in E2 2017-03-18 08:00:35 +01:00
Enno Rehling 4c67e0603b remove attribs from rtype (it's only in rtype->construction that we use it?) 
test to verify that mine bonus for iron works as advertised.
change the oder of arguments for faction.create (race is the only thing not optional).
 2017-03-17 22:46:10 +01:00
Enno Rehling 51ec560f72 Merge branch 'master' into develop 
Conflicts:
	scripts/tests/e2/init.lua
	scripts/tests/e3/init.lua
	src/economy.c
	src/economy.test.c
	src/kernel/item.c
	src/modules/arena.c
 2017-03-11 14:41:25 +01: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 50bdc71c1b kill lua_canuse_item and itype->canuse 2017-03-04 17:27:13 +01:00
Enno Rehling d976ee6f67 special cases, not callbacks, for money and horses. 2017-03-03 19:17:20 +01:00
Enno Rehling af28da365d test giving silber to peasants. 2017-03-03 18:53:39 +01:00
Enno Rehling a265bc9cdb test giving stuff to 0. 2017-03-03 18:03:34 +01:00
Enno Rehling 681a4bdaa8 dolphins are animals, but not horses. 2017-03-03 17:27:51 +01:00
Enno Rehling 259d7d9e80 add a test for giving horses to 0. 
should add those horses to the region.
remove horses from test that is about 50% silver.
 2017-03-03 16:50:43 +01:00
Enno Rehling 6e8e163099 make item allow/deny XML easier to read, fix code 2017-03-03 09:56:27 +01:00
Enno Rehling b0baba4405 bug 2290: sawmill bonus was broken. 
not pleased with the test, which is in lua only.
https://bugs.eressea.de/view.php?id=2290
 2017-03-02 19:21:11 +01:00
Enno Rehling e2e602e7ba fix off-by-one calendar, bug 2288 2017-03-01 08:28:15 +01:00
Enno Rehling 17d410345f failing test for bug 2288 2017-02-28 21:50:49 +01:00
Enno Rehling 2eb88c472c have I bollocksed up the deny/allow rules? looks like it 2017-02-28 14:22:59 +01:00
Enno Rehling c276b5a43c generate error, not crash. 
todo: fix items
 2017-02-28 14:22:59 +01:00
Enno Rehling 5a01eae522 make item_use function crash if new and old rules do not agree 
add a 'test' function to E3 that exercises all those items
 2017-02-28 14:22:59 +01:00