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

7313 Commits

Author SHA1 Message Date
Enno Rehling 1f100a1b6c replace old_race calls with get_race. 2016-09-19 16:10:10 +02:00
Enno Rehling e6677806b6 refactor unholy power, extract function 2016-09-19 16:03:02 +02:00
Enno Rehling 6ec99af4d6 mark all three major dragon types as RCF_DRAGON. 
use RCF_DRGON flag to detemine BP_DRAGON speed.
 2016-09-19 15:53:31 +02:00
Enno Rehling b958fa1c2e get_race is better than old_race 2016-09-19 08:56:33 +02:00
Enno Rehling 115e13d513 initialize variable 2016-09-19 08:42:07 +02:00
Enno Rehling 6964267c37 static variables, duh 2016-09-19 08:35:54 +02:00
Enno Rehling be5f15e18a fix const-conversion warning 2016-09-19 08:32:09 +02:00
Enno Rehling ee77075cb6 cache get_race calls 2016-09-19 08:25:39 +02:00
Enno Rehling 025c0b91d9 cache the toad race 2016-09-19 07:02:45 +02:00
Enno Rehling fe383af5f2 sample usage of race caching 2016-09-19 06:58:24 +02:00
Enno Rehling 96d6abdc5a add caching API for rc_find 2016-09-19 06:55:32 +02:00
Enno Rehling f8167ed62c test get_race and others 2016-09-19 06:47:46 +02:00
Enno Rehling fbd596fbfa remove bad caching in get_race 2016-09-19 06:43:56 +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 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 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