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

10575 Commits

Author SHA1 Message Date
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
Enno Rehling 4f80569ebf try using iwyu on travis 2019-08-11 18:03:52 +02:00
Enno Rehling 8bd7a0a157
Merge pull request #865 from ennorehling/develop 
new coverity issues
 2019-08-10 05:59:30 +02:00
Enno Rehling b89eed2f2a Bugfix in Berechnung von neuem Entertainment-Code. 2019-08-10 05:52:34 +02:00
Enno Rehling 55016e8a02 resource leak: forgot to free recruitment data. 2019-08-10 05:12:46 +02:00
Enno Rehling 061cadfce8 null-pointer check befor strcmp. 2019-08-10 05:10:00 +02:00
Enno Rehling 12117776a0 ignore some code more points, but leave emoji intact. 2019-08-08 18:23:31 +02:00
Enno Rehling 854ff47b29
Merge pull request #864 from ennorehling/develop 
rechenfehler unterhaltung
 2019-08-06 20:05:41 +02:00
Enno Rehling a0bd0378c3 rechenfehler unterhaltung 2019-08-06 20:04:47 +02:00
Enno Rehling eed5cb499c
Merge pull request #863 from ennorehling/develop 
ongoing changes
 2019-08-06 18:16:25 +02:00
Enno Rehling c714efac36
Merge pull request #862 from ennorehling/master 
bugfix release
 2019-08-06 18:16:13 +02:00
Enno Rehling c97e881dbf let horses be short, too. 2019-08-03 20:58:13 +02:00
Enno Rehling 8106cf15a1 morale is ony [0-10], so unsigned short is more than fine. 2019-08-03 15:28:50 +02:00
Enno Rehling a51d3edee7 region.peasants can be short 2019-08-03 15:12:07 +02:00
Enno Rehling 867dcd27f7 512 is not enough economy 2019-08-03 10:02:34 +02:00
Enno Rehling ef71a78cd0 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-08-02 12:25:25 +02:00
Enno Rehling 16cad15dec change test for trimming non-printable chars 2019-08-02 12:24:32 +02:00
Enno Rehling a2a7bc5f61 add missing include 2019-08-01 23:11:52 +02:00
Enno Rehling bcdddd5099 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-08-01 23:02:12 +02:00
Enno Rehling 0bf1356e60 Merge branch 'unicode' into develop 2019-08-01 23:01:30 +02:00
Enno Rehling 964a0586dc fix UTF8 trimming 2019-08-01 22:58:20 +02:00