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

248 Commits

Author SHA1 Message Date
Enno Rehling 2e5e8347ac Bug 2489: Kill the SIEGE command, forever. 2018-09-09 21:01:10 +02:00
Enno Rehling 422415870f Merge branch 'master' 2018-09-09 07:54:41 +02:00
Enno Rehling 6f5f1651c7 fix crashes when trying to trade on ocean. 
fix missing message sections.
 2018-09-09 07:41:30 +02:00
Enno Rehling e89fe69d58 simplicate the sink_ship function, do not rescue units. 2018-08-01 11:55:57 +02:00
Enno Rehling a62541a17e BUG 2443: Straßen ohne komplizierte String-Bastelei. 2018-06-11 21:00:33 +02:00
Enno Rehling 2d05a99e7d Renaming a message is more complicated now. I got it wrong with these. 2018-06-09 21:42:21 +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 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 0a9f8bf662 merge from develop 2018-05-15 21:59:01 +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 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
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 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 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 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