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

5938 Commits

Author SHA1 Message Date
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
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 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 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 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 2b46c4c4a9 kill stray semicolon 2015-09-10 21:22:55 +02:00
Enno Rehling 49915e76af Merge branch 'develop' of github.com:ennorehling/eressea into develop 2015-09-10 18:55:20 +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 b833d58792 Merge branch 'master' into develop 
Conflicts:
	process/compress.sh
 2015-09-10 16:02:41 +02:00
Enno Rehling db94830040 imclude summary and express in the email (not the zip). 2015-09-10 16:01:29 +02:00
Enno Rehling 33aff91dc3 Merge pull request #291 from ennorehling/feature/issue-289-optimize-donations 
modularizing donations
 2015-09-09 17:17:32 +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 91edb95bca Merge pull request #290 from ennorehling/develop 
cleanup: disabled tests, findunitr compexity
 2015-09-09 13:35:05 +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 aefc74c2fb New German spelling : daß -> dass 2015-09-09 09:04:00 +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