Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,430 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

192 Commits

Author SHA1 Message Date
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
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
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