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

7293 Commits

Author SHA1 Message Date
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 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 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 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 1dac556d09 Fix MSVC compilation (always include platform-specific hacks). 2016-09-16 17:11:33 +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 452614307d require at least 2K peasants in starting regions 2016-09-11 21:27:46 +02:00
Enno Rehling cb85eb4b9f delete more files created by test runs 2016-09-11 21:18:50 +02:00
Enno Rehling 4a1d29c92f Merge pull request #568 from ennorehling/develop 
change how dead units' factions are found
 2016-09-11 20:24:42 +02:00
Enno Rehling 2294de44c2 accidental duplicate close. 2016-09-11 20:14:19 +02:00
Enno Rehling f926d89929 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-09-11 20:10:01 +02:00
Enno Rehling f946d50001 alternative implementation for dfindhash that doesn't use as much memory. 
do not set u->faction = NULL for deleted units.
 2016-09-11 20:09:48 +02:00
Enno Rehling 3e2c630c3f testing that remove_unit takes unit out of the world properly. 
there is more to it than this, but I'd be happy with the dfindhash check for now.
 2016-09-11 19:39:35 +02:00
Enno Rehling fdb5ecc68b always call close() in lua when you're done with a file. 2016-09-11 19:32:54 +02:00
Enno Rehling c21ecba8dd always call close() in lua when you're done with a file. 2016-09-11 19:28:25 +02:00
Enno Rehling cb36224e30 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-09-11 19:10:30 +02:00
Enno Rehling f07c79e5cf CID 146892: null-pointer check should be an assert. 2016-09-11 19:09:23 +02:00
Enno Rehling 8fd812ecb4 travis must not check for leaks as long as they exist as they do 2016-09-11 17:25:50 +02:00
Enno Rehling 95481211e5 expect remove and unlink to set errno when file doesn't exist, reduce misleading spam. 2016-09-11 17:19:27 +02:00
Enno Rehling 03a8e0449a Merge pull request #567 from ennorehling/develop 
Bug 2235: new players getting NMR warnings
 2016-09-11 16:48:47 +02:00
Enno Rehling 0124bafdc4 delete dead code 2016-09-11 16:44:35 +02:00
Enno Rehling fb0fc9e361 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-09-11 16:36:16 +02:00
Enno Rehling 402c19d8fc dn't warn new player about NMR. 
newbie info text was no longer valid.
 2016-09-11 16:35:55 +02:00
Enno Rehling 49ccb3825f test and cache all the rules! 2016-09-11 15:54:03 +02:00
Enno Rehling 8f147503e5 Merge pull request #566 from ennorehling/develop 
created a new configuration caching API
 2016-09-11 12:51:41 +02:00
Enno Rehling 86ef225ccb add some more local caching. 2016-09-11 12:48:00 +02:00
Enno Rehling f75be76ee1 created a new configuration caching API (config_changed). 
applied this to some rules.
 2016-09-11 12:15:53 +02:00
Enno Rehling dd59109368 Merge pull request #565 from ennorehling/develop 
test-only changes: LERNE MAGIE
 2016-09-11 12:15:43 +02:00
Enno Rehling aeaa96f026 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-09-11 11:07:13 +02:00
Enno Rehling d45798b798 fix leaking errno from save.test call to remove 2016-09-11 11:06:58 +02:00
Enno Rehling 5dc9ccb03e do not call log10(0) for new lighthouses. 
some tests for LEARN MAGIC.
 2016-09-11 11:02:04 +02:00
Enno Rehling 0978c1c98f Merge pull request #564 from ennorehling/develop 
fix broken develop build from previous PR
 2016-09-10 21:49:24 +02:00
Enno Rehling afeae5ff2b fix travis build, bad gitmodules urls 2016-09-10 21:16:49 +02:00
Enno Rehling 3a438ffd4f I have questions about this 2016-09-10 21:12:19 +02:00
Enno Rehling 4f7d1da72f Merge pull request #563 from ennorehling/develop 
memory leak
 2016-09-10 21:05:04 +02:00