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

3365 Commits

Author SHA1 Message Date
Enno Rehling 3911217fb5 eliminate some TODO comments. 2017-12-26 07:25:42 +01:00
Enno Rehling a7b7162c56 add a safety check against accidentally drowning units in terraforming. 2017-12-26 07:04:12 +01:00
Enno Rehling f4e56d1512 bug 2238: respect the dragon speed multiplier. 2017-12-26 06:26:56 +01:00
Enno Rehling a7c45d31ad bug 2214: drifting ships in E3 should take no damage. 2017-12-25 23:22:58 +01:00
Enno Rehling 54ae00bb7d bug 2156: fix volcano reporting, maybe. 2017-12-25 21:55:50 +01:00
Enno Rehling 6927eed52e bug 2387: create a ghost to hold on to magical notlost items. 2017-12-25 19:11:12 +01:00
Enno Rehling 01c808da66 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-12-23 18:33:38 +01:00
Enno Rehling 4752984e33 sqlite may set errno, reset it 2017-12-23 18:28:51 +01:00
Enno Rehling 5dabd19504 add tests for visible_unit, remove unused cansee_ex 2017-12-23 17:49:30 +01:00
Enno Rehling 6bd4e543ba BUG 2395: lighthouses were seeing units they should not. 
DRY!
 2017-12-23 17:37:24 +01:00
Enno Rehling 73f49ec90a fix demon hunger in E3 and one intermittent test. 
tests involving demons can disable skill changes.
 2017-12-22 19:14:01 +01:00
Enno Rehling cba452786f BUG 2396: insect recruit messages fixed, and tests added. 2017-12-22 11:15:17 +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 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 3685bcabfb BUG 2389: insects starve in glaciers. 
add feature tests for hunger.
 2017-12-17 14:06:40 +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 63c066dfe3 BUG 2387: Zauberbeutel braucht kein notlost Attribut. 2017-12-16 20:29:07 +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 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 5ad66d6b7a cppcheck style fixes 2017-12-08 21:08:45 +01:00
Enno Rehling 17ee0e50b6 cppcheck warnings and scope reductions. 2017-12-08 21:08:11 +01:00
Enno Rehling 26c31708dc delete dead code. 2017-12-08 20:46:24 +01:00
Enno Rehling 5192ffdb60 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-12-08 20:18:29 +01:00
Enno Rehling 1b9a686101 fix berkeley size/ulen error 
remove weather module (unused)
 2017-12-08 20:18:01 +01:00
Enno Rehling 9163d166ec cppcheck style fixes. 
delete dead functions.
reactivate patzer_deathcloud.
 2017-12-08 19:59:49 +01:00
Enno Rehling 5e435a7c0b pass cppcheck v 1.54 default checks 2017-12-08 19:26:26 +01:00
Enno Rehling a51a145ba8 make this loop a little more readable. warning: the break has no tests. 2017-12-06 20:06:46 +01:00
Enno Rehling 7b2531a8ae writing orders to the CR no longer copies them into a buffer when it can be avoided. 2017-12-06 20:00:32 +01:00
Enno Rehling 3864a00482 remove stealing from economy.c (that file is too big). 2017-12-04 20:01:08 +01:00
Enno Rehling 05425b5101 pull economy requests into header, rename the struct. 2017-12-04 19:20:48 +01:00
Enno Rehling b078015e85 prefer sqlite over berkeley 2017-11-26 18:16:34 +01:00
Enno Rehling c124702ffe merge order_id branch 2017-11-26 15:20:38 +01:00
Enno Rehling 537166eadf Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-11-26 15:17:59 +01:00
Enno Rehling 40bbb48e94 umlaute sind doof. 2017-11-26 15:17:46 +01:00
Enno Rehling a67b2fa68d stop using random numbers to scale units. 2017-11-26 15:15:25 +01:00
Enno Rehling 9188f6fbb6 scale_number test revised 2017-11-26 15:13:40 +01:00
Enno Rehling 599efb2e76 remove lomem code, it was a bad idea 2017-11-25 20:24:57 +01:00
Enno Rehling 85306165d6 on the Rapsberry Pi, long is only 32 bit 2017-11-25 11:31:24 +01:00
Enno Rehling 38922d9205 on the Rapsberry Pi, long is only 32 bit 2017-11-25 11:29:52 +01:00
Enno Rehling d13a0de0f9 Merge branch 'develop' into order_id 2017-11-25 11:24:03 +01:00
Enno Rehling f8f8f8f43f Merge branch 'master' into develop 2017-11-21 08:47:49 +01:00
Enno Rehling 29a6c0ae86 gmtool, highlight and clear chaos 2017-11-21 08:47:35 +01:00
Enno Rehling 67318950d5 Merge branch 'develop' into order_id 2017-11-20 18:23:33 +01:00
Enno Rehling ff2f83c371 order leak in recruit_dracoids, do not build a study order 2017-11-20 17:03:12 +01:00
Enno Rehling 36809d1f9a fix coverity resource leaks 2017-11-20 16:49:35 +01:00
Enno Rehling 4fa9e041bf fix cppcheck report (missing curly race) 2017-11-20 14:57:04 +01:00
Enno Rehling 7c69bfa410 snprintf usage 2017-11-20 14:50:19 +01:00
Enno Rehling e0bd5c2c7b abort on OOM 2017-11-20 14:44:02 +01:00
Enno Rehling e6c11e2223 workaround for cppcheck false-positive 2017-11-20 08:51:06 +01:00
Enno Rehling 8a638859fd fix memory access in rc_setoption 2017-11-20 08:24:56 +01:00
Enno Rehling 923f01190c sscanf format was too big 2017-11-20 07:52:56 +01:00
Enno Rehling fdd28835b5 Shifting signed 32-bit value by 31 bits is undefined behaviour 2017-11-20 07:51:31 +01:00
Enno Rehling 793de9f82a no special apple ifdef required 2017-11-19 16:32:20 +01:00
Enno Rehling 41f20c02b2 fix bdb load/save, use recno db 2017-11-19 16:30:20 +01:00
Enno Rehling 2ff820d1b4 implement get/put for db 2017-11-19 12:50:24 +01:00
Enno Rehling 2f5f685e55 add berkeley db, rename some files 2017-11-19 12:31:50 +01:00
Enno Rehling 9c44c1ce63 Merge branch 'develop' into order_id 2017-11-19 03:21:02 +01:00
Enno Rehling c39708f40c BUG 2362: clone_men hitpoint calculation was wrong. 2017-11-19 03:20:00 +01:00
Enno Rehling b0ce88631e fix bug 2386, int overflow 2017-11-19 03:19:59 +01:00
Enno Rehling 97b4806deb Merge branch 'release-13.3' 
Conflicts:
	src/kernel/unit.c
	src/kernel/unit.test.c
 2017-11-19 03:13:16 +01:00
Enno Rehling 1c24628d62 BUG 2362: clone_men hitpoint calculation was wrong. 2017-11-19 03:00:18 +01:00
Enno Rehling 7e1f3dbdc5 fix bug 2386, int overflow 2017-11-19 02:56:13 +01:00
Steffen Mecke 2f449e686b addendum to BUG 2383 (5a0a1f): read irace correctly 2017-11-18 18:30:19 +01:00
Enno Rehling 3f3cdad390 BUG 2383: Delete an invalid assertion. 
https://bugs.eressea.de/view.php?id=2383
 2017-11-18 18:30:19 +01:00
Enno Rehling 73c1478b87 Merge remote-tracking branch 'upstream/develop' into develop 2017-11-18 18:26:37 +01:00
Enno Rehling 2014a23212
Merge pull request #740 from stm2/add_2383 
remove irace assumptions
 2017-11-18 18:25:50 +01:00
Steffen Mecke 6e53f15a1c addendum to BUG 2383 (5a0a1f): read irace correctly 2017-11-18 18:10:49 +01:00
Enno Rehling 396705f492 BUG 2383: Delete an invalid assertion. 
https://bugs.eressea.de/view.php?id=2383
 2017-11-18 18:10:45 +01:00
Enno Rehling 50e242b810 fix include of renamed header 2017-11-18 13:02:12 +01:00
Enno Rehling 2224b59ff9 organize database drivers in their own directory 2017-11-18 12:55:07 +01:00
Enno Rehling 9d328a07f2 Merge branch 'order_id' of https://github.com/ennorehling/eressea.git 2017-11-16 18:41:18 +01:00
Enno Rehling dbe835e485 add cmake directives to build with Berkeley DB 2017-11-16 18:30:18 +01:00
Enno Rehling 290a07e763 Merge branch 'develop' 2017-11-15 20:39:20 +01:00
Enno Rehling 54b016a735 Merge remote-tracking branch 'upstream/develop' into develop 2017-11-15 20:37:46 +01:00
Steffen Mecke 0aa5a64c63 allow empty faction email 2017-11-15 12:12:42 +01:00
Steffen Mecke 2f35feee3e minor, obvious fixes 2017-11-14 12:51:04 +01:00