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

8253 Commits

Author SHA1 Message Date
Enno Rehling 4d07782e7d Merge branch 'master' into develop 
Conflicts:
	scripts/tests/e2/init.lua
	scripts/tests/e3/init.lua
	src/economy.c
	src/economy.test.c
 2017-03-06 06:27:31 +01:00
Enno Rehling 33b98b59ec when make_frac cannot find a gcd, cheat. 2017-03-05 22:28:08 +01:00
Enno Rehling e233ed4344 eliminate source of randomness from test 2017-03-05 19:23:47 +01:00
Enno Rehling 5c1fb83c47 Merge branch 'hotfix/names' of https://github.com/ennorehling/eressea.git 2017-03-05 18:57:35 +01:00
Enno Rehling cdb65dfd36 Turns out: We did not have a singular form of sapling. 2017-03-05 18:57:28 +01:00
Enno Rehling dbe5980577 CR is missing saplings? 2017-03-05 18:47:49 +01:00
Enno Rehling f699c32f0e BUG 2298: fix NR display. 
always use correct singular or plural form.
 2017-03-05 18:25:15 +01:00
Enno Rehling 8d7f966391 BUG 2298: fix CR output. 
always use the plural form.
 2017-03-05 18:23:24 +01:00
Enno Rehling 0379a17350 make report_resource return an rtype, not a name. 2017-03-05 17:42:57 +01:00
Enno Rehling d6ce1d9cfe Add a test for singular resources. 2017-03-05 17:26:00 +01:00
Enno Rehling 52dd11a28f create a failing test for stones in the NR. 2017-03-05 17:18:17 +01:00
Enno Rehling 45862a06d0 Add a good test for the NR. 
TODO: make it fail.
 2017-03-05 16:55:11 +01:00
Enno Rehling 83f170541b short unit-test for resources in the CR. 
now complains because Bauern!=Bauer.
TODO: crtag is shit.
 2017-03-05 15:51:04 +01:00
Enno Rehling 6a87625409 refactor cr_output_resources for easy testing. 
Write a (failing) test that checks first resource is silver.
 2017-03-05 15:26:04 +01:00
Enno Rehling aa662e65d2 eliminate R_PERSON hack. 2017-03-05 13:58:11 +01:00
Enno Rehling ae6a4ca339 new clibs submodule 2017-03-05 11:42:11 +01:00
Enno Rehling 5675ef6091 clean and extend the enum of resources. 2017-03-05 11:10:59 +01:00
Enno Rehling 614978a343 add a breaking test for the CR. 
trees and peasants are not reported correctly.
 2017-03-05 10:26:39 +01:00
Enno Rehling caa8159428 eliminate duplicate string definition 2017-03-05 09:52:17 +01:00
Enno Rehling 21b01aa4c2 Merge pull request #665 from ennorehling/develop 
the latest in function-pointer removal
 2017-03-04 21:18:13 +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 040485504d Merge pull request #664 from ennorehling/master 
last-minute Bugfixes für 3.11
 2017-03-03 22:18:23 +01:00
Enno Rehling d9d542cfee we only call these when target is 0, anyway. 2017-03-03 19:19:33 +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 591a5b67d3 add missing files 2017-03-03 16:38:28 +01:00
Enno Rehling 5b1e786fb2 fix bad strtok call 2017-03-03 10:35:34 +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 0a5d7bffa5 Merge remote-tracking branch 'upstream/develop' into develop 2017-03-02 19:49:29 +01:00
Enno Rehling bec7a338ab fix mail processing scripts 2017-03-02 19:49:06 +01:00
Enno Rehling b987f6e5e6 Merge branch 'master' into develop 2017-03-02 19:47:49 +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 4502141c5b bug 2292: set mailcmd from eressea.ini 
this fixes https://bugs.eressea.de/view.php?id=2292
 2017-03-02 18:28:00 +01:00
Enno Rehling 45854851ae bug 2292: allow packice to be guarded again. 
https://bugs.eressea.de/view.php?id=2292
 2017-03-02 18:08:58 +01:00
Enno Rehling 326f543ece gcc reports unused variable. 
and for once, that points to a bug!
 2017-03-02 13:01:27 +01:00
Enno Rehling 3cb24299fa bug 2292: only land regions can be guarded. 
https://bugs.eressea.de/view.php?id=2292
Also adding tests for every other failure reason.
 2017-03-02 12:39:21 +01:00
Enno Rehling e826b7af22 fix mail processing scripts 2017-03-02 08:08:35 +01:00
Enno Rehling 912a8b5412 bug 2291: json settings must not override eressea.ini. 
https://bugs.eressea.de/view.php?id=2291
 2017-03-01 21:17:37 +01:00
Enno Rehling 7f03417c37 bug 2286: fix missing addresses. 
was using cansee_unit wrong, mixed up traveler (ut) and target (u).
 2017-03-01 21:10:50 +01:00
Enno Rehling 98447668ca fix bad tests, upgrade clibs. 2017-03-01 20:37:49 +01:00
Enno Rehling 83a862d557 add a failing test for bug 2286 2017-03-01 19:54:52 +01:00
Enno Rehling e0085eac0c write a test for get_addresses before modifying it. 2017-03-01 19:52:23 +01:00
Enno Rehling 295614643a more factionstealth testing. 2017-03-01 19:18:00 +01:00
Enno Rehling 6d9387f6c2 warn about unused variables, back on 2017-03-01 18:16:07 +01:00
Enno Rehling fc8e6dc6de TARNE PARTEI creport test 2017-03-01 18:11:46 +01:00
Enno Rehling e2e602e7ba fix off-by-one calendar, bug 2288 2017-03-01 08:28:15 +01:00