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

11047 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Enno Rehling
063aa4dd79 remove debug flag 2021-04-29 17:33:59 +02:00
Enno Rehling
f158dab855 hard-coded search for valgrind 2021-04-29 17:33:59 +02:00
Enno Rehling
9cee6a8115 use even fewer single quotes 
debug travis builds
 2021-04-29 17:33:59 +02:00
Enno Rehling
86778665d4 disable valgrind installation, travis is borked 2021-04-29 17:33:59 +02:00
Enno Rehling
69a3abe627 try not using focal to fix valgrind installation 2021-04-29 17:33:59 +02:00
Enno Rehling
6c55dfb555 try forcing travis to install valgrind dependency 2021-04-29 17:33:59 +02:00
Enno Rehling
22b8c7da22 https://bugs.eressea.de/view.php?id=2745 
use double quotation marks in generated orders.
 2021-04-29 17:33:59 +02:00
Enno Rehling
93da2fedf8 remove debug flag 2021-04-28 20:04:59 +02:00
Enno Rehling
4608f720ea hard-coded search for valgrind 2021-04-28 20:02:24 +02:00
Enno Rehling
c87b6a8fd3 use even fewer single quotes 
debug travis builds
 2021-04-28 19:54:32 +02:00
Enno Rehling
a5534336fb disable valgrind installation, travis is borked 2021-04-28 19:46:08 +02:00
Enno Rehling
2f18ac7aea try not using focal to fix valgrind installation 2021-04-28 19:36:32 +02:00
Enno Rehling
5390b9da6c try forcing travis to install valgrind dependency 2021-04-28 19:29:41 +02:00
Enno Rehling
db2c2f0744 https://bugs.eressea.de/view.php?id=2745 
use double quotation marks in generated orders.
 2021-04-28 17:25:56 +02:00
Steffen Mecke
eb5ddfaeda report newbie immuniy clearly 2021-04-26 21:31:00 +02:00
Enno Rehling
557f5458ea don't cast level 0 combat spells 2021-04-21 18:05:40 +02:00
Enno Rehling
ca787ed447 README update: libexpat relaces libxml2 2021-04-18 17:32:19 +02:00
Enno Rehling
374d9d0bb6 https://bugs.eressea.de/view.php?id=2740 
Do not put a UTF-8 BOM into the Zugvorlage.
 2021-04-18 11:33:14 +02:00
Enno Rehling
15fd2c9026 xml attribute is called learn, not nolearn. 2021-04-13 21:59:41 +02:00
Enno Rehling
ba51efb06b Kröten und Schlümpfe können nichts lernen. 2021-04-12 20:14:19 +02:00
Enno Rehling
56beb0f4ab covevrity CID 220614 2021-04-09 22:35:11 +02:00
Enno Rehling
adc03b75bc move skill.h to kernel, use enum in struct skill 2021-04-09 21:52:50 +02:00
Enno Rehling
e3f2ca9aaf catch attempts to cast a spell without the magic skill 2021-04-09 21:30:26 +02:00
Enno Rehling
14e2e96c73
Merge pull request #937 from eressea/2737-spells-cost-and-familiars 
2737 spells cost and familiars
 2021-04-08 21:47:28 +02:00
Enno Rehling
7bc7b339e8 changelog update 2021-04-08 21:39:39 +02:00
Enno Rehling
250c098bf6 https://bugs.eressea.de/view.php?id=2737 
finalize spell cost bugfix.
fix familiar spellcost calculation tests.
remove debug names from tests.
 2021-04-08 21:25:37 +02:00
Enno Rehling
c8e975333b WIP bug 2737 
fix cost of spells with ring of power.
test and fix cost and limits of familiars casting spells.
 2021-04-08 21:25:37 +02:00
Enno Rehling
5564543bfd fix gcc build 2021-04-05 19:40:22 +02:00
Enno Rehling
4d8a3d1947 https://bugs.eressea.de/view.php?id=2737 
using a ring does not increase the spell's cost
adding tests for spell effectiveness revealed many inconsistencies that are now fixed.
 2021-04-05 19:19:49 +02:00
Enno Rehling
bb12ffa2a2 Mit GIB 0 können hungernde Personen an die Bauern gegeben werden. 2021-04-01 18:54:56 +02:00
Enno Rehling
d1bad6773c kill DTD, nothing uses it 2021-03-30 15:13:29 +02:00
Enno Rehling
4e1a124801 https://bugs.eressea.de/view.php?id=2734 
additional testing for GIVE UNIT
 2021-03-28 19:07:42 +02:00
Enno Rehling
50cdf39245 https://bugs.eressea.de/view.php?id=2736 
report the correct region for drifting ships.
 2021-03-28 18:58:09 +02:00
Enno Rehling
58c310de29 a working stone circle boosts magic resistance of people inside. 2021-03-27 19:12:12 +01:00