Enno Rehling
e80f53d35e
Merge pull request #297 from ennorehling/feature/json-disable-keywords
...
disable keywords in JSON, not XML
2015-09-12 17:23:08 +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
32ff7c89bc
Merge pull request #296 from ennorehling/feature/config-producexpchance
...
Bug 2137: calculating produceexp correctly
2015-09-12 16:52: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
d65e9aaf94
eliminate xml reading of produceexp chance
2015-09-12 16:42:02 +02:00
Enno Rehling
8a95ea0c00
speeding up produceexp_chance
2015-09-12 16:41:22 +02:00
Enno Rehling
9bdc811582
produceexp uses a json-configurable constant
...
make get_param_flt return a double, floats are for wimps.
2015-09-12 16:38:51 +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
13d88fa4fd
Merge pull request #295 from eressea/master
...
change the release naming scheme
2015-09-12 15:46:34 +02:00
Enno Rehling
8f00d5293f
change the release naming scheme
2015-09-12 15:42:46 +02:00
Enno Rehling
864454877e
change the release naming scheme
2015-09-12 15:42:03 +02:00
Enno Rehling
c704cd5784
release version 3.6.2
2015-09-12 15:41:25 +02:00
Enno Rehling
6c8342d1c1
Merge branch 'master' into develop
2015-09-12 15:39:58 +02:00
Enno Rehling
17342b7c5d
add a release-tagging script
2015-09-12 15:39:36 +02:00
Enno Rehling
3f39569710
add compression scripts to installer
2015-09-12 15:26:00 +02:00
Enno Rehling
c6fb869ae2
Merge pull request #294 from ennorehling/feature/json-prefixes
...
JSON Prefixes
2015-09-12 14:26:46 +02:00
Enno Rehling
9563aa712f
eliminate junk function
2015-09-12 14:16:18 +02:00
Enno Rehling
bd1b568da2
Präfix Erz
2015-09-12 14:13:45 +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
aa32cf190e
remove xmlreader code for prefixes
2015-09-12 13:40:10 +02:00
Enno Rehling
c731edbfed
remove prefixes.xml from E4, too
2015-09-12 13:38:31 +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
1b44e73320
remove prefixes.xml from E2
2015-09-12 13:35:59 +02:00
Enno Rehling
09efd9c2a9
fix anything that uses the calendar module. opps.
2015-09-12 12:54:49 +02:00
Enno Rehling
13e1573611
moving the calendar module out of the kernel directory, it does not belong with the major game objects
2015-09-12 12:54:09 +02:00
Enno Rehling
47c95aee35
implement JSON prefixes. fix free_prefixes not resetting size (TODO: quicklist).
2015-09-12 12:49:12 +02:00
Enno Rehling
f0e255924f
add a unit test for add/free prefixes. fix bad free_prefixes call site.
2015-09-12 12:41:04 +02:00
Enno Rehling
9f6b374056
add a (red) test for JSON prefixes.
2015-09-12 12:33:25 +02:00
Enno Rehling
44d982d210
free race prefixes when the game is done (small memory leak).
2015-09-12 12:29:42 +02:00
Enno Rehling
f1476c2167
refactoring: split out a module for race prefixes
2015-09-12 12:24:10 +02:00
Enno Rehling
767ef13722
add a functional test for prefixes in E2 before refactoring any of that code.
2015-09-12 12:05:38 +02:00
Enno Rehling
e63767b99d
Merge pull request #293 from ennorehling/feature/feature-json-terrains
...
Remove XML dependency for terrains, put it all in JSON
2015-09-12 11:52:04 +02:00
Enno Rehling
bd51ac7dd7
eliminate terrain parsing from xmlreader.c, it's all in JSON now!
2015-09-11 22:46:47 +02:00
Enno Rehling
23b19d3dfa
Merge branch 'feature/feature-json-terrains' of github.com:ennorehling/eressea into feature/feature-json-terrains
2015-09-11 22:43:48 +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
2a25488ed1
replace XML terrains for E3 with JSON configuration
2015-09-11 22:41:57 +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
7c4d18ec2d
avoid an annoying division by zero when terrains are not fully initialized (size=0)
2015-09-11 21:31: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
a582c69523
finished and tested: terrains can be completely defined in JSON.
2015-09-11 12:27:45 +02:00
Enno Rehling
43bac506a4
fix bad size for calloc.
2015-09-11 12:25:28 +02:00
Enno Rehling
c707ff39b6
memory leak: properly free terrain_production objects
2015-09-11 12:17:35 +02:00
Enno Rehling
59e2c12605
completing the implementation of JSON terrains (WIP).
...
seeing a crash when trying to allocate a resource for stone in test_json_terrains.
2015-09-11 12:12:53 +02:00
Enno Rehling
8860244f1c
Merge branch 'link-seen-duplicate' into feature/feature-json-terrains
2015-09-11 11:12:30 +02:00
Enno Rehling
47b7b67d20
Merge pull request #292 from ennorehling/feature/json-config-param
...
move configuration parameters from XML to JSON
2015-09-11 11:10:06 +02:00
