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

83 Commits

Author SHA1 Message Date
Enno Rehling 830a0d9519 in e3, disable the new resource discovery 2020-12-06 19:24:39 +01:00
Enno Rehling f78aa507f8 https://bugs.eressea.de/view.php?id=2701 
fix the academy
make academy, curses and potions work for LERNE AUTO
remove E3 study.speedup
 2020-12-06 15:47:47 +01:00
Enno Rehling 5890db482a remove old XML catalogs, no longer used 2020-09-30 05:03:38 +02:00
Enno Rehling e80701ef35 Allow alternative names for some spells. 2020-08-16 16:00:28 +02:00
Enno Rehling bc6f38d9bc remove superfluous race definitions that are not used anywhere. 2019-05-18 20:32:56 +02:00
Enno Rehling 2e5e8347ac Bug 2489: Kill the SIEGE command, forever. 2018-09-09 21:01:10 +02:00
Enno Rehling 6234ae7e76 readability: bool vs int 2018-06-03 12:27:40 +02:00
Enno Rehling 04a15ba1fd read E3 strings from po file only 2018-05-17 23:13:37 +02:00
Enno Rehling 269030082c remove struct equipment from the code entirely. 2018-05-15 21:51:47 +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 ae3c0b099f spells do not have a function element in XML 2018-05-08 23:10:51 +02:00
Enno Rehling 438ae6f905 Eliminate rules.magic.multipotion, it's too much code. 2018-02-17 15:17:05 +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 a7c45d31ad bug 2214: drifting ships in E3 should take no damage. 2017-12-25 23:22:58 +01:00
Enno Rehling 73f49ec90a fix demon hunger in E3 and one intermittent test. 
tests involving demons can disable skill changes.
 2017-12-22 19:14:01 +01:00
Enno Rehling 3685bcabfb BUG 2389: insects starve in glaciers. 
add feature tests for hunger.
 2017-12-17 14:06:40 +01:00
Enno Rehling eccf6bef7a consistent naming of module configurations (singular). 
add module switch for volcano.
 2017-11-06 21:04:30 +01:00
Enno Rehling 4bf4f088b0 BUG 2346: restore old unit limits 2017-08-25 14:10:43 +02:00
Enno Rehling 233ea9dce4 BUG 2337: lighthouse capacity is # of units, not people. 2017-07-17 17:08:27 +02:00
Enno Rehling bcf103f581 fix raindance_effect message in E2 2017-06-11 15:17:04 +02:00
Enno Rehling b266509746 Einheitenlimit anheben (3000 und 500) 2017-05-27 20:07:36 +02:00
Enno Rehling 80ab32cf51 remove calendar.xml from rules. 2017-05-07 17:48:59 +02:00
Enno Rehling 7806f4991f store calendar configuration nin JSON, not XML. 2017-05-07 17:46:51 +02:00
Enno Rehling 733c754e0f rename some configuration options. 
add them to the valid keys for eressea.ini, too.
 2017-03-25 14:15:01 +01:00
Enno Rehling ac12cb966d implement fixed wage functions, select by constant value 2017-03-16 16:07:52 +01:00
Enno Rehling be14394529 load locales and rules separately (xml prep work) 2017-02-19 16:33:24 +01:00
Enno Rehling 3b3e39a319 optimization: elf-special "regen.forest" is now a config. 
this is an E3 feature
eliminates rc.parameters for elves
allows use of a local cached static
 2017-02-04 23:21:36 +01:00
Enno Rehling d794ad4433 Eressea config requires game.id 
At home, I am running all games from the same directory for testing, and cannot use eressea.ini for setting game.id

Override it in eressea.ini for other games.
 2017-01-28 20:02:15 +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 d29fd96f59 no starting equipment. 
do not let the addplayer function give equipment.
rename equipment for autoseed.
 2017-01-22 08:05:19 +01:00
Enno Rehling 446e58c383 use the email address from eressea.ini in CR mailto 2017-01-22 04:46:36 +01:00
Enno Rehling bf70792da6 make kn-bremen.de official email address 2016-11-27 16:07:46 +01:00
Enno Rehling ec4060cb9a fix curse-vigour calculation math. 
also fix a ton of small other niggles from pvs-studio.
 2016-11-20 19:08:39 +01:00
Enno Rehling e50dfbf42b fix terrains.json, reduce config.h use 2016-11-15 23:56:39 +01:00
Enno Rehling 83ea1077a3 delete default terrain. 
github issue #538
 2016-11-15 23:37:30 +01:00
Enno Rehling 402c19d8fc dn't warn new player about NMR. 
newbie info text was no longer valid.
 2016-09-11 16:35:55 +02:00
Enno Rehling a834c486d9 fix a FIXME: setting default order through config, making test better. 
this feature is not in use, so all this work is really pointless.
 2016-04-09 19:05:28 +02:00
Steffen Mecke 11b8d85167 fixed reversed logic for demon peasant hunger (bug 2187) 
renamed config variable hunger.demons to hunger.demons.peasant_tolerance and reversed reversed logic in upkeep.c
 2016-02-28 16:15:48 +01:00
Steffen Mecke bd5d3376d5 fixing booleans in config 
see cf08cdf3fb
 2015-12-30 14:05:42 +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 e574919555 Merge branch 'master' of github.com:eressea/server 2015-12-26 14:40:21 +01:00
Enno Rehling 92636cfcd9 put the new(ish) email subject line in the CR, 
as reported in https://bugs.eressea.de/view.php?id=2016
 2015-12-26 11:05:03 +01:00
Enno Rehling 274322c5b2 fix desert.road in E3 also for 3.7.x 2015-12-20 20:16:13 +01:00
Enno Rehling ee4480250f https://bugs.eressea.de/view.php?id=2172 
desert.road was wrong (probably from migrating XML to JSON)
 2015-12-05 17:30:25 +01:00
Enno Rehling 5b9333f6d9 Merge branch 'release-3.7' into develop 
Conflicts:
	src/buildno.h
	src/monsters.c
 2015-11-23 17:12:48 +01:00
Enno Rehling c7ab0e8f59 fix https://bugs.eressea.de/view.php?id=2164 (ships get no damage when they drift). 
simplify attack_chance configuration, set it only once.
this way, I can more easily fudge it to 1.0 in the debugger.
 2015-11-23 12:37:42 +01:00
Enno Rehling f7698d92a9 change how migrant quota is configured for a race, eliminate the related rule caching 2015-11-22 15:53:50 +01:00
Enno Rehling ee02721c21 fix and tests for otherfaction attributes in E2 
https://bugs.eressea.de/view.php?id=2152
 2015-11-09 13:36:52 +01: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