Enno Rehling
a834c486d9
fix a FIXME: setting default order through config, making test better.
...
this feature is not in use, so all this work is really pointless.
2016-04-09 19:05:28 +02:00
Enno Rehling
75f2be75d8
remove code for alp (non-functional)
...
remove code for removecurse trigger (only used by alp)
2016-03-25 21:18:57 +01:00
Enno Rehling
b646c9e22e
duplicate definition of concealing_aura in E3
2016-01-24 11:44:18 +01:00
Enno Rehling
4f7b274bf6
Merge branch 'master' into develop
...
Conflicts:
res/core/messages.xml
src/buildno.h
2016-01-01 16:38:57 +01:00
Enno Rehling
4952f212b8
snowglobe error messages. todo: testing (how?)
2015-12-31 14:43:38 +01:00
Philipp Dreher
18f2cc1d70
cosmetic changes to iteminfo of skillpotion
2015-12-29 09:43:30 +01:00
Philipp Dreher
7b2aa821d0
Added iteminfo for snowglobe in DE+EN
2015-12-29 09:42:54 +01:00
Enno Rehling
2aafb841a5
Merge branch 'master' into develop
...
Conflicts:
res/core/messages.xml
scripts/eressea/e3/init.lua
scripts/eressea/xmas.lua
scripts/eressea/xmasitems.lua
src/buildno.h
src/laws.c
2015-12-26 14:46:20 +01:00
Enno Rehling
cf90f8cf93
it's beginning to look a lot like christmas
...
Conflicts:
scripts/eressea/xmas.lua
2015-12-22 18:46:57 +01:00
Enno Rehling
3fd4884584
putting all of the pieces together for the snow globe, with final use implementation still TBD
...
Conflicts:
scripts/eressea/xmasitems.lua
src/laws.c
2015-12-22 18:46:42 +01:00
Enno Rehling
810ad094af
suppress misc warnings in the log file by reorganizing E3 strings and tuning down log levels
2015-12-18 15:13:15 +01:00
Enno Rehling
acab4b3199
Merge branch 'develop' of https://github.com/ennorehling/eressea.git
2015-12-17 20:36:39 +01:00
Enno Rehling
30acc38d53
https://bugs.eressea.de/view.php?id=2174
...
fix terrain type in detectocean message.
2015-12-17 20:36:21 +01:00
Enno Rehling
b700cb5a2c
Merge branch 'develop' of github.com:ennorehling/eressea into develop
2015-12-17 20:21:01 +01:00
Enno Rehling
02b2157fe5
move description from shared file to game-specific file
...
https://bugs.eressea.de/view.php?id=2177
2015-12-17 20:20:48 +01:00
Enno Rehling
a02d71bfef
https://bugs.eressea.de/view.php?id=2176
...
generate the reduced production message before writing reports, so it shows in the CR.
2015-12-17 12:40:22 +01:00
Enno Rehling
cc88f56a26
no optioinal argument
...
http://bugs.eressea.de/view.php?id=2175#c6408
2015-12-15 07:59:55 +01:00
Enno Rehling
18bcf83d9b
Merge pull request #432 from ennorehling/braineaters
...
no natural ac for braineaters
2015-12-10 22:12:38 +01:00
Enno Rehling
d26cd57934
no natural ac for braineaters
2015-12-10 21:59:14 +01:00
Enno Rehling
b854213be6
Merge pull request #429 from ennorehling/develop
...
break_curse spell description error message
2015-12-06 16:53:04 +01:00
Enno Rehling
6a20345b53
issue #428 , fix writing spell description for break_curse
2015-12-06 16:45:31 +01:00
Steffen Mecke
864c875316
fix typo: fiery breath was icy
2015-12-05 22:27:03 +01:00
Enno Rehling
b3e7fa63e0
Merge pull request #396 from stm2/spell_parameters
...
fixed treatment of spell parameters (bug 1867)
2015-12-03 11:04:57 +01:00
Steffen Mecke
9c076ba6b9
fix piracy_cmd for swimmers and flyers
2015-12-01 22:13:20 +01:00
Enno Rehling
4b7cb824bd
Merge branch 'massive_overload' of https://github.com/stm2/server into stm2-massive_overload
...
Conflicts:
src/move.c
src/tests.c
2015-11-27 12:40:17 +01:00
Enno Rehling
6ad5db8e22
Merge pull request #397 from stm2/taxing_message
...
taxing without skill does not fail silently any more
2015-11-26 18:43:57 +01:00
Enno Rehling
c85e489f4f
Merge branch 'monster_leftovers' of https://github.com/stm2/server into stm2-monster_leftovers
...
Conflicts:
src/kernel/unit.c
src/laws.test.c
src/monsters.c
2015-11-25 14:25:42 +01:00
Enno Rehling
f7698d92a9
change how migrant quota is configured for a race, eliminate the related rule caching
2015-11-22 15:53:50 +01:00
Steffen Mecke
a6757ecf9d
Merge branch 'develop' into massive_overload
...
Conflicts:
src/move.test.c
2015-11-19 14:54:14 +01:00
Steffen Mecke
742a30cc39
fix seaserpents
...
seaserpents could not do piracy
seaserpents should be able to attack after move
2015-11-17 12:17:28 +01:00
Enno Rehling
d07f359acb
fix a minor warning, get ready for 3.7 release
2015-11-16 14:12:51 +01:00
Philipp Dreher
1562439ca9
Moved the description of skillpotion to another namespace
...
Skillpotion isn't actually defined as a potion (or part of the
alchemy-system), therefore the description needs to be moved to the
namespace "iteminfo" to be found.
2015-11-16 03:22:19 +01:00
Steffen Mecke
3a18384ddb
overfull ships do not drift but take damage
...
http://bugs.eressea.de/view.php?id=2157
removed exploit:
ships more than 2 times over their ship type's capacity do not drift but take 30% to 100% damage
2015-11-15 12:43:05 +01:00
Steffen Mecke
493b45c832
taxing without skill does not fail silently any more
...
http://bugs.eressea.de/view.php?id=2158
added configuration parameter for tax per level
2015-11-14 15:36:14 +01:00
Steffen Mecke
4ab92e3caf
fixed descriptions of spells with parameters (bug #2060+1867)
2015-11-13 00:57:14 +01:00
Enno Rehling
4eb4ff40ac
https://bugs.eressea.de/view.php?id=2155
...
monsters do not attack units inside a castle or watch
dragons do not attack guards
2015-11-11 14:36:56 +01:00
Enno Rehling
5aa5d52022
Merge pull request #362 from TurnerSE/bug/#2104
...
ohne die alle gelesen zu haben, akzeptiere ich das mal. Ist auf jeden Fall besser als keine Beschreibung, da bin ich sicher.
2015-11-04 07:45:00 +01:00
Philipp Dreher
56aeae4fbe
one last, but big, translation...
2015-11-04 00:40:24 +01:00
Philipp Dreher
42d0a1beef
more spells translated
2015-11-03 22:43:26 +01:00
Philipp Dreher
d6bcc8345b
translated some more spells
2015-11-03 16:41:57 +01:00
Philipp Dreher
8d70a07901
added english descriptions for a few spells
2015-11-03 13:22:44 +01:00
Enno Rehling
0b00bfecdf
Merge pull request #342 from TurnerSE/bug/CID22449
...
Bug/cid22449
2015-11-02 15:55:44 +01:00
Philipp Dreher
153db447de
removed obsolete messages
2015-11-02 13:09:45 +01:00
Philipp Dreher
de970b4ba9
changed the description for the spell "airship" in DE and EN
2015-11-01 19:12:14 +01:00
Philipp Dreher
597aadbac3
small textual corrections
2015-10-31 17:09:39 +01:00
TurnerSE
df92ed03cf
added descriptions for skillpotion in EN and DE
2015-10-31 02:48:04 +01:00
Enno Rehling
9e49e10d11
Merge branch 'master' into develop
...
Conflicts:
src/buildno.h
src/kernel/unit.test.c
2015-10-10 22:55:29 +02:00
Enno Rehling
6162d0f16c
fixing bug 2141
2015-09-25 11:31:43 +02:00
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