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

10556 Commits

Author SHA1 Message Date
Enno Rehling 5cf417d16d must have one captain per ship. 2019-10-06 20:22:19 +02:00
Enno Rehling 178f7c2e19 add number of ships for convoys. 
check required crew skills.
require number of captains >= ship.number.
 2019-10-06 18:11:10 +02:00
Enno Rehling f14d6462c9
Merge pull request #879 from ennorehling/develop 
Developmetn updates
 2019-10-06 09:08:24 +02:00
Enno Rehling 441c5d602d Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-10-06 08:57:49 +02:00
Enno Rehling 84633b50e1 gamedata version SHIP_NUMBER_VERSION 2019-10-05 21:00:17 +02:00
Enno Rehling f02c4cbaeb disable magic resistant to prevent 2% intermittent test. 2019-10-05 20:59:55 +02:00
Enno Rehling b4f3120658 delete unused function 2019-09-29 18:31:11 +02:00
Enno Rehling 7b9ea75d16 make disrupt_astral use callback, not region_list. 2019-09-29 18:28:44 +02:00
Enno Rehling 17fbd0d67d Bug 2612 Zauberreparatur. 2019-09-29 17:56:56 +02:00
Enno Rehling a6ea80f5f8 create a for_all_in_range function to avoid use of region_list. 
functional programming is good.
 2019-09-29 16:57:26 +02:00
Enno Rehling 8345ee11dd
Merge pull request #878 from ennorehling/develop 
region_list optimization, list formatting
 2019-09-28 21:01:53 +02:00
Enno Rehling bb408d617f typo in message definition 2019-09-28 20:54:30 +02:00
Enno Rehling 2ef753bd16 Tod den region_list Listen. 
Weg mit astralregions().
 2019-09-24 21:42:53 +02:00
Enno Rehling 24552613c8 fetch_astral braucht astralregions eigentlich nicht. 2019-09-24 21:26:34 +02:00
Enno Rehling 237ec44ea0 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-09-24 20:44:37 +02:00
Enno Rehling 7335d8c5c9 fix build (bad merge, self is now f) 2019-09-24 09:35:38 +02:00
Enno Rehling 00e39717e1 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-09-24 09:28:44 +02:00
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