Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
8984 commits 10 branches 0 tags 41 MiB
Commit graph

8984 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
dab802031a
Merge pull request #750 from ennorehling/develop 
bug 2389 part 2
 2017-12-17 14:51:30 +01:00
Enno Rehling
683e3c566d addendum bug 2389: insects mail not sail a ship into a glacier, but can be passengers. 2017-12-17 14:50:11 +01:00
Enno Rehling
0c90d50d83
Merge pull request #749 from ennorehling/develop 
BUG 2389, 2392
 2017-12-17 14:35:29 +01:00
Enno Rehling
404691c5db delete unused define and code for insects. 2017-12-17 14:33:18 +01:00
Enno Rehling
ed75f4d21a fix bug 2389 (sailing into glaciers). 
reduce verbosity.
 2017-12-17 14:28:15 +01:00
Enno Rehling
efa7b16c87 be less verbose in the log 2017-12-17 14:23:50 +01:00
Enno Rehling
3685bcabfb BUG 2389: insects starve in glaciers. 
add feature tests for hunger.
 2017-12-17 14:06:40 +01:00
Enno Rehling
efb78ea8db Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-12-17 10:19:19 +01:00
Enno Rehling
714e44cd71 BUG 2392: remove minskill attribute from any weapons. 2017-12-17 10:19:07 +01:00
Enno Rehling
e2f954b7f6 BUG 2392: anyone can use weapons, as long as they have _some_ skill. 2017-12-17 10:16:56 +01:00
Enno Rehling
b26f9adad8 Merge remote-tracking branch 'upstream/develop' into develop 2017-12-16 21:35:53 +01:00
Enno Rehling
4eed2abd71 Merge remote-tracking branch 'upstream/master' 2017-12-16 21:35:06 +01:00
Enno Rehling
ec961a8904 shellcheck fixes 2017-12-16 21:17:53 +01:00
Enno Rehling
98a8151688 shellcheck fixes 2017-12-16 21:16:51 +01:00
Enno Rehling
0f014153c0 add a test that proves bug 2392 to be user error. 2017-12-16 20:41:03 +01:00
Enno Rehling
e4c2a13b07 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-12-16 20:29:37 +01:00
Enno Rehling
63c066dfe3 BUG 2387: Zauberbeutel braucht kein notlost Attribut. 2017-12-16 20:29:07 +01:00
Enno Rehling
de6afeac5a
Merge pull request #748 from ennorehling/master 
3.14.2 changes to create-orders and gmtool
 2017-12-16 19:53:02 +01:00
Enno Rehling
c998770a88 use find instead of ls to get list of order files. 
this addresses the problem leading to bug 2394.

Conflicts:
	process/create-orders
 2017-12-16 19:43:33 +01:00
Enno Rehling
9fc0b9f641 use find instead of ls to get list of order files. 
this addresses the problem leading to bug 2394.
 2017-12-16 19:40:07 +01:00
Enno Rehling
ba87b12fce
Merge pull request #747 from ennorehling/develop 
latest changes from the 3.15 roadmap
 2017-12-15 17:27:24 +01:00
Enno Rehling
5977ca51b5 tests for insects, prepare for bug 1841 
another test for appeasement, fix guard bug 2389
 2017-12-15 17:16:00 +01:00
Enno Rehling
2257ba3f56 Merge remote-tracking branch 'upstream/develop' into develop 2017-12-13 19:46:13 +01:00
Enno Rehling
49c60baad8
Merge pull request #746 from stm2/cart_example 
test movement capacity examples from rules
 2017-12-13 19:45:56 +01:00
Steffen Mecke
ac9d5a8019 test movement capacity examples from rules 2017-12-13 17:53:05 +01:00
Enno Rehling
2d3451d7b8 another HAVE_X define that was never defined, and pointless 2017-12-12 21:37:44 +01:00
Enno Rehling
761f40f782 FFL_CURSED is forever 2017-12-12 21:34:34 +01:00
Enno Rehling
02248e0c54 fix coverity scan errors 2017-12-12 09:19:47 +01:00
Enno Rehling
77921a94ba BUG 1986: Jedes Magiegebiet kann Vertraute rufen. 2017-12-11 19:47:57 +01:00
Enno Rehling
a74daa2474 fix mac build 2017-12-11 19:31:42 +01:00
Enno Rehling
93613b99af slprintf is not in BSD (it's theft from samba). 2017-12-11 19:23:56 +01:00
Enno Rehling
af7cc02388 try to fix the build 2017-12-11 18:42:35 +01:00
Enno Rehling
d48b9611e1 have cmake determine bsdstring requirement 2017-12-11 18:36:57 +01:00
Enno Rehling
b297b4d43c eliminate some more strlcat calls. 2017-12-11 18:35:30 +01:00
Enno Rehling
9f391039b5 more bsdstring removal, str_replace, unit tests. 2017-12-11 18:20:21 +01:00
Enno Rehling
691dde5960 unit test ROUTE. 2017-12-11 16:24:06 +01:00
Enno Rehling
2ca236e68c Add lua tests for ROUTE. 2017-12-10 20:54:02 +01:00
Enno Rehling
686bbdbf69 solve helpers.c without bsdstring 2017-12-10 12:23:28 +01:00
Enno Rehling
ffc39a303f
Merge pull request #745 from ennorehling/develop 
Orders in temporary database, bugfixes, tests. For future 3.15 release.
 2017-12-09 21:30:31 +01:00
Enno Rehling
5576ef37b6 remove building_action feature, it seems that it isn't in use. 2017-12-09 21:20:20 +01:00
Enno Rehling
4e12ff536a The MUSEUM_MODULE define is unnecessary. 2017-12-09 21:06:44 +01:00
Enno Rehling
ffbc9596d7 we do not need a USE_LIBXML define, xml is a hard requirement. 2017-12-09 21:04:27 +01:00
Enno Rehling
866abcc92c remove obsolete defines. 2017-12-09 16:53:36 +01:00
Enno Rehling
643883d539 remove some more unused defines. 2017-12-09 11:17:39 +01:00
Enno Rehling
abd9b94d37 remove some ifdef options to maybe accelerate cppcheck. 2017-12-09 11:00:37 +01:00
Enno Rehling
8efc7f1829 BUG 2391: Friedenslied erlaubt Flucht aus der Region. 2017-12-09 10:44:02 +01:00
Enno Rehling
6c18604bce Failing acceptance test for bug 2391. 2017-12-09 10:24:31 +01:00
Enno Rehling
d740380152 unused variable, merge bug 2017-12-09 09:40:17 +01:00
Enno Rehling
0c1562c14f add include directories for cppcheck 2017-12-08 21:11:54 +01:00
Enno Rehling
5ad66d6b7a cppcheck style fixes 2017-12-08 21:08:45 +01:00