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

7394 Commits

Author SHA1 Message Date
Enno Rehling 651ce11741 do not report seen_none in CR 2016-09-18 12:44:03 +02:00
Enno Rehling 07bbc022f4 Merge pull request #575 from ennorehling/develop 
remove_unit called by add_recruits crashed the preview
 2016-09-18 12:05:49 +02:00
Enno Rehling 6c9c460815 fix failing unit tests, remove deleted unit from f->units list. 2016-09-18 11:46:54 +02:00
Enno Rehling bb689aa7b6 assert that f->units list is correct after remove_unit (fails) 2016-09-18 11:46:19 +02:00
Enno Rehling b3c31856aa add (failing) test for recruiting into existing units. 2016-09-18 11:34:54 +02:00
Enno Rehling 18fcba3ed6 failing test for a new bug: empty dummy units get stuck in faction.units after recruiting. 2016-09-18 11:14:00 +02:00
Enno Rehling ac8332c896 re-enable report tests. 
RF_LIGHTHOUSE also flags for lighthouses with size 0.
 2016-09-18 10:24:08 +02:00
Enno Rehling a5d44f9638 re-enable creport 2016-09-17 22:57:22 +02:00
Enno Rehling 2e0f96bae3 Merge branch 'develop' into kill-seen-region 
Conflicts:
	src/lighthouse.test.c
 2016-09-17 21:41:36 +02:00
Enno Rehling 34149b9fab Merge pull request #574 from ennorehling/develop 
add an integration test for lighthouse reports
 2016-09-17 20:52:26 +02:00
Enno Rehling 1fb061c6f0 syntax error (bash functions are hard). 2016-09-17 20:35:41 +02:00
Enno Rehling d3d9b097bc add some lighthouse checks to integration tests. 2016-09-17 20:34:06 +02:00
Enno Rehling 196c3b7ac8 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-09-17 20:05:31 +02:00
Enno Rehling a425a78f7c add a lighthouse to the sample data. 2016-09-17 20:01:49 +02:00
Enno Rehling e97ebb0469 RF_SAVEMASK needs to include RF_LIGHTHOUSE or the new report prep doesn't work. 2016-09-17 19:52:13 +02:00
Enno Rehling b41f041d52 Merge branch 'develop' into kill-seen-region 
Conflicts:
	src/reports.c
	src/reports.test.c
 2016-09-17 15:56:32 +02:00
Enno Rehling 3262fdecd4 Merge pull request #573 from ennorehling/bug-2237-lighthouse-capacity 
bug 2237: lighthouse capacity
 2016-09-17 15:43:21 +02:00
Enno Rehling 4c7d51990e prepare_report should stay static, remove that change. 2016-09-17 15:37:11 +02:00
Enno Rehling eb7dd051f8 fix bug 2237, respect lighthouse capacity. 2016-09-17 15:31:04 +02:00
Enno Rehling c4dbb69681 previous test was bad and did not actually exercise prepare_lighthouse. 
made a slighlty better test, which is failing for the right reasons.
 2016-09-17 15:29:28 +02:00
Enno Rehling 1ca67a57d2 add a new test for lighthouse capacity. 
https://bugs.eressea.de/view.php?id=2237
 2016-09-17 14:54:39 +02:00
Enno Rehling 2a0bd3e7ca unused variable warning 2016-09-17 13:29:14 +02:00
Enno Rehling 7349ec0aa9 improve lighthouse tests. 
you must be inside lighthouse to get a report from it.
 2016-09-17 13:20:02 +02:00
Enno Rehling 951bf5718e Merge branch 'develop' into kill-seen-region 2016-09-17 12:41:06 +02:00
Enno Rehling b5021fedc6 Merge pull request #572 from ennorehling/develop 
add a new test suite for lighthouses
 2016-09-17 12:39:10 +02:00
Enno Rehling adfafd51a6 test lighthouses 2016-09-17 12:34:02 +02:00
Enno Rehling 0753ea0174 fix travelthru reporting (passes unit test) 2016-09-17 08:28:33 +02:00
Enno Rehling a2125fbb9a managed to reproduce the travelthru bug in a unit test. 
travel from other factions inside the [first, last) interval will poison the report.
 2016-09-16 21:26:17 +02:00
Enno Rehling a86e30d014 re-enable report testing, find out that it fails. 2016-09-16 21:17:54 +02:00
Enno Rehling 74ff763b22 speeding up default_wage a little bit. 2016-09-16 21:12:03 +02:00
Enno Rehling 567083c9e8 fix bad translation key 2016-09-16 20:18:53 +02:00
Enno Rehling 9d60a0f967 missing forward struct declaration 2016-09-16 19:28:07 +02:00
Enno Rehling 783c042d50 Merge branch 'develop' into kill-seen-region 
Conflicts:
	src/reports.c
 2016-09-16 19:11:05 +02:00
Enno Rehling 2f9445a4a6 Merge pull request #571 from ennorehling/develop 
remove view functions for special planes (Regatta).
 2016-09-16 19:06:20 +02:00
Enno Rehling acfa2cfbe5 remove view functions for special planes (Regatta). 2016-09-16 18:59:24 +02:00
Enno Rehling d449ce4a8c re-enable report writing, fix report.c to work without seen_region 2016-09-16 18:03:28 +02:00
Enno Rehling 007f4d8b0d test that travelthru notifications will make it into the report. 2016-09-16 17:25:40 +02:00
Enno Rehling 6fed596c36 Merge branch 'develop' into kill-seen-region 2016-09-16 17:12:40 +02:00
Enno Rehling 1dac556d09 Fix MSVC compilation (always include platform-specific hacks). 2016-09-16 17:11:33 +02:00
Enno Rehling ad4377c0e7 Merge branch 'develop' into kill-seen-region 
Conflicts:
	src/kernel/version.c
	src/kernel/version.h
 2016-09-16 17:08:03 +02:00
Enno Rehling 7e0abeb9fc Merge pull request #570 from ennorehling/develop 
improved versioning through version.c
 2016-09-16 17:05:51 +02:00
Enno Rehling 55df24ffb8 all code review nitpicks fixed. 2016-09-16 16:54:41 +02:00
Enno Rehling b0799bd152 fix travis build by not depending on CMake 2.8.8 2016-09-16 16:30:56 +02:00
Enno Rehling dc004b2d71 require cmake version 2.8.8 (add_library <name> OBJECT ...) 2016-09-16 16:30:49 +02:00
Enno Rehling 47526dd36b smarter version.c build that avoids full rebuilds. 2016-09-16 16:30:43 +02:00
Enno Rehling 10916bb0a1 use add_definitions instead of CMAKE_C_FLAGS, define ERESSEA_VERSION only on version.c 2016-09-16 16:30:30 +02:00
Enno Rehling 318cf68e1b move version string into a single object file 2016-09-16 16:30:17 +02:00
Enno Rehling 7cad8c3192 Merge remote-tracking branch 'upstream/develop' into develop 2016-09-16 16:29:48 +02:00
Enno Rehling bf59b1adf9 fix travis build by not depending on CMake 2.8.8 2016-09-16 10:55:38 +02:00
Enno Rehling 00a3a934f5 require cmake version 2.8.8 (add_library <name> OBJECT ...) 2016-09-16 09:49:53 +02:00