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
|
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
|
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 |
|