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

10408 Commits

Author SHA1 Message Date
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
Enno Rehling 55299346f8 use wint_t, not long. 2019-08-01 18:49:39 +02:00
Enno Rehling 35476da96b Merge branch 'master' into develop 2019-07-31 08:44:42 +02:00
Enno Rehling 01110e8676 shellcheck: negative exit and -z vs -n 2019-07-31 08:44:29 +02:00
Enno Rehling ca0b2b69d0 shellcheck: negative exit and -z vs -n 2019-07-31 08:43:23 +02:00
Enno Rehling 0fef06a661 Bug 2594: KONTAKTIERE vor STIRB 2019-07-31 08:31:19 +02:00
Enno Rehling 54d7ea19a4 Bug 2591: Datenbank enthält faslches Passwort für neue Parteien. 2019-07-30 15:26:15 +02:00
Enno Rehling fcc267160f Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-07-30 11:18:35 +02:00
Enno Rehling c880b6c99b merge conflict resolution MAXSCHOLARS 2019-07-30 11:18:09 +02:00
Enno Rehling 909a839adf simplify: WORK and ENTERTAIN use the same request array. 
reduce need for global variables.
 2019-07-30 11:13:25 +02:00
Enno Rehling fdfe0d3b35 check MAX_ENTERTAINERS. 
extract recruit from economy.
Bug 2600 (WIP).
 2019-07-29 23:53:59 +02:00
Enno Rehling 28a4cfa55d bug 2597 wormholes teleport more than one unit. 2019-07-28 22:32:08 +02:00
Enno Rehling 7bb17225c9 Seaserpents are cannibals. 2019-07-28 18:41:26 +02:00
Enno Rehling 3d57d2b77f Merge branch 'master' of github.com:ennorehling/eressea 2019-07-28 12:57:25 +02:00
Enno Rehling 5cf680997e implement atoi36 with strtol 2019-07-28 12:56:59 +02:00
Enno Rehling 20f9837a89 Merge branch 'master' of github.com:ennorehling/eressea 2019-07-28 07:48:36 +02:00
Enno Rehling 0a8fb39d21 Merge remote-tracking branch 'upstream/develop' into develop 2019-07-28 07:47:32 +02:00
Enno Rehling ccda750c11 Merge remote-tracking branch 'upstream/master' 2019-07-28 07:47:22 +02:00