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

9011 Commits

Author SHA1 Message Date
Enno Rehling 00e1115cad skip all xp draining tests 2018-01-18 17:29:06 +01:00
Enno Rehling 8b837060e7 make some changes to support non-random skill progress. 
disable test_drain_exp, since it can't deal with that.
 2018-01-17 19:25:20 +01:00
Enno Rehling de74fc0861 begin adding tests for skills. 2018-01-17 18:04:04 +01:00
Enno Rehling e0a5ba60b4 enhance foolpotion test. 2018-01-17 17:37:37 +01:00
Enno Rehling 66ffca3ac4 move xmlreader.c up a directory. 2018-01-15 18:11:43 +01:00
Enno Rehling 823a327254 mistletoe as curse (bad idea) 2018-01-14 18:05:07 +01:00
Enno Rehling 5b099e27f6 fix broken includes 2018-01-14 18:03:33 +01:00
Enno Rehling 9a281cfdce merge troubles 2018-01-14 17:56:32 +01:00
Enno Rehling 0435c9ee8b jsonconf reads game rules outside of kernel, so move it out. 2018-01-14 17:50:54 +01:00
Enno Rehling 010ff35c4a test_setup_world is deprecated. 2018-01-14 17:43:10 +01:00
Enno Rehling 71c9b5adef Fix broken SHOW logic for potions. 2018-01-14 17:40:49 +01:00
Enno Rehling 7a64053dc9 better testing for is_potion (should be a function) 2018-01-14 17:40:49 +01:00
Enno Rehling 2b2a79620c compiles, test fails, xmlreader includes need fixing 2018-01-14 17:40:48 +01:00
Enno Rehling 3d69f4e372 start removing dependencies on potion_type. 
use item_type where we can. does not compile, is WIP.
 2018-01-14 17:40:48 +01:00
Enno Rehling 9f486f20b7 Merge remote-tracking branch 'upstream/develop' into develop 2018-01-14 17:39:19 +01:00
Enno Rehling 14756342cf
Merge pull request #757 from ennorehling/missing_message 
Replace use of missing_message hacks.
 2018-01-14 17:37:38 +01:00
Enno Rehling 42e7e98ccf Default to reporting missing message types during tests as an error, grandfather in some tests with test_inject_messagetypes(); 2018-01-14 17:08:46 +01:00
Enno Rehling 787abc90cf provide more missing messages in test setups. 2018-01-14 11:58:22 +01:00
Enno Rehling b432fbe9d8 Make the behavior for missing messages configurable. 
message_handle_missing function to set it (test_eressea should enetually use MESSAGE_MISSING_ERROR).
 2018-01-14 11:25:44 +01:00
Enno Rehling f776450f9b Replace 0 with NULL (consistency is good). 2018-01-14 09:58:45 +01:00
Enno Rehling 75f41a7169 fix crashes on 64-bit systems (not all 0s are created equal). 2018-01-14 09:38:26 +01:00
Enno Rehling 84309caad7 Temporarily re-enable the missing_message code. 
I think we'll want to make this injectable.
Fix the give tests.
 2018-01-13 22:46:02 +01:00
Enno Rehling b83a1ee136 fix more missing_message errors. 2018-01-13 08:51:40 +01:00
Enno Rehling 98678d9fb2 disable the missing_message replacement used in so many tests. fix some tests so they don't need it. 2018-01-12 21:15:21 +01:00
Enno Rehling efec41ca56 Fix broken SHOW logic for potions. 2018-01-12 20:45:59 +01:00
Enno Rehling 4d38a40e96 better testing for is_potion (should be a function) 2018-01-12 10:06:13 +01:00
Enno Rehling 4ef7009de7 compiles, test fails, xmlreader includes need fixing 2018-01-12 10:01:06 +01:00
Enno Rehling 915a924fcb start removing dependencies on potion_type. 
use item_type where we can. does not compile, is WIP.
 2018-01-12 09:17:01 +01:00
Enno Rehling 7d17ecc01a
Merge pull request #756 from ennorehling/develop 
Fix use of lua on macOS, some bugs.
 2018-01-11 17:42:53 +01:00
Enno Rehling 9dbe1d65b2 Provide FindLua.cmake for Lua 5.2 with CMake 2.8 (Debian wheezy). 2018-01-11 17:31:04 +01:00
Enno Rehling 041c0fdfaa export LUA_DIR to find the right LUA_INCLUDE_DIR 2018-01-11 17:13:49 +01:00
Enno Rehling 014cc02c45 use FindLua51.cmake 2018-01-11 16:52:16 +01:00
Enno Rehling 2b3acb5d92 temporarily disable test for mistletoe, it is broken. 2018-01-11 16:51:21 +01:00
Enno Rehling 7b8951b6e8 kill the fleechance attribute 2018-01-11 16:47:22 +01:00
Enno Rehling f1b70aca6f BUG 2405: fix mistletoe, use a curse. 2018-01-10 19:19:29 +01:00
Enno Rehling d2cbed3042 BUG 2408: acceptance test for TARNE PARTEI 2018-01-10 18:38:38 +01:00
Enno Rehling 5587e209a2 BUG 2409: avoid using integer values >= 2^31 in the CR. 2018-01-08 19:45:49 +01:00
Enno Rehling a48d177472 BUG 2401: fix combat display, again. 2018-01-07 17:22:15 +01:00
Enno Rehling 2cf20dd6e2 Bug 2407: do not cache study_cost(SK_MAGIC). 2018-01-07 15:26:17 +01:00
Enno Rehling 8e9ffa2d2b Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-01-07 14:04:16 +01:00
Enno Rehling 822612c94e Merge branch 'master' into develop 
Conflicts:
	process/run-turn
 2018-01-07 13:57:49 +01:00
Enno Rehling c9157ec2a4 Merge remote-tracking branch 'upstream/master' 2018-01-07 13:56:45 +01:00
Enno Rehling bd98cf1fbc on the Rapsberry Pi, long is only 32 bit 2018-01-07 13:56:05 +01:00
Enno Rehling 1bd28f8ce5
Merge pull request #755 from ennorehling/develop 
ongoing work
 2018-01-05 17:52:26 +01:00
Enno Rehling 4eb4c61d37 BUG 2387 some tweaks to the first draft. 2018-01-02 20:34:42 +01:00
Enno Rehling c7a65116be add a test for racename. 2018-01-01 18:50:39 +01:00
Enno Rehling e4859e68c9 do not use MIN and MAX. 2018-01-01 08:23:52 +01:00
Enno Rehling 6a31b432de disable storms in tests 2018-01-01 07:47:06 +01:00
Enno Rehling 77926d2d54 add soem debug output to intermittent test 2018-01-01 07:43:06 +01:00
Enno Rehling 0022f48c39 do not use MIN/MAX 2018-01-01 06:56:57 +01:00