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 |
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
|
3003b7fc61
|
remove prefixes from E3
move prefix test to common.lua
|
2015-09-12 13:37:43 +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
|
6bd52012c0
|
read keywords from json configuration, use German imperative forms.
|
2014-10-29 19:40:09 +01:00 |