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

10295 Commits

Author SHA1 Message Date
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 99f7ddd1c0
Merge pull request #873 from ennorehling/develop 
mapper enhancement
 2019-09-02 20:59:41 +02:00
Enno Rehling 40a484774e gmtool: reset an entire world's age to zero. 2019-09-02 20:42:23 +02:00
Enno Rehling a3299ed926 Verifikation dass Erbschaft wie gewollt verteilt wird. 2019-09-01 19:42:12 +02:00
Enno Rehling 7e4d7bf286
Merge pull request #872 from ennorehling/develop 
bug 2603: when familiars cast spells, use their name in messages.
 2019-09-01 04:10:08 +02:00
Enno Rehling 02f6f2f014 bug 2603: when familiars cast spells, use their name in messages. 2019-08-31 12:19:25 +02:00
Enno Rehling 7eb1e59d5d
Merge pull request #871 from ennorehling/develop 
BENENNE FREMDE und pathfinding
 2019-08-27 22:25:47 +02:00
Enno Rehling aef98424ea fix pathfinding 
fix BENENNE FREMDE BURG
 2019-08-27 22:17:28 +02:00
Enno Rehling c87944afad actually, rconnect is better, since we don't always need the entire scan. 2019-08-26 22:49:32 +02:00
Enno Rehling b81fe4e244 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-08-26 22:47:11 +02:00
Enno Rehling a5e59a6464 we prefer get_neighbours over rconnect 2019-08-26 22:46:59 +02:00
Enno Rehling d639c2418c delete unused function 2019-08-26 20:47:02 +02:00
Enno Rehling 331546eec4 at_npcfaction is deprecated stuff. 2019-08-26 19:09:40 +02:00
Enno Rehling ef92734483
Merge pull request #870 from ennorehling/develop 
refactoring, to go into 3.21
 2019-08-25 19:40:09 +02:00
Enno Rehling fc29b492a2 last gcc thing, I hope. 2019-08-25 19:34:04 +02:00
Enno Rehling eb95613996 fix gcc issues with new season_t type. 2019-08-25 18:14:03 +02:00
Enno Rehling 8bed3f3329 fix give_unit test for E3 
extract read_factions from read_game, now small and nice.
 2019-08-25 18:11:14 +02:00
Enno Rehling 827532dd49 extract read_regions from read_game. 2019-08-25 17:55:04 +02:00
Enno Rehling cf7971bcfc Tests for GIVE UNIT and groups. 2019-08-25 17:43:18 +02:00
Enno Rehling ea4f402ddc
Merge pull request #869 from ennorehling/develop 
insect warning
 2019-08-25 15:19:10 +02:00
Enno Rehling 8ddca8ab0e Bug 2458 strikes again: wrong insect warning. 
simplify calendar code, add tests.
 2019-08-25 15:14:21 +02:00
Enno Rehling 0dabf02628 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-08-25 10:54:26 +02:00
Enno Rehling ae7a6cb5c1 Merge branch 'master' into develop 2019-08-24 22:02:15 +02:00
Enno Rehling f8e2657b62
Merge pull request #867 from ennorehling/master 
rule_give is crufty, do not involve it in destroyfaction
 2019-08-24 21:44:44 +02:00
Enno Rehling 5cb3517142
Merge pull request #868 from ennorehling/develop 
Galeonen, etc. für Release 3.21
 2019-08-24 21:44:30 +02:00
Enno Rehling 8916a1756a rule_give is crufty, do not involve it in destroyfaction 2019-08-24 12:14:57 +02:00
Enno Rehling 61b86aa022 Anpassung an neue Leuchtturm-Regelung 2019-08-21 19:44:10 +02:00
Enno Rehling 1db703f579 Galeone mit einem L 2019-08-21 15:36:36 +02:00
Enno Rehling f2f7ece38c Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-08-21 15:35:59 +02:00
Enno Rehling b4867e4679 Keine Burgen oder Schiffe in Land-Turmregionen zeigen. 2019-08-20 19:31:52 +02:00
Enno Rehling e5c4bd5013 fix and improve lighthouse test. 2019-08-20 17:30:21 +02:00
Enno Rehling 878bc653e8 this test no longer applies 2019-08-20 17:25:26 +02:00
Enno Rehling 62a45496e4 Sichtbarkeit von Landregionen aus Leuchttürmen. 
https://bugs.eressea.de/view.php?id=2490
 2019-08-20 17:24:05 +02:00
Enno Rehling 5264b6e4f5 fix and test implementation of ship_type.minskill 2019-08-18 12:13:51 +02:00
Enno Rehling ae7b20bbaa
Merge pull request #866 from ennorehling/develop 
Develop
 2019-08-17 22:55:06 +02:00
Enno Rehling e616449fd0 Leuchttürme zeigen minimale Info über Landregionen an. 
https://bugs.eressea.de/view.php?id=2490
Neues Schiff Galleone
https://bugs.eressea.de/view.php?id=2542
 2019-08-17 22:48:14 +02:00
Enno Rehling b53304d82e Schneekugel wirkt auf aktive Vulkane 
https://bugs.eressea.de/view.php?id=2554
 2019-08-13 18:57:17 +02:00
Enno Rehling b109e21d33 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-08-13 17:43:03 +02:00
Enno Rehling c8c2a6fe58 2587: Trennlinie vor Allianzstatus und Adressliste. 
https://bugs.eressea.de/view.php?id=2587
 2019-08-13 17:42:45 +02:00
Enno Rehling 206a3007a7 cannot use iwyu at this time 2019-08-12 09:13:12 +02:00
Enno Rehling f15bc7915b install clang-7 because iwyu is old 2019-08-12 09:05:20 +02:00