Steffen Mecke
9407b4c9c0
fixed crash of analyze magic
...
because of missing spell/curse description
2015-05-07 17:51:43 +02:00
Steffen Mecke
dedf9f2009
clear CURSE_ISNEW explicitly in age(), not implicitly in write/read
2015-05-07 17:51:43 +02:00
Steffen Mecke
553cf23e9e
crash more gracefully on missing description
2015-05-07 17:51:38 +02:00
Steffen Mecke
231f9bb39a
check for existence of spell descriptions
2015-05-07 13:31:19 +02:00
Steffen Mecke
22e8e39a99
check that analyze magic works
2015-05-07 13:28:37 +02:00
Steffen Mecke
b41049da53
test good/bad dreams
2015-05-06 18:15:10 +02:00
Enno Rehling
03084a7ee7
set_origin: renaming German function name to English, add a simple test for it.
2015-05-05 09:47:44 -07:00
Enno Rehling
42783ff02c
binding a magician's spellbook to Lua, with test.
2015-05-05 08:44:58 -07:00
Enno Rehling
0db74d1c09
re-enable unit spells binding to Lua, remove some TODOs from the code.
2015-05-05 08:07:20 -07:00
Enno Rehling
031826902d
Merge remote-tracking branch 'upstream/develop' into develop
2015-05-05 14:20:52 +02:00
Enno Rehling
5291b32459
new players are now read from a players.txt file
...
check for duplicates
start with better miners
2015-05-05 14:20:19 +02:00
Enno Rehling
e55c2d63bf
remove email address
...
should not put player emails in the source of this script, obfuscating to prevent misuse
2015-05-04 22:23:18 +02:00
Enno Rehling
5f0a02ecb9
Merge pull request #180 from stm2/spy_expand_april
...
expand spy messages, rebased
2015-05-04 20:30:40 +02:00
Steffen Mecke
0fc7364533
fixed errors introduced by rebase
2015-05-04 14:46:32 +02:00
Steffen Mecke
79d2c76c3f
refining spy tests
2015-05-04 14:30:59 +02:00
Steffen Mecke
d4aa6e834e
check for number of arguments as good as possible and cleaning up test
2015-05-04 14:30:59 +02:00
Steffen Mecke
e28222c5be
fix missing kampfstatus
2015-05-04 14:30:59 +02:00
Steffen Mecke
2cc8c1f871
trying to solve spy message bug #1604
...
Conflicts:
src/kernel/CMakeLists.txt
2015-05-04 14:30:59 +02:00
Enno Rehling
24dbe64ef7
new players: more money, entertainers.
2015-05-03 23:23:21 +02:00
Enno Rehling
fe3d96517e
Merge pull request #178 from stm2/typ
...
Tippfehler und englische Texte für Health.
2015-05-03 23:12:01 +02:00
Enno Rehling
b603001760
Merge pull request #179 from badgerman/develop
...
Unlimitierte Personen-Übergabe in E2
2015-05-03 11:15:08 +02:00
Enno Rehling
01969dfb40
Merge remote-tracking branch 'upstream/develop' into develop
2015-04-30 16:02:33 +02:00
Enno Rehling
b00d7b6d5a
increase magic power for low levels in E3 (instead of divide by 2 sometimes giving powers of < 1.0, cap it below at 1)
...
several spells have now had problems with powers lower than they were ever designed for, including shapeshift
also added a test and some framework for shapeshift spell (in E2).
https://bugs.eressea.de/view.php?id=1588
2015-04-30 15:59:52 +02:00
Steffen Mecke
a9a14a79d0
fixed messed up english strings for wounds
2015-04-30 15:47:29 +02:00
Enno Rehling
6c4e74bc25
as-hoc scripts for seeding new players into old game
2015-04-30 15:22:06 +02:00
Enno Rehling
ce94c9805d
rules.give.max_men == -1 für unlimitierte Übergaben in E2
2015-04-28 17:40:41 +02:00
Steffen Mecke
81e96c121a
typo
2015-04-27 15:14:42 +02:00
Enno Rehling
4dd0ffefe1
Merge pull request #176 from badgerman/develop
...
Umlaute Reparatur
2015-04-26 23:20:11 +02:00
Enno Rehling
38fe2b1144
Hier hat ein commit aus dem github-Editor das Encoding zerstört, scheint mir.
2015-04-26 23:02:37 +02:00
Enno Rehling
25305d93cb
Merge pull request #175 from badgerman/develop
...
Fix keepitem flag in XML ("Menschen geben nichts ab")
2015-04-22 12:39:32 +02:00
Enno Rehling
30e4dc6cdc
Fix keepitem flag in XML ("Menschen geben nichts ab")
2015-04-22 12:33:55 +02:00
Enno Rehling
4ea14398e8
Merge pull request #174 from badgerman/develop
...
fixing sea serpent names
2015-04-21 12:52:11 +02:00
Enno Rehling
88d370a7b8
fixing sea serpent names
...
https://bugs.eressea.de/view.php?id=2057
2015-04-21 12:35:39 +02:00
Enno Rehling
078106432e
Merge pull request #173 from badgerman/develop
...
Diverse Tippfehler
2015-04-20 19:22:41 +02:00
Enno Rehling
fdb0a79c07
https://bugs.eressea.de/view.php?id=2085
...
Tippfehler
2015-04-20 19:05:26 +02:00
Enno Rehling
e31b671b84
https://bugs.eressea.de/view.php?id=2092
...
Tippfehler
2015-04-20 19:03:53 +02:00
Enno Rehling
3b6add91e6
https://bugs.eressea.de/view.php?id=2091
...
Tippfehler
2015-04-20 19:01:49 +02:00
Enno Rehling
2c40a9f593
https://bugs.eressea.de/view.php?id=2090
...
Tippfehler
2015-04-20 19:00:52 +02:00
Enno Rehling
a18c61439b
Merge pull request #172 from badgerman/develop
...
Bug 2089: Untote geben keine Gegenstände ab. Additional Tests for FOLLOW.
2015-04-20 15:57:24 +02:00
Enno Rehling
a5e68e10fe
test for FOLLOW SHIP
2015-04-20 15:19:17 +02:00
Enno Rehling
d2fbdec831
re-enable disabled tests for E2, add test for FOLLOW.
2015-04-20 15:07:10 +02:00
Enno Rehling
f06e3371a0
Bug 2089 again. rename giveitem flag to keepitem, because races should default to not holding on to their stuff.
2015-04-19 12:49:39 +02:00
Enno Rehling
71d0558403
Bug 2089: remove the giveitem restriction from all races.
...
https://bugs.eressea.de/view.php?id=2089
2015-04-19 09:49:52 +02:00
Enno Rehling
6cb85fd12d
Merge pull request #171 from badgerman/develop
...
MAX_VERSION define
2015-04-19 08:37:47 +02:00
Enno Rehling
6e9fca5e2f
allow version.h to declare a future version that is compatible with the current code as MAX_VERSION that save.c will accept.
2015-04-19 08:36:15 +02:00
Enno Rehling
3e1ae5e0f2
allow reading of JSON_REPORT_VERSION from future source release
2015-04-19 08:13:40 +02:00
Enno Rehling
b7959a8fd8
Merge pull request #169 from badgerman/develop
...
bugfixes and crashes
2015-04-17 21:36:33 +02:00
Enno Rehling
93e79fcf8f
Merge remote-tracking branch 'upstream/develop' into develop
2015-04-17 16:33:30 +02:00
Enno Rehling
961f5e8445
Merge branch 'develop' of github.com:badgerman/eressea into develop
2015-04-17 16:32:53 +02:00
Enno Rehling
743ea02331
test_peasantluck_effect fails on my atom netbook
2015-04-14 03:09:52 +02:00
