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

78 Commits

Author SHA1 Message Date
Enno Rehling 12222c6562 first unit should get money and wood 2017-07-23 09:08:03 +02:00
Enno Rehling b266509746 Einheitenlimit anheben (3000 und 500) 2017-05-27 20:07:36 +02:00
Enno Rehling 4fdfbb44b5 this config.xml was added by accident. 2017-05-08 08:15:18 +02:00
Enno Rehling 18defdd5a2 remove last pieces of calendar.xml 2017-05-08 06:57:03 +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 be14394529 load locales and rules separately (xml prep work) 2017-02-19 16:33:24 +01:00
Enno Rehling b05c2564e5 make att_modification not crash when a good/bad dream curse has no magician. 2017-02-12 13:22:44 +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 4cbeb03590 clean the quipment interface for lua a little bit. 2017-01-22 18:35:54 +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 ce17d7f2d7 enable PAY NOT in E2 2016-12-31 21:21:23 +01:00
Enno Rehling bf70792da6 make kn-bremen.de official email address 2016-11-27 16:07:46 +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 a08ad52809 Merge branch 'develop' 
Conflicts:
	src/util/log.c
 2016-08-31 18:15:07 +02:00
Enno Rehling 6ca3f04b89 issue #538: default terrain 
I think it's unnecessary, so delete it
 2016-08-20 23:42:15 +02:00
Enno Rehling 43c2c74d75 correct the list of glacier herbs. 
this will fix newly created glaciers only.
there are several bad glaciers in E2, this commit is not repairing
them.
https://bugs.eressea.de/view.php?id=2220
 2016-08-13 10:13:22 +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 6ad5db8e22 Merge pull request #397 from stm2/taxing_message 
taxing without skill does not fail silently any more
 2015-11-26 18:43:57 +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
Steffen Mecke 493b45c832 taxing without skill does not fail silently any more 
http://bugs.eressea.de/view.php?id=2158
added configuration parameter for tax per level
 2015-11-14 15:36:14 +01:00
Enno Rehling 2e2bb8b792 E2: cavalry and forest flags missing for plains 
https://bugs.eressea.de/view.php?id=2153
 2015-11-09 16:51:08 +01:00
Enno Rehling 1122bb70a4 fix museum terrains 2015-09-13 10:05:52 +02:00
Enno Rehling 90bcf30628 fix bad terrain definitions in E2 (string, not number: these values are used for dice throws). 
clean up the jsonconf.c code for reading these a little bit, report more specific errors.
 2015-09-13 09:46:40 +02: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 44eb3a4f58 disable keywords through JSON configuration 2015-09-12 17:06:55 +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 1b44e73320 remove prefixes.xml from E2 2015-09-12 13:35:59 +02:00
Enno Rehling 7e8fef01af forgot some flags for volcano terrain, caused integration test to crash. neat. 2015-09-11 22:18:57 +02:00
Enno Rehling b4971dd651 replace all of the E2 terrains with JSON data (no more XML!) 2015-09-11 22:11:59 +02:00
Enno Rehling db4cb2618b transfer most core and all game-specific terrains for E2 from XML to JSON. 2015-09-11 21:14:10 +02:00
Enno Rehling 16467dbafa define swamp and desert, move terrains to a separate file 2015-09-11 13:02:28 +02:00
Enno Rehling 9df5799efd define core plain and ocean in JSON for E2. 2015-09-11 12:52:18 +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 1a9dd531c5 use boolean values in E2 config. 
add a runtests.bat file for windows developers.
make some tests clean up after themselves (os.remove on files they create).
 2015-09-11 09:34:38 +02:00
Enno Rehling 7c56505057 move settings from XML to JSON for all games 2015-09-10 23:27:14 +02:00
Enno Rehling 1969c165d3 allow settings in json configuration file 
move E2 settings from XML to JSON
 2015-09-10 23:16:17 +02:00
Enno Rehling 8463faa849 https://bugs.eressea.de/view.php?id=2133 
add missing seed.population.* configuration
 2015-09-10 18:54:49 +02:00
Enno Rehling 552f32ff97 bugfix https://bugs.eressea.de/view.php?id=2133 
era in the CR is wrong for E2
build in the CR should be a string (did not have quotes)
Lua < 5.2 does not have bit32 (and Windows build uses 5.1)
 2015-09-04 14:39:44 +02:00
Enno Rehling 6d592a4460 drifting ships do not take damage (forum debate), version update 2015-08-31 12:53:24 +02:00
Enno Rehling dbabb94632 first new unit gets five WdL 2015-07-28 10:53:48 +02:00
Enno Rehling d9e7ff69eb fix xml config xinclude links 2015-07-26 14:20:28 +02:00
Enno Rehling a31dd95de0 give the first unit a sword, set skills from the equipment-config, not script 
make the preview link use a soft-link, not calculate the build-directory again.
 2015-07-19 20:07:08 +02:00
Enno Rehling 083c848db1 merge with latest hotfix 2015-07-12 04:53:10 +02:00