Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
9280 commits 10 branches 0 tags 41 MiB
Commit graph

79 commits

Author SHA1 Message Date
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
4240e142a5 BUG 2440: the random encounters code was completely unused. 2018-05-13 16:15:22 +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
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
96062f6f85 rename p2->lifepotion (WdL) 2018-02-17 10:45:56 +01:00
Enno Rehling
df255b886a verify xml loading, fix remaining files for e2. 2018-02-06 18:46:28 +01:00
Steffen Mecke
c6a459c918 fixed typo for sound_out 2018-02-01 11:33:11 +01:00
Enno Rehling
0686e6ceba bug 2399: %% typo. 2017-12-31 11:57:57 +01:00
Enno Rehling
cba452786f BUG 2396: insect recruit messages fixed, and tests added. 2017-12-22 11:15:17 +01:00
Enno Rehling
9f391039b5 more bsdstring removal, str_replace, unit tests. 2017-12-11 18:20:21 +01:00
Enno Rehling
aa27c91a6e BUG 2289: Beschreibung "Opfere Kraft" 2017-08-27 17:11:07 +02:00
Enno Rehling
7806f4991f store calendar configuration nin JSON, not XML. 2017-05-07 17:46:51 +02:00
Enno Rehling
51ec560f72 Merge branch 'master' into develop 
Conflicts:
	scripts/tests/e2/init.lua
	scripts/tests/e3/init.lua
	src/economy.c
	src/economy.test.c
	src/kernel/item.c
	src/modules/arena.c
 2017-03-11 14:41:25 +01:00
Enno Rehling
8b9f0f0894 BUG 2307: report mallorn trees as Mallorn in the CR. 
for legacy compatibility, we cannot call them Mallornbaeume.
 2017-03-10 23:18:09 +01:00
Enno Rehling
cdb65dfd36 Turns out: We did not have a singular form of sapling. 2017-03-05 18:57:28 +01:00
Enno Rehling
caa8159428 eliminate duplicate string definition 2017-03-05 09:52:17 +01:00
Enno Rehling
1b93c14806 Test E2 items in E2 only. 
Remove eye of demon (broken item).
 2017-02-27 18:50:48 +01:00
Enno Rehling
d039ca2b2e fix display of sapling and mallornsapling. 
remove mateiral from XML where it's not needed.
 2017-02-25 21:07:13 +01:00
Enno Rehling
2d4b61afa9 the artacademy was E2-only 2017-02-24 14:32:18 +01:00
Enno Rehling
794dae11cf remove artsculpture and genericbuilding. 
deal with buildings having an unknown type.
 2017-02-24 14:29:14 +01:00
Enno Rehling
bfb5a9b692 set age_unit and name_unit funpointers in rc_create. 
no more <function/> in XML races.
rename juju-zombie => juju.
 2017-02-20 22:07:36 +01:00
Enno Rehling
7d5586635e remove shadowcall spell 2017-02-18 18:24:44 +01:00
Enno Rehling
30665f874a fix game_name, remove it from rules 2017-01-22 20:32:54 +01:00
Enno Rehling
9ccaab6516 Korrekte Email-Subject und Adresse, auch im NR. 
Eliminate crufty per-game strings.
 2017-01-22 20:19:32 +01:00
Enno Rehling
28aa2a56b8 Entferne unbenutztes "Szepter der Tränen". 
Was für eine saublöde Idee.
 2016-11-13 17:49:16 +01:00
Enno Rehling
5ccb2c3dc8 remove recruitcost from non-player races. 
make score not call old_race.
fix orcs don't get scored.
https://bugs.eressea.de/view.php?id=2241
delete some unused race-enums.
delete centaurs.
 2016-09-22 18:28:37 +02:00
Enno Rehling
3a719226a2 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2016-09-01 21:55:52 +02:00
Enno Rehling
a75b591784 Fix the nocostbuilding curse description. 
https://bugs.eressea.de/view.php?id=2232
 2016-09-01 20:49:05 +01:00
Enno Rehling
ce7eb9663a remove dead phoenix feature. 2016-08-29 20:56:00 +01:00
Enno Rehling
33701ab891 make describe_braineater more generic (describe_race). 2016-08-28 20:44:45 +01:00
Enno Rehling
901cf97cb2 refactoring the "nocostbuilding" curse. 
- remove C_NOCOST constant and other baggage
- refactor maintenance a bit
 2016-08-21 20:02:19 +02:00
Steffen Mecke
c5014fd766 integrated Ennos suggestions for dragon growls 
Dragons now growl 20% more elegantly!
 2016-06-11 13:47:38 +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
4f7b274bf6 Merge branch 'master' into develop 
Conflicts:
	res/core/messages.xml
	src/buildno.h
 2016-01-01 16:38:57 +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
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
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
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
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