Commit Graph

121 Commits

Author SHA1 Message Date
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
Steffen Mecke 864c875316 fix typo: fiery breath was icy 2015-12-05 22:27:03 +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
Steffen Mecke a6757ecf9d Merge branch 'develop' into massive_overload
Conflicts:
	src/move.test.c
2015-11-19 14:54:14 +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
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 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 bd1b568da2 Präfix Erz 2015-09-12 14:13:45 +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 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 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 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