Enno Rehling
c7a0fb5f28
development build is 3.7
2015-09-12 19:28:28 +02:00
Enno Rehling
44dd66f2fb
Merge branch 'master' into develop
2015-09-12 19:27:56 +02:00
Enno Rehling
28f17b6a08
release version 3.6.3
2015-09-12 19:27:11 +02:00
Enno Rehling
c704cd5784
release version 3.6.2
2015-09-12 15:41:25 +02:00
Enno Rehling
9563aa712f
eliminate junk function
2015-09-12 14:16:18 +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
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
bd51ac7dd7
eliminate terrain parsing from xmlreader.c, it's all in JSON now!
2015-09-11 22:46:47 +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
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
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
d15d0cc0f4
remove unused xml_i function
2015-09-11 11:08:10 +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
c5e14c85a6
read boolean json values
...
be smarter about reading number values that are integers
2015-09-11 09:17:07 +02:00
Enno Rehling
9bb2a625f9
fix xmlreader bug introduced by last commit (xpath->node not initialized)
2015-09-11 09:10:00 +02:00
Enno Rehling
1a7d6dd91d
xmlreader no longer needs to parse settings, that's all in json now.
2015-09-10 23:29:18 +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
2b46c4c4a9
kill stray semicolon
2015-09-10 21:22:55 +02:00
Enno Rehling
f2b2dc2063
fix linux build, missing include
2015-09-09 16:48:24 +02:00
Enno Rehling
337aca9b3c
remove region.donations, replace with a global list.
2015-09-09 16:47:09 +02:00
Enno Rehling
d29d38f710
refactor donations into a seaprate code module, add a basic test
2015-09-09 15:45:20 +02:00
Enno Rehling
60111282b3
make findunitr be O(1) instead of O(#r->units)
2015-09-09 13:29:58 +02:00
Enno Rehling
5faf642b9c
use the same DISABLE_TEST macro everywhere.
2015-09-09 13:23:20 +02:00
Enno Rehling
6f212686f3
Merge pull request #287 from ennorehling/feature/issue-282-link-seen
...
eliminate duplicate call to link_seen
2015-09-09 12:41:14 +02:00
Enno Rehling
bf6f05f39d
fix unused variable warning
2015-09-09 11:24:11 +02:00
Enno Rehling
cac22bcb02
Merge branch 'feature/issue-282-link-seen' of github.com:ennorehling/eressea into feature/issue-282-link-seen
2015-09-09 11:23:15 +02:00
Enno Rehling
f7c1efc287
memory error seems to be in test_write_flag (curse-hashing?), not in the new ones.
2015-09-09 11:22:35 +02:00
Enno Rehling
e5a92d6313
building on linux
2015-09-09 11:09:57 +02:00
Enno Rehling
65c39866e1
refactor: add a faction_add_seen function that also updates [first, last) interval.
...
add tests for add_seen.
disable test_faction_add_seen, looks like it needs a valgrind check?
2015-09-09 11:08:33 +02:00
Enno Rehling
7f9e84d68b
fix neighbor seen_region collection.
2015-09-09 10:22:04 +02:00
Enno Rehling
42e51a0ec4
refactor looping through the hashtable of seen_regions into a map function.
2015-09-09 09:38:57 +02:00
Enno Rehling
3eabf082ac
refactor prepare_report to extract prepare_seen, because we assume the bug is in there.
...
add a failing test for it to prove that bug is in here.
2015-09-09 09:04:59 +02:00
Enno Rehling
b551261b66
fix the bug that the unit test exposed. it was so simple!
...
still not fixing the integration test, though :-(
2015-09-08 16:35:18 +02:00
Enno Rehling
1fbbba564b
add a unit test for the problem that fails (test_seen_interval_forward)
2015-09-08 16:28:47 +02:00
Enno Rehling
2e0482973e
testing test_seen_interval
2015-09-08 10:17:01 +02:00
Enno Rehling
8562a6d072
add test suite for seen_region logic (empty)
2015-09-08 10:07:29 +02:00
