Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
10405 commits 10 branches 0 tags 41 MiB
Commit graph

10405 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
face5eeb31 increase maxfiles to 50, handle error when no file generated. 2019-12-23 15:20:39 +01:00
Enno Rehling
08f7d267b8 version 3.22 is released 2019-12-01 17:18:59 +01:00
Enno Rehling
017f2c4e75
Merge pull request #885 from eressea/develop 
Release version 3.22
 2019-12-01 17:06:02 +01:00
Enno Rehling
ff959cf059
Merge pull request #884 from ennorehling/develop 
get ready for release
 2019-12-01 16:55:14 +01:00
Enno Rehling
633866c814 STIRB PARTEI: Versuche, Helden zu übernehmen. 2019-11-30 16:29:23 +01:00
Enno Rehling
1a8b94da59 STIRB PARTEI löscht die Befehle nicht. 
Reparatur des Tests für VERGESSE MAGIE (Vertraute)
 2019-11-24 16:39:21 +01:00
Enno Rehling
6b1baec2de Merge branch 'master' into develop 2019-11-18 19:44:37 +01:00
Enno Rehling
cd165d94ec Magier dürfen bei STIRB nicht übergeben werden. 2019-11-18 19:44:24 +01:00
Enno Rehling
dccde58221 Merge branch 'master' into develop 2019-11-18 19:34:05 +01:00
Enno Rehling
1bff7801ff transfer_faction respects magic schools. 2019-11-18 19:33:37 +01:00
Enno Rehling
beffa1d536 CID 205842: con is never NULL. 2019-11-18 18:48:28 +01:00
Enno Rehling
75000f2663 reduce struct person by 12 bytes on a 32-bit arch. 2019-11-17 19:55:41 +01:00
Enno Rehling
7850e84cea let's try increasing MAX_UNITSIZE to 128K 2019-11-02 21:37:33 +01:00
Enno Rehling
fd1b981983 simplify sail/travel, remove route from arguments. 2019-11-02 21:32:11 +01:00
Enno Rehling
52ee682a48 Bug 2617: Berechnung von Überladung berechnet Flotten korrekt. 2019-11-02 19:09:15 +01:00
Enno Rehling
6c37b122b4 no arm builds, valgrind 2019-10-28 20:35:15 +01:00
Enno Rehling
f4b87b1778 Merge branch 'develop' of github.com:eressea/server into develop 2019-10-28 20:22:54 +01:00
Enno Rehling
68fa43130f test travis arm builds 2019-10-28 20:22:40 +01:00
Enno Rehling
ee6bcd5de4
Merge pull request #882 from ennorehling/develop 
Bug 2618: Zusätzlicher Test Piraterie
 2019-10-28 20:18:11 +01:00
Enno Rehling
0db8f2167b Bug 2618: Zusätzlicher Test Piraterie 2019-10-28 20:12:52 +01:00
Enno Rehling
c3ad20a569
Merge pull request #881 from ennorehling/develop 
More bugfixes for ships
 2019-10-27 11:04:59 +01:00
Enno Rehling
7f57aa2a18 small copy/paste error 2019-10-27 10:57:32 +01:00
Enno Rehling
9b54784c94 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-10-27 10:56:32 +01:00
Enno Rehling
c8769a4412 Fehler in ship_crewed Berechnung 2019-10-27 10:56:16 +01:00
Enno Rehling
f5641b2787 Merge branch 'master' of github.com:ennorehling/eressea 2019-10-26 09:08:20 +02:00
Enno Rehling
b55eac6862 Merge remote-tracking branch 'upstream/master' 2019-10-26 09:07:59 +02:00
Enno Rehling
cf3fb42055 Merge remote-tracking branch 'upstream/develop' into develop 2019-10-26 09:07:35 +02:00
Enno Rehling
533a0aceec fix crash when following a lost ship 2019-10-23 23:17:31 +02:00
Enno Rehling
802fe20897 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-10-23 23:08:26 +02:00
Enno Rehling
c82b3b27dd Bug 2616: FOLGE schiesst über das Ziel hinaus. 2019-10-22 21:30:14 +02:00
Enno Rehling
1c358b9982 bug 2263: skeletons and undead can guard and desert. 2019-10-22 18:56:04 +02:00
Enno Rehling
75a71c36aa ZERSTOERE Schiffe evtl. auch richtig? Best effort. 2019-10-22 18:46:00 +02:00
Enno Rehling
f64020157c test name spelling fix 2019-10-21 20:07:55 +02:00
Enno Rehling
70b148296f MACHE beschädigte Konvois 2019-10-21 20:04:32 +02:00
Enno Rehling
d04fe741a9 https://bugs.eressea.de/view.php?id=2615 
in the report, calculate max size of ships correctly.
 2019-10-20 18:55:40 +02:00
Enno Rehling
d9cbbd9052 Bug 2614: Einheiten bewachen Region vor sich selbst. 2019-10-20 17:11:58 +02:00
Enno Rehling
bec38f544b
Merge pull request #880 from ennorehling/develop 
Schiffe und Konvois
 2019-10-10 20:48:15 +02:00
Enno Rehling
1309b81879 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-10-10 20:38:15 +02:00
Enno Rehling
7c72495a24 Merge remote-tracking branch 'origin/ship-number' into develop 2019-10-10 20:26:44 +02:00
Enno Rehling
12491ffc16 GIB 0 an Land kann alle Schiffe geben, auf Ozean nicht. 2019-10-10 20:24:18 +02:00
Enno Rehling
1d405e2ef8 GIB 0 n SCHIFFE 
Keine Boote erlauben
Übergabe an eigene Besatzung.
 2019-10-10 20:17:25 +02:00
Enno Rehling
78e44e0fe3 check compatible costs 2019-10-10 16:12:25 +02:00
Enno Rehling
24978a5b80 Schiffstransfer nur zwischen Kapitänen. 2019-10-08 21:14:01 +02:00
Enno Rehling
1e0afdc961 spells can only be cast on single ships. 2019-10-08 21:08:33 +02:00
Enno Rehling
43094e8bf9 plural strings for ships. 2019-10-08 05:15:23 +02:00
Enno Rehling
b0e6ed430b GIB alle Schiffe an andere Einheit. 2019-10-08 04:52:41 +02:00
Enno Rehling
4052cb71ff Show convoy in reports. 2019-10-07 22:01:02 +02:00
Enno Rehling
f4011af784 GIB unit n SCHIFF implementiert. 2019-10-07 21:50:52 +02:00
Enno Rehling
39e3001a50 start implementing give_ship 2019-10-06 20:42:47 +02:00
Enno Rehling
5cf417d16d must have one captain per ship. 2019-10-06 20:22:19 +02:00