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

11081 Commits

Author SHA1 Message Date
Enno Rehling 4c64affdfc Merge branch 'master' into develop 2021-06-15 22:35:54 +02:00
Enno Rehling f35f484324 gmtool: markup virgin regions 
highlight regions that have never been visited
 2021-06-15 21:34:23 +02:00
Enno Rehling eadad871ec
Merge pull request #943 from eressea/2758-smurf 
fix smurfication
 2021-06-15 19:26:23 +02:00
Enno Rehling da7725e58f https://bugs.eressea.de/view.php?id=2758 
fix smurfication, properly now.
 2021-06-15 18:17:31 +02:00
Enno Rehling 6244c6c437 Merge branch 'master' into develop 2021-06-14 22:00:39 +02:00
Enno Rehling a1d59b99cb https://bugs.eressea.de/view.php?id=2757 
Kampf auf See war kaputt.
 2021-06-14 21:56:47 +02:00
Enno Rehling 7632d1a202 Merge branch 'master' into develop 2021-06-12 18:47:15 +02:00
Enno Rehling 060d7e2fd6 https://bugs.eressea.de/view.php?id=2756 
BOM steht wieder in der Zugvorlage.
 2021-06-12 18:43:20 +02:00
Enno Rehling 317f605ff2
Merge pull request #942 from eressea/expel 
VERTREIBE Kommando
 2021-06-11 21:11:22 +02:00
Enno Rehling 5926016010 EXPEL: additional messages and tests. 2021-06-11 21:02:30 +02:00
Enno Rehling 1711812b0b VERTREIBE Kommando (expel). 
Braucht noch Fehlermeldungen.
 2021-06-10 22:21:15 +02:00
Enno Rehling d35181b5d6 ignore lines that contain only whitespace. 2021-06-10 19:54:17 +02:00
Enno Rehling 573077987c eliminate clang warning 2021-06-09 20:58:38 +02:00
Enno Rehling c8e09083f6 try being compatible with glibc and ms crt. 2021-06-09 20:58:38 +02:00
Enno Rehling 6fc62eb35c https://bugs.eressea.de/view.php?id=2753 
look for iswgraph, instead of not iswspace
 2021-06-09 20:58:38 +02:00
Enno Rehling 2f05f12e10 https://bugs.eressea.de/view.php?id=2753 
trim anything that is not visible, not just spaces.
 2021-06-09 20:58:38 +02:00
Enno Rehling 97655a52b8 begin work on version 3.29 2021-06-09 20:58:38 +02:00
Enno Rehling e94b3d6447
Merge pull request #940 from eressea/pause-faction 
Pause faction
 2021-06-09 20:47:10 +02:00
Enno Rehling 4a7580e8eb SORTIERE VOR eine pausierte Einheit 
Automatische Kommandoübergabe inklusive.
 2021-06-08 19:13:27 +02:00
Enno Rehling 062e5ff7ae paused units do not sort. 2021-06-08 19:13:27 +02:00
Enno Rehling ab5669a514 monsters do not attack paused factions 2021-06-08 19:13:27 +02:00
Enno Rehling e6da5d92d8 Pausierte Parteien bewachen nicht. 2021-06-08 19:13:27 +02:00
Enno Rehling a3916b8271 PAusierte Parteien: HELFE BEWACHE bleibt erhalten. 2021-06-08 19:13:27 +02:00
Enno Rehling e0d6bb410e Endlosschleife in BETRETE 2021-06-08 19:13:27 +02:00
Enno Rehling d2cc7bde69 unused variables 2021-06-08 19:13:27 +02:00
Enno Rehling 202642e7d0 paused factions are not allied to anyone. 2021-06-08 19:13:26 +02:00
Enno Rehling 48fd0bd4af paused factions do not execute orders, do not join battles. 
lots of change, didn't write any tests for this yet.
 2021-06-08 19:13:26 +02:00
Enno Rehling 0fcc1b8d29 fix compilation, add tests for upkeep 2021-06-08 19:13:26 +02:00
Enno Rehling bed6cdff58 paused units have no weekly maintenance cost. 2021-06-08 19:13:26 +02:00
Enno Rehling e5b4d925c6 paused factions: resume when new orders arrive 2021-06-08 19:13:26 +02:00
Enno Rehling 18b1139616 test not sorting before building and ship owners. 2021-06-06 16:31:07 +02:00
Enno Rehling 62aaf71b35 move unit reordering into sort.c 2021-06-06 13:14:19 +02:00
Enno Rehling 1994a66f85 Seeschlangen brauchen keine Tarnung lehre, auf dem Ozean sieht man sie eh. 2021-06-05 15:07:02 +02:00
Enno Rehling 4a79960cb1 Große Monster können sich auf dem Ozean nicht verstecken. 2021-06-05 14:55:20 +02:00
Enno Rehling 8c43f21fbe
Merge pull request #941 from eressea/develop 
Release 3.28
 2021-05-30 18:02:33 +02:00
Enno Rehling 4771d32c01 integration tests: fewer horses in the report now 2021-05-20 18:57:51 +02:00
Enno Rehling 895818c7c7 https://bugs.eressea.de/view.php?id=2750 
Katpaulte schiessen nicht wenn KAEMPFE FLIEHE gesetzt ist.
Wenn Katapulte nicht schiessen, versuchen sie keine alternative Attacke, für die sie bihser das Katapult als Bogen benutzt haben.
 2021-05-19 21:55:56 +02:00
Enno Rehling ff80cb52ba https://bugs.eressea.de/view.php?id=2751 
Keine Anzeige von Durchreise in von Leuchtturm gesehenem Land
Gleichschaltung NR und CR
 2021-05-19 21:27:34 +02:00
Enno Rehling 9b3f5e7a55 remove unused objtype_t constants. 2021-05-08 18:21:14 +02:00
Enno Rehling c68a356202 fix crash in release build 2021-05-04 21:06:53 +02:00
Enno Rehling 7d7842b849 do_combatspell didn't check that the unit was a mage. 2021-05-03 20:15:23 +02:00
Enno Rehling 30cf9e2659 Merge branch 'master' into develop 2021-05-01 22:21:09 +02:00
Enno Rehling a811d7680a libcjson requires focal 2021-05-01 22:20:54 +02:00
Enno Rehling 4448cd607c hard-coded search for valgrind 
travis: use bionic, do not run valgrind
 2021-05-01 22:17:43 +02:00
Enno Rehling 9dd404756d libcjson requires focal 2021-05-01 22:16:56 +02:00
Enno Rehling 13a4388b9c Merge branch 'master' into develop 2021-05-01 22:03:31 +02:00
Enno Rehling 69cf298b6a hard-coded search for valgrind 
travis: use bionic, do not run valgrind
 2021-05-01 21:58:07 +02:00
Enno Rehling ff7cd7d20d check for dead curse-magician 2021-05-01 21:53:01 +02:00
Enno Rehling 15e789737c Merge branch 'stm2-newbie' into develop 2021-04-29 17:38:46 +02:00
Enno Rehling d8cca8089b wording: attacks, not addaults 2021-04-29 17:37:11 +02:00