Enno Rehling
84a92124bd
Merge branch 'feature/bug-2053-attack-monsters' of https://github.com/ennorehling/eressea into ennorehling-feature/bug-2053-attack-monsters
...
Conflicts:
conf/e3/config.xml
2015-09-19 13:35:53 +02:00
Enno Rehling
bd1b568da2
Präfix Erz
2015-09-12 14:13:45 +02:00
Enno Rehling
c57918ede0
replace XML terrains for E3 and E4 with JSON configuration
2015-09-11 22:43:08 +02:00
Enno Rehling
7e8fef01af
forgot some flags for volcano terrain, caused integration test to crash. neat.
2015-09-11 22:18:57 +02:00
Enno Rehling
b4971dd651
replace all of the E2 terrains with JSON data (no more XML!)
2015-09-11 22:11:59 +02:00
Enno Rehling
db4cb2618b
transfer most core and all game-specific terrains for E2 from XML to JSON.
2015-09-11 21:14:10 +02:00
Enno Rehling
8860244f1c
Merge branch 'link-seen-duplicate' into feature/feature-json-terrains
2015-09-11 11:12:30 +02:00
Enno Rehling
aefc74c2fb
New German spelling : daß -> dass
2015-09-09 09:04:00 +02:00
Enno Rehling
b8df3f3a5f
increase the datatype for scores from int to long long
...
this fixes https://bugs.eressea.de/view.php?id=2136
2015-09-06 19:04:04 +02:00
Enno Rehling
d08959f9a8
fix German spelling in a message,
...
add a test for is_guarded.
2015-08-30 14:52:42 +02:00
Enno Rehling
7bb882b15b
add a spell for igjarjuk (WIP)
2015-08-30 10:57:08 +02:00
Enno Rehling
a9ecd1f55e
replace all at_travelunit code with travelthru_map calls.
...
welcome to callback hell.
this should stop the buffer for travelthru from running over.
tests for this should be hell, and I still owe writing them.
2015-08-19 14:37:51 +02:00
Enno Rehling
b50c1720cf
several monster_attack fixes.
...
1. do not try to attack other monsters.
2. monsters outside of a building can attack units outside of buildings.
3. dragons can guard without weapons.
2015-08-16 16:18:59 +02:00
Enno Rehling
398579c293
remove duplication, fix a stray blank space in the NR.
2015-08-07 16:17:11 +02:00
Enno Rehling
816243d2d7
magicians can always identify their own curse-effects.
...
magic-resistance on a building is always visible to anybody, just like it is on units.
2015-08-07 15:52:10 +02:00
Enno Rehling
afbc4c816b
refactoring ship speed, extract total skills of sailors into a function.
2015-08-07 12:43:18 +02:00
Enno Rehling
4d061d8592
repair update_long_order and K_DESTROY handling according to discussion in https://bugs.eressea.de/view.php?id=2080
2015-08-04 22:47:55 +02:00
Enno Rehling
034d1d5433
Merge branch 'feature/rename-cerddor' into develop
2015-07-08 19:03:45 +02:00
Enno Rehling
b8e17839a7
eliminate some spammy warnings.
2015-07-08 18:27:27 +02:00
Enno Rehling
05f444bab1
Merge branch 'feature/rename-cerddor' into develop
2015-07-08 17:53:09 +02:00
Enno Rehling
6abf8f7adb
bug 1692: rewrite of magicresistance curse-info, especially for buildings (homestome spell).
2015-07-08 05:12:26 +02:00
Enno Rehling
c8ffe8da7a
Bug 2115: fix cerrdor -> cerddor spelling errors.
2015-07-07 20:30:34 +02:00
Enno Rehling
cc3c5580d4
rewrite and unit tests
2015-07-07 20:23:24 +02:00
Enno Rehling
17fb05b167
Merge pull request #253 from badgerman/feature/bug-1692-magicresistance-visibility
...
bug 1692: magicresistance visibility
2015-07-06 17:59:16 +02:00
Enno Rehling
960e0f8024
do not show magic resistance effects to other than the unit's own faction.
...
https://bugs.eressea.de/view.php?id=1692
2015-07-06 16:13:22 +02:00
Enno Rehling
40cd6b3bc4
Merge pull request #248 from badgerman/feature/bug-1838-deathcloud-duration
...
Bug 1838: deathcloud duration and messages
2015-07-03 18:32:25 +02:00
Enno Rehling
af004bb27b
individual poison damage messages
2015-07-03 18:27:10 +02:00
Enno Rehling
979f3460d6
Bug 1805: re-enable NMR warnings
...
https://bugs.eressea.de/view.php?id=1805
move warnings to the top of the list of errors in the NR
2015-07-03 15:31:57 +02:00
Enno Rehling
c634a01a3f
Bug 1949: Zauberbeutelverhalten (magic bag tests & config changes)
...
https://bugs.eressea.de/view.php?id=1949
2015-07-01 22:13:24 +02:00
Enno Rehling
2967cd59cf
replace pushnumber with pushinteger where applicable (prep for Lua 5.3).
...
also kill an unreferenced string.
2015-06-08 20:53:40 +02:00
Enno Rehling
3e48b9b966
libxml 1.9.x seems to be a bit pickier about how XML catalogs are written.
2015-06-08 16:51:41 +02:00
Enno Rehling
0fb547f7c2
Beispiel Trolle -> Schlümpfe
...
Test des Atom Editors
2015-05-12 08:41:14 -07:00
Enno Rehling
94929be51f
Merge pull request #187 from badgerman/develop
...
Convert all XML files to UTF-8
2015-05-11 23:29:28 -07:00
Enno Rehling
a0c6bbb9aa
fix encoding conversion errors from previous commit
2015-05-11 23:20:32 -07:00
Enno Rehling
a4774be652
Convert all XML files to UTF-8, to allow editing with Atom.
2015-05-11 16:55:11 -07:00
Steffen Mecke
ca89213295
fixed mallorn curse message
2015-05-07 17:51:44 +02:00
Steffen Mecke
94ae774fed
fix spelling of spell titles
2015-05-07 17:51:43 +02:00
Steffen Mecke
9407b4c9c0
fixed crash of analyze magic
...
because of missing spell/curse description
2015-05-07 17:51:43 +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
Steffen Mecke
a9a14a79d0
fixed messed up english strings for wounds
2015-04-30 15:47:29 +02:00
Steffen Mecke
81e96c121a
typo
2015-04-27 15:14:42 +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
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
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
7e92e6501c
remove the (broken) summon_alp spell, by request
...
https://bugs.eressea.de/view.php?id=2086
2015-04-04 11:02:56 +02:00
Enno Rehling
491f6f2cb3
re-enable silver weight
2015-03-07 13:56:31 +01:00
Enno Rehling
b7de307385
Merge branch 'message_fix' of https://github.com/stm2/server into stm2-message_fix
2015-02-20 20:05:44 +01:00
Steffen Mecke
b5f8be8a95
fix heroes must not recruit
2015-02-10 18:17:58 +01:00
Steffen Mecke
7fd32e425a
fix spy and volcano messages
2015-02-09 09:15:43 +01:00
Enno Rehling
a2e071d35b
Fix broken syntax in message about effects on units.
...
Add some missing descriptions.
Bump version number.
2015-02-08 13:09:04 +01:00
Enno Rehling
5c975655b1
remove french messages that are not french
2015-02-02 21:45:47 +01:00
Steffen Mecke
d288c74aaf
fix stork message (mantis 2027), add tests
2015-02-02 21:32:29 +01:00
Enno Rehling
ba26897872
Merge branch 'master' of github.com:eressea/server
2015-02-01 12:25:35 +01:00
Enno Rehling
9a395127ac
Merge branch 'nr_localization_fix' of https://github.com/stm2/server into stm2-nr_localization_fix
...
Conflicts:
src/report.c
2015-02-01 12:24:19 +01:00
Enno Rehling
c75012b61d
Merge pull request #119 from stm2/giant_message_typo_fix
...
translated English messages and fixed a ton of typos
2015-02-01 11:44:18 +01:00
Enno Rehling
03cddee6b7
Small plural/singular fix in German message.
2015-02-01 10:39:36 +01:00
Enno Rehling
df5ab02689
Merge branch 'peasantgrowth_acceleration' of https://github.com/stm2/server into stm2-peasantgrowth_acceleration
2015-01-30 22:11:10 +01:00
Steffen Mecke
4c391ae6f6
implemented Enno's suggestions for peasant growth
2015-01-29 23:55:02 +01:00
Enno Rehling
87735c6c8e
Merge pull request #121 from badgerman/version-3-4
...
Version 3.4 final preparations before launch
2015-01-29 18:08:58 +01:00
Enno Rehling
c3ed521d4f
Merge branch 'version-3-4' of https://github.com/badgerman/eressea into badgerman-version-3-4
...
Conflicts:
src/laws.c
2015-01-29 18:03:21 +01:00
Enno Rehling
7527e6e903
disable silver weight for the initial rollout of version 3.4
...
two weeks after launch, revert this commit
2015-01-29 16:56:21 +01:00
Steffen Mecke
ec6560a281
adding a nice region message
2015-01-15 03:48:19 +01:00
Enno Rehling
6fb23af66a
test that ships are encumbered by money. define money in XML, not just in code.
2015-01-14 17:56:12 +01:00
Steffen Mecke
039ee159cb
a bunch of messages in the NR where not localized
2015-01-14 16:17:21 +01:00
Steffen Mecke
e727f9e9d4
translated English messages and fixed a ton of typos
2015-01-14 01:59:10 +01:00
Steffen Mecke
9142b79614
fixed message (bug #1506 )
2015-01-14 01:58:26 +01:00
Enno Rehling
4f2d9260d1
add a message to the unit that gets kicked, with tests
2015-01-13 07:43:30 +01:00
CTD
34fc1b3d34
Variablen leserlicher gemacht
2015-01-12 10:55:07 +01:00
CTD
ac3195851a
Erstmal nur der Burgenbonus
...
Das mit der Größe kommt noch mal extra, der Übersicht wegen.
Sinvoller weise kann man den Bonus jetzt in der castle.xml einstellen.
Mit neuen Defaultwerten in den XML Dateien.
2015-01-09 15:53:14 +01:00
Enno Rehling
90dd700487
BREED/PLANT/GROW are technically the same command, merge them.
...
The new parser makes this easy.
2015-01-04 15:11:49 +01:00
Enno Rehling
66ba288bae
type in spell description (bug 2061).
...
https://bugs.eressea.de/view.php?id=2061
2014-12-31 22:43:08 +01:00
Enno Rehling
b3bec13051
report the unit limit in NR and CR.
...
this implements https://bugs.eressea.de/view.php?id=2055
2014-12-19 19:57:24 +01:00
Enno Rehling
4b1ac68446
let the snowman give items to other units.
...
this fixes https://bugs.eressea.de/view.php?id=1924
2014-12-14 20:09:43 +01:00
Enno Rehling
27b1d55350
enhancement: buildings without an owner report their lack of upkeep to the entire region.
...
https://bugs.eressea.de/view.php?id=1713
2014-12-14 11:48:15 +01:00
Enno Rehling
dd87907566
bugfix: making clones help with upkeep.
...
https://bugs.eressea.de/view.php?id=1560
2014-12-13 23:37:42 +01:00
Enno Rehling
ef415c66d0
Fix GIVE 0 behavior on oceans.
2014-12-11 08:51:03 +01:00
Enno Rehling
ecc3b1b441
Dragons re using the new LOOT command.
...
Fixing the income message (missing ")").
2014-11-02 11:10:26 +01:00
Enno Rehling
bbd4e31cf9
Merge branch 'loot' of github.com:CTD1/eressea-server-bugfixing into CTD1-loot
...
Conflicts:
res/core/de/strings.xml
2014-11-02 10:02:30 +01:00
Enno Rehling
6bd52012c0
read keywords from json configuration, use German imperative forms.
2014-10-29 19:40:09 +01:00
Enno Rehling
96d5544b1f
Bug 2032: rename FIGHT back to COMBAT
2014-10-20 17:13:32 +02:00
Enno Rehling
f4f9e74e90
Merge branch 'master' of github.com:eressea/server
2014-10-19 05:56:41 +02:00
CTD
1c7075573b
Plündern
...
Neues Kommando Plündern für die Monster (kann über XML-Option auch für
Spieler freigeschaltet werden)
2014-10-16 14:45:21 +02:00
Enno Rehling
595dc1334e
fix new harbor code, add tests.
...
- alliances were checked in the opposite direction
- code crashed when harbor has no owner
2014-10-03 21:26:11 +02:00
Enno Rehling
68730749fb
fix astral space special direction, vortex (translation issue).
2014-09-29 21:19:07 +02:00
Enno Rehling
3e829e2880
support for itoab with smaller bases and larger numbers.
...
also a missing English message (museum-related)
2014-09-29 18:32:12 +02:00
Enno Rehling
baffbbf154
Merge branch 'master' of github.com:eressea/server
2014-09-04 21:20:15 +02:00
Enno Rehling
c0230d2662
In the game, there is only ever one special direction, and it is for the astral space.
...
less XML, more code.
cleaning up the special direction parsing a bit.
2014-08-28 19:50:38 +02:00
Enno Rehling
2211111b29
Remove a German-only piece of text, to reduce the footprint of fleets in the report a little.
...
Fix English score message in NR.
Small fixes to meet Visual Studio warning level 4.
2014-08-25 00:45:32 +02:00
Enno Rehling
e87b1cf372
an experiment to have deterministic sort order for known factions in the report.
2014-08-25 00:06:33 +02:00
Enno Rehling
5befbad7c7
Merge branch 'version-3-1'
...
Conflicts:
src/laws.c
2014-08-24 00:30:12 +02:00
Enno Rehling
beacb850c6
fix MAKE TEMP, for real this time. I hate skip_token and all that stuff.
2014-08-23 00:37:33 +02:00
Enno Rehling
b2dc6a3a9d
fix MAKE TEMP, for real this time. I hate skip_token and all that stuff.
2014-08-23 00:35:06 +02:00
Enno Rehling
1dcb14cfb9
Revert "silver has a weight of 1: http://bugs.eressea.de/view.php?id=2013 "
...
This reverts commit 911992b04d
.
2014-08-22 20:15:44 +02:00
Enno Rehling
a84e628522
Repair MAKE, which broke when I changed MAKE TEMP.
...
You can now also write MAKETEMP as one word, and we treat it that way.
Added unit test coverage for MAKE order parsing.
2014-08-21 07:31:28 +02:00
Enno Rehling
fb7c8a898f
add a test for get_monsters().
...
I want to make sure I don't break this in the future.
2014-08-20 08:18:47 +02:00
Enno Rehling
acfe72f24e
add a test for get_monsters().
...
I want to make sure I don't break this in the future.
2014-08-20 07:00:58 +02:00
Enno Rehling
308b5ca358
Merge branch 'master' of https://github.com/eressea/server
2014-08-18 20:30:20 +02:00