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

46 Commits

Author SHA1 Message Date
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
Enno Rehling 547532bc63 remove deprecated learn_skill function and configuration 2016-03-24 22:31:07 +01:00
Enno Rehling fcc26bcbf3 fix broken json 2016-03-12 15:06:45 +01: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
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 2e392b4d7c eliminate even more static variable caches 2015-11-22 16:14:27 +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 3bd458b5e8 optimization: read configuration once before all battles, not before or during each individual one. 2015-11-22 15:29:43 +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 0ed365e539 remove the game section from XML config 2015-09-12 18:15:36 +02:00
Enno Rehling a01955e06a disable features by name that are not keywords 2015-09-12 17:37:29 +02:00
Enno Rehling c76b118fb8 eliminate game/order from XML data 2015-09-12 17:12:02 +02:00
Enno Rehling 7906cdbcb6 do not read gamename from XML, read it from JSON only (two mechanisms for the same feature are too many) 2015-09-12 16:49:18 +02:00
Enno Rehling 68c448b3fb fix signature of callback 2015-09-12 16:29:57 +02:00
Enno Rehling d1686849e0 refactoring: move produceexp into unit module, for want of a better one. add a bit of test coverage. 
https://bugs.eressea.de/view.php?id=2137 - fix learning-by-doing with less than u->number people.
 2015-09-12 16:25:47 +02:00
Enno Rehling 42f1030251 separate test script for E4: 
even though it has mostly the same rules, it does not have xmastrees, and loads a different config
remove dead `inactivefaction` function, we have no use for the file it creates.
 2015-09-12 14:10:08 +02:00
Enno Rehling c731edbfed remove prefixes.xml from E4, too 2015-09-12 13:38:31 +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 cf08cdf3fb configuration type-fixes: int to bool where appropriate (possibly incomplete) 
rename some rules to make it more obvious that they are flags or other integer values.
 2015-09-11 10:04:08 +02:00
Enno Rehling 7c56505057 move settings from XML to JSON for all games 2015-09-10 23:27:14 +02:00
Enno Rehling 083c848db1 merge with latest hotfix 2015-07-12 04:53:10 +02:00
Enno Rehling 7906d4469d return to old mechanism of equipping the first unit, and give some basic necessities to special races. 2015-07-05 16:40:49 +02:00
Enno Rehling 5667b6dc8c Merge branch 'develop' of github.com:eressea/server into develop 2015-06-21 16:24:46 +02:00
Enno Rehling 5afd58faff Revert "disable force_leave code, it is too surprising" 
This reverts commit f27d60e1b2.
 2015-06-19 13:37:15 +02:00
Enno Rehling f27d60e1b2 disable force_leave code, it is too surprising 2015-06-18 00:01:11 +02:00
Enno Rehling 6e4c7c12d5 disable force_leave code, it is too surprising 2015-06-17 23:58:18 +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 eb6215e018 https://github.com/eressea/server/issues/203 terrain_t check was exactly wrong, causing log spam. 
remove obsolete line from E4 config.
 2015-05-22 13:52:45 +02:00
Enno Rehling 3a03579a65 rename set_origin/get_origin into faction.c, remove argument from adjust_coordinates. add test for bug 2070. 2015-05-19 08:27:16 +02:00
Enno Rehling b7826c8025 Enable rules.owners.force_leave for all running games. 
https://bugs.eressea.de/view.php?id=2059 "(TEMP?)-Einheit in feindlichem Gebäude nach Kampf"
 2015-05-18 07:28:56 +02:00
Enno Rehling c3ed521d4f Merge branch 'version-3-4' of https://github.com/badgerman/eressea into badgerman-version-3-4 
Conflicts:
	src/laws.c
 2015-01-29 18:03:21 +01:00
Enno Rehling 6bd52012c0 read keywords from json configuration, use German imperative forms. 2014-10-29 19:40:09 +01:00
Enno Rehling 49128bdc79 syntax error in configuration files 2014-10-05 19:31:47 +02:00
Enno Rehling 232b935e0f Merge pull request #31 from CTD1/XML_config_changes 
Xml config changes
 2014-10-01 13:47:23 +02:00
Enno Rehling c0230d2662 In the game, there is only ever one special direction, and it is for the astral space. 
less XML, more code.
cleaning up the special direction parsing a bit.
 2014-08-28 19:50:38 +02:00
CTD 80819ad4e5 XML Config 
Ich habe mal alle neuen Sachen in die XML Dateien eingetragen, und
gleich noch 2 kleine Bugs behoben (Natürlich Rüstung war wieder aus und
default Arbeiten gab es nicht mehr).
 2014-08-26 10:53:51 +02:00
Enno Rehling bd2809a975 removing the core directory (moving to res and scripts). 
it's from when open-source Eressea was limited, and we no longer need the separation.
JSON configuration for ship flags.
 2014-07-28 14:27:30 +02:00
Enno Rehling 2bec7e2bbe save game id in the data file, not name of XML file 2014-07-23 11:54:51 +02:00
Enno Rehling 956efc48d5 new two-phase reserve for e4 2014-07-20 09:42:45 +02:00
Enno Rehling 740b646e54 fix keywords 2014-06-22 12:38:11 -07:00
Enno Rehling a144417daa remove reference to former GM command (I killed it last week) 2014-06-15 21:22:22 -07:00
Enno Rehling fa256360b9 eliminate kill_nonstarters 2014-06-03 06:29:33 +02:00
Enno Rehling 038ba723ef remove old equipment file from config everywhere 2014-06-01 23:57:45 +02:00
Enno Rehling 1b039feacb save the xml config, before I accidentally nuke it again 2014-06-01 23:49:09 +02:00