Commit Graph

10539 Commits

Author SHA1 Message Date
Enno Rehling ddc23ca3ab Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-09-23 20:45:09 +02:00
Enno Rehling a2ece4e749 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-09-23 20:44:59 +02:00
Enno Rehling 4ed8b69719 Merge remote-tracking branch 'upstream/develop' into develop 2019-09-23 20:44:48 +02:00
Enno Rehling a2963a8621 stop using astralregions, avoid dynamic allocations. 2019-09-23 20:44:19 +02:00
Enno Rehling ade50af60b Merge branch 'master' into develop 2019-09-23 17:37:02 +02:00
Enno Rehling e72914eca3 new version of clibs 2019-09-23 17:33:49 +02:00
Enno Rehling 01ab07b974 include eressea.db in backup 2019-09-23 17:32:58 +02:00
Enno Rehling b6edc0b940 Bug 2611: password_cmd erzeugt ungültige Passworte. 2019-09-22 16:31:02 +02:00
Enno Rehling ef9567897f test for insect behavior when riding out of of through mountains. 2019-09-22 14:06:04 +02:00
Enno Rehling c1a36a0963 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-09-22 13:51:23 +02:00
Enno Rehling 3ac343a997 Pestmeldung, Regionen Singular/Plural. 2019-09-22 13:51:02 +02:00
Enno Rehling c3bb1ea1a5
Merge pull request #877 from ennorehling/develop
use format_list for schemes
2019-09-21 22:28:27 +02:00
Enno Rehling 0db9389df6 coverity thinks I should check return values 2019-09-21 22:28:13 +02:00
Enno Rehling 08e45dc722 appease gcc const-check 2019-09-21 22:18:41 +02:00
Enno Rehling e4099bf17e Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-09-21 22:17:06 +02:00
Enno Rehling 6c73a58608 Bug 2607: BEnutze format_list für Schemen. 2019-09-21 22:16:46 +02:00
Enno Rehling e66329b71d Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-09-19 05:05:42 +02:00
Enno Rehling 8433052c64 CID 204092: Memory - illegal accesses (NEGATIVE_RETURNS) 2019-09-19 05:05:13 +02:00
Enno Rehling 96facd21d9 Merge remote-tracking branch 'upstream/develop' into develop 2019-09-19 05:03:55 +02:00
Enno Rehling 17ba4e7746 allow clearing attributes from lua 2019-09-19 05:03:01 +02:00
Enno Rehling 13f96e886e Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-09-18 22:10:34 +02:00
Enno Rehling d5104fa55a Bug 2609 VERGESSE Magie 2019-09-18 20:55:44 +02:00
Enno Rehling ea9e31d1b2 tests for trolls riding on carts. 2019-09-15 20:32:07 +02:00
Enno Rehling 44d0a0acec Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-09-15 17:49:02 +02:00
Enno Rehling 93e82fc6ae concat in Lua is not PHP 2019-09-15 14:33:48 +02:00
Enno Rehling 65689df308 quit faction is still disabled 2019-09-15 14:33:48 +02:00
Enno Rehling 52f08917d5 getn is deprecated 2019-09-15 14:33:48 +02:00
Enno Rehling fa3abe8c32 new bindings for allies.
script to fix damage from bug 2608.
2019-09-15 14:33:48 +02:00
Enno Rehling fef57d3fcf factions that idle out gift their stuff to friends 2019-09-15 14:32:48 +02:00
Enno Rehling 6fe3566317 Merge remote-tracking branch 'upstream/master' 2019-09-15 14:31:17 +02:00
Enno Rehling 21534ca872 concat in Lua is not PHP 2019-09-15 14:30:50 +02:00
Enno Rehling 8a8dd08b19
Merge pull request #876 from ennorehling/master
Bug 2608 repair
2019-09-15 14:24:14 +02:00
Enno Rehling e90b7acd4c Merge remote-tracking branch 'upstream/master' 2019-09-15 14:17:37 +02:00
Enno Rehling 294e88196c quit faction is still disabled 2019-09-15 14:12:18 +02:00
Enno Rehling f06fd8945c getn is deprecated 2019-09-15 14:02:53 +02:00
Enno Rehling e58f51e536 new bindings for allies.
script to fix damage from bug 2608.
2019-09-15 14:02:32 +02:00
Enno Rehling bd25c0bf6e helfe-status nach lua exponieren. 2019-09-15 14:01:33 +02:00
Enno Rehling aecd79dab1 factions that idle out gift their stuff to friends 2019-09-15 13:59:42 +02:00
Enno Rehling 3c5105df7c clibs update 2019-09-15 13:59:28 +02:00
Enno Rehling f1132ca9f4
Merge pull request #875 from ennorehling/2608-nmrdeath
Bug 2608: nmr death, gift items
2019-09-14 21:52:10 +02:00
Enno Rehling 434aa15b9a factions that idle out gift their stuff to friends 2019-09-14 21:51:13 +02:00
Enno Rehling bfd29a4d17 clibs update 2019-09-13 22:03:40 +02:00
Enno Rehling 42da29668d Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-09-13 22:01:15 +02:00
Enno Rehling f30a7848a5 rule_give is crufty, do not involve it in destroyfaction 2019-09-13 22:00:47 +02:00
Enno Rehling 48297838c7
Merge pull request #874 from ennorehling/2605-carts
Lizenzwechsel und Wagen/Pferde
2019-09-13 21:59:41 +02:00
Enno Rehling 58910a992a Merge branch '2605-carts' into develop 2019-09-13 21:48:36 +02:00
Enno Rehling 8fc0aaf98d Add license to readme 2019-09-13 21:45:23 +02:00
Enno Rehling 0a1fc3c530 New license is CC BY-NC-SA 2019-09-13 21:42:46 +02:00
Enno Rehling b9ae927aa3 remove copyright notices. 2019-09-13 21:35:44 +02:00
Enno Rehling ddc8c27489 Bug 2605: testing horses and carts
fixing indentation in battle.c
2019-09-12 22:23:50 +02:00