Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
6117 commits 10 branches 0 tags 41 MiB
Commit graph

6117 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Enno Rehling
9312b44f8e move seen_region logic to a separate seen.[hc] module for testing. 
currently failing test:

  1) Failure (tests.report.test_lighthouse):
  ./scripts/tests/common.lua:1051: true expected but was false
 2015-09-08 09:56:56 +02:00
Enno Rehling
ff888401a1 disable valgrind 2015-09-08 07:40:08 +02:00
Enno Rehling
3f86017bb1 Merge commit '84aa0beee5dcd365921140c1687fbaf05070903f' into develop 2015-09-08 07:39:23 +02:00
Enno Rehling
d64948f0fc eliminate duplicate call to link_seen (and report_context.seen) 2015-09-07 19:48:53 +02:00
Enno Rehling
84aa0beee5 create a more complex integration test for a unit that sails with a 
ship (and sees more regions along the way).
 2015-09-07 16:11:58 +02:00
Enno Rehling
aa394feb80 make test data humans, not vampunicorn (what happened there?) 2015-09-07 15:57:08 +02:00
Enno Rehling
2e11994155 hard-code the expected number of entries in the CR for a tighter test. 2015-09-07 15:40:12 +02:00
Enno Rehling
8fb118c1bb Merge pull request #286 from ennorehling/feature/bug-1818-give-unit-tests 
Backfill missing tests for Bug 1818.
 2015-09-07 15:30:06 +02:00
Enno Rehling
bf86b1d66a add missing .sh files to git (previously blocked by .gitignore) 
add an integration test for run-turn.lua
 2015-09-07 15:27:30 +02:00
Enno Rehling
77912166bf Backfill missing tests for Bug 1818. Actual bug appears to have been fixed some time ago. 2015-09-07 14:49:57 +02:00
Enno Rehling
b6ba42c3de Merge branch 'master' into develop 
Conflicts:
	.gitignore
 2015-09-07 11:06:10 +02:00
Enno Rehling
a28a35bb6c include weekly summary in the report email. 
https://bugs.eressea.de/view.php?id=2135#c6115
 2015-09-07 11:04:56 +02:00
Enno Rehling
34580ab9fa fix test requiring a data directory (sigsegv) 2015-09-06 20:07:15 +02:00
Enno Rehling
e2b78cd8d8 Merge pull request #285 from ennorehling/feature/bug-2136-large-scores 
Bug 2136: large score values
 2015-09-06 19:14:37 +02:00
Enno Rehling
f84133eb53 fix linux builds 2015-09-06 19:08:57 +02:00
Enno Rehling
b8df3f3a5f increase the datatype for scores from int to long long 
this fixes https://bugs.eressea.de/view.php?id=2136
 2015-09-06 19:04:04 +02:00
Enno Rehling
0d4fd613e1 Merge remote-tracking branch 'upstream/develop' into develop 2015-09-06 19:01:30 +02:00
Enno Rehling
4c2a2e1289 Merge branch 'master' into develop 
Conflicts:
	.travis.yml
	scripts/eressea/cursed.lua
 2015-09-06 18:51:00 +02:00
Enno Rehling
19e27930ab Merge remote-tracking branch 'upstream/master' into develop 
Conflicts:
	.travis.yml
	scripts/eressea/cursed.lua
 2015-09-06 13:28:08 +02:00
Enno Rehling
b33babd316 fix cursed factions (broke it during bit32 changes) 2015-09-06 13:20:37 +02:00
Enno Rehling
fd3ff16723 Merge branch 'hotfix-3-6-2' 
Conflicts:
	.travis.yml
 2015-09-06 09:57:15 +02:00
Enno Rehling
6e36333d0e Merge pull request #284 from ennorehling/feature/bug-1685-give-invalid-target 
Bug 1685: syntax errors should not give items to peasants
 2015-09-05 20:05:28 +02:00
Enno Rehling
9394431ddd disable travis build on osx 2015-09-05 19:54:57 +02:00
Enno Rehling
d1b98efe5b disable travis build on osx 2015-09-05 19:54:35 +02:00
Enno Rehling
79663d5933 relatively simple fix to bug 1685: unit ids must start with alphanumerical characters. 
https://bugs.eressea.de/view.php?id=1685
 2015-09-05 19:48:25 +02:00