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

483 Commits

Author SHA1 Message Date
Enno Rehling 4154b1c3d9 remove additional whitespace in some strings. 2018-05-19 13:34:00 +02:00
Enno Rehling adfc4ad7ce add a header to po files, charset UTF-8 2018-05-18 21:54:46 +02:00
Enno Rehling c11a020846 remove the text from messages.xml 2018-05-18 21:24:08 +02:00
Enno Rehling 6608f1b1ab Merge branch 'develop' 2018-05-18 15:34:50 +02:00
Enno Rehling 87914a7b5b delete XML Strings. 2018-05-17 23:27:29 +02:00
Enno Rehling bad58eeef4 remove superfluous keywords from e3 strings. 2018-05-17 23:19:54 +02:00
Enno Rehling 6f6f2c1c2e Additional strings used by E3 only. 2018-05-17 23:05:03 +02:00
Enno Rehling 615dfe7ec5 Get the NR message text from locale. 2018-05-17 22:47:16 +02:00
Enno Rehling c0ed53b679 last of the duplicate names. battles have lost their separators, though. 2018-05-17 22:15:24 +02:00
Enno Rehling 7a10a58605 1. nrmessage is locale-independent, uses locale_getstring 
2. unique strings:
rename aurapotion50 message.
delete unused bithday_firework definitions.
 2018-05-17 19:04:25 +02:00
Enno Rehling 9ca945cb2c add a string escaping function. 
start some work on nrmessage.c.
 2018-05-17 16:53:56 +02:00
Enno Rehling 35c3d4cda0 export messages and strings into separate .po files 
commit the exported files.
 2018-05-17 10:43:23 +02:00
Enno Rehling 0a9f8bf662 merge from develop 2018-05-15 21:59:01 +02:00
Enno Rehling 269030082c remove struct equipment from the code entirely. 2018-05-15 21:51:47 +02:00
Enno Rehling 9dd38a6593 convert E2 familiars from XML to Lua 2018-05-15 06:58:07 +02:00
Enno Rehling e46cfa5e77 remove even more equipment xml to Lua 
only familiars still TBD, I think.
 2018-05-14 22:01:32 +02:00
Enno Rehling 2a026da1fd Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-05-14 19:27:41 +02:00
Enno Rehling 40a2a6735a mac build fix, dragon spoils equipment in Lua 2018-05-14 04:42:59 +02:00
Enno Rehling cadb374ab8 re-add accidentally deleted undead and dracoid equipment. 2018-05-13 22:01:51 +02:00
Enno Rehling 2be0e9bd41 customize equipment for each game, in Lua. 
no more equipment.xml for e3
 2018-05-13 21:58:01 +02:00
Enno Rehling a741eaca97 equip new orcs in e2 with lua and a hacky callback. 2018-05-13 21:23:54 +02:00
Enno Rehling 4240e142a5 BUG 2440: the random encounters code was completely unused. 2018-05-13 16:15:22 +02:00
Enno Rehling 666d5715ab BUG 2439 Strassenbau Fehlermeldung (Region/Richtung). 2018-05-13 13:03:47 +02:00
Enno Rehling 40125bb75e translate seed_%race% equipment from xml to lua. 2018-05-12 20:52:10 +02:00
Enno Rehling 85cf8da383 rename canteach/canlearn to teach/learn 
race/function is never used (and there is no namedragon function).
 2018-05-10 20:37:37 +02:00
Enno Rehling 94769a66f8 teach vs canteach mixup 2018-05-10 20:18:56 +02:00
Enno Rehling ad0491cecb Merge branch 'develop' 2018-05-10 20:03:16 +02:00
Enno Rehling b0012eeae0 familiars do not need the default value in XML (bad XML). 2018-05-10 20:02:53 +02:00
Enno Rehling 907348adfc merge race xml changes (teach, migrants, floating point) 2018-05-09 22:21:50 +02:00
Enno Rehling c05a65b881 expat parses (most of) races. 
fix canteach flag in XML.
 2018-05-09 22:16:30 +02:00
Enno Rehling 8c7b890f3e set the default unarmed modifiers for races. 2018-05-09 20:56:38 +02:00
Enno Rehling f2e6825dab Merge branch 'develop' 2018-05-08 23:22:31 +02:00
Enno Rehling 3f9b3219fe BUG 2348: bad XML 2018-05-08 23:22:05 +02:00
Enno Rehling c9b9bac2ac Merge branch 'develop' 2018-05-08 23:11:14 +02:00
Enno Rehling ae3c0b099f spells do not have a function element in XML 2018-05-08 23:10:51 +02:00
Enno Rehling 371335ab95 spell flag merge conflicts 2018-05-08 21:45:21 +02:00
Enno Rehling ccf09770e3 rename global target flag, invert logic 2018-05-08 21:43:13 +02:00
Enno Rehling 17ea7a224a spell ranks cannot be negative 2018-05-06 09:02:27 +02:00
Enno Rehling cd2435dbb0 spell xml does not define an index attribute 2018-05-06 09:00:11 +02:00
Enno Rehling 85509cdf65 fix some bugs in reading weapons. 2018-05-04 18:41:59 +02:00
Enno Rehling 75aff73e9a Merge branch 'develop' 2018-05-03 23:01:42 +02:00
Enno Rehling 20b82fee51 old spellbooks no longer used anywhere 2018-05-02 21:55:17 +02:00
Enno Rehling 1ef57ef4f0 merge conflicts, race masking. 2018-04-29 13:50:56 +02:00
Enno Rehling 837ab325f9 XML simplificatio: unified system for masking races on modifiers. 2018-04-29 13:46:17 +02:00
Enno Rehling 3cb1d1a071 simplify race masking for weapon modifiers. 2018-04-29 13:13:10 +02:00
Enno Rehling 0b22b50013 the presspass is cursed, attribute needs to be on item, not resource. 2018-04-28 11:38:11 +02:00
Enno Rehling 346f56ebdb merge conflict description namespace vs. xinclude removal and new potion names. 2018-03-11 09:19:16 +01:00
Enno Rehling bf21f24f98 BUG 2426: E3 hat kein RC_TEMPLATE, split potion names and descriptions 2018-03-11 09:02:02 +01:00
Enno Rehling cb537b1a93 missing translations are the worst. 2018-02-17 21:08:58 +01:00
Enno Rehling 06f3e337b6 missing plural for lifepotion 2018-02-17 20:56:40 +01:00
Enno Rehling 6c572c6287 rename potion: p14 to healing 
fix use_item message crash
 2018-02-17 20:35:00 +01:00
Enno Rehling d065cbfca7 use_item message with amount instead of usepotion without. 2018-02-17 15:30:38 +01:00
Enno Rehling 96062f6f85 rename p2->lifepotion (WdL) 2018-02-17 10:45:56 +01:00
Enno Rehling 4f63cf12b2 firesword, magical damage 2018-02-07 19:35:24 +01:00
Enno Rehling 5a3978566a adamantium and laen weapons are magical. 2018-02-07 18:46:31 +01:00
Enno Rehling 1ee6f5444a finish XInclude removal project. 
reduce number of XML files for E3.
 2018-02-06 21:28:55 +01:00
Enno Rehling df255b886a verify xml loading, fix remaining files for e2. 2018-02-06 18:46:28 +01:00
Enno Rehling 434b7ae29e convert all of E2 to new config loading. 2018-02-05 19:35:15 +01:00
Enno Rehling da02c1b92e Use custom URI schemes for config files. 
TODO: XML files need to be rebased, XIncludes replaced.
 2018-02-05 17:46:11 +01:00
Enno Rehling 961c6e0130 delete unused XML files 2018-02-05 17:41:35 +01:00
Steffen Mecke c6a459c918 fixed typo for sound_out 2018-02-01 11:33:11 +01:00
Enno Rehling 1eaa1e6d84 BUG 2405: use mistletoe to create effect, use effect to flee from battle. 2018-01-21 18:07:49 +01:00
Enno Rehling 787abc90cf provide more missing messages in test setups. 2018-01-14 11:58:22 +01:00
Enno Rehling 4eb4c61d37 BUG 2387 some tweaks to the first draft. 2018-01-02 20:34:42 +01:00
Enno Rehling 0440fcc11c bug 2400: magicbag preservation 2017-12-31 13:14:44 +01:00
Enno Rehling 0686e6ceba bug 2399: %% typo. 2017-12-31 11:57:57 +01:00
Enno Rehling fc570d2ec7 bug 2402: xmas fix 2017-12-31 11:36:47 +01:00
Enno Rehling cff4e12fbd celan up tests, rename test_cleanup -> test_teardown. 2017-12-27 19:58:39 +01:00
Enno Rehling 28252fda7b bug 2197: fix E3 potion text. 2017-12-26 16:09:15 +01:00
Enno Rehling e9508d6f8e bug 2218: make maelstrom curseinfo not be a dupe of spelllinfo. 2017-12-25 21:59:01 +01:00
Enno Rehling cba452786f BUG 2396: insect recruit messages fixed, and tests added. 2017-12-22 11:15:17 +01:00
Enno Rehling 714e44cd71 BUG 2392: remove minskill attribute from any weapons. 2017-12-17 10:19:07 +01:00
Enno Rehling 63c066dfe3 BUG 2387: Zauberbeutel braucht kein notlost Attribut. 2017-12-16 20:29:07 +01:00
Enno Rehling 77921a94ba BUG 1986: Jedes Magiegebiet kann Vertraute rufen. 2017-12-11 19:47:57 +01:00
Enno Rehling 9f391039b5 more bsdstring removal, str_replace, unit tests. 2017-12-11 18:20:21 +01:00
Enno Rehling b337373bc9 shorten some names, too many messages with the same prefix are inefficient. 2017-10-16 20:38:52 +02:00
Enno Rehling e2f6ada862 limit equipment names to 15 byte plus nul. 2017-09-18 17:46:26 +02:00
Enno Rehling 455e03fa05 try and make coverity understand the equipment trie. 
shorten names.
 2017-09-17 20:42:43 +02:00
Enno Rehling 46b065dd29 BUG 2203: Schattenrichter sind gewichtslos 2017-09-04 20:08:56 +02:00
Enno Rehling aa27c91a6e BUG 2289: Beschreibung "Opfere Kraft" 2017-08-27 17:11:07 +02:00
Steffen Mecke 4fe72b5d28 BUG 2350: read studyspeed correctly and fix orcs 2017-08-01 22:09:57 +02:00
Enno Rehling 3445e376e0 allow GIVE PERSON for undead race, too 2017-07-22 12:36:01 +02:00
Enno Rehling f8de1bf29e remove default values from XML (capacity=1) 2017-07-17 16:11:00 +02:00
Enno Rehling 5f463fbc4c btype->cons->maxsize does not matter if it's not a multi-stage building (castle, watch). 2017-07-17 14:06:25 +02:00
Enno Rehling 3c2754071d this test fails when btype->maxsize isn't used as a limit for building. 2017-07-17 14:01:08 +02:00
Enno Rehling f934e4d5e3 remove unused ECF_KEEP_ITEM flag. 2017-07-17 12:31:47 +02:00
Enno Rehling 427d32c9d2 Merge pull request #708 from ennorehling/2331-undead-give 
BUG 2331: allow GIVE for undead.
 2017-07-15 12:44:47 +02:00
Enno Rehling 8344f41a70 allow GIVE for juju, ghast, skelord, too. 
make the tests nicer.
 2017-07-15 12:28:26 +02:00
Enno Rehling a0afa1f225 Merge pull request #707 from ennorehling/develop 
BUG 2256: kill the FFL_NEWID flag
 2017-07-09 15:50:07 +02:00
Enno Rehling 518db87015 eliminate unused message 2017-07-09 15:41:11 +02:00
Enno Rehling 2107a84b0d also allow GIVE for ghouls and skeletons. 2017-07-09 15:25:33 +02:00
Enno Rehling 60efb12d70 Zombies koennen Personen gebn 2017-07-09 13:37:46 +02:00
Enno Rehling bcf103f581 fix raindance_effect message in E2 2017-06-11 15:17:04 +02:00
Enno Rehling 7806f4991f store calendar configuration nin JSON, not XML. 2017-05-07 17:46:51 +02:00
Enno Rehling 80d696d02a remove the funcpointer from struct spell. 2017-04-30 22:15:18 +02:00
Enno Rehling 976b23be72 refactor E3 to use the same raindance/harvest spells as E2. 
only indirect effects are different.
 2017-04-30 21:39:08 +02:00
Enno Rehling bd9968c266 set the callback, remove lua_callspell from XML. 
WIP: some spells cannot find their lua callback.
 2017-04-30 21:38:44 +02:00
Enno Rehling 7a289ceb86 simplify building_taxes, eliminate dead lua callbacks. 2017-04-29 19:21:48 +02:00
Enno Rehling a313e78de5 move building names from function to construction data. 2017-04-26 21:44:24 +02:00
Enno Rehling b06e93db7a BUG 2317: wyrms in E2 didn't move 2017-04-17 16:50:15 +02:00