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

7660 Commits

Author SHA1 Message Date
Enno Rehling fec9945458 Fixing Bugs 2246 & 2251 
parse error message for bad orders:
https://bugs.eressea.de/view.php?id=2251
report when TEMP-Units cannot recuit:
https://bugs.eressea.de/view.php?id=2246
 2016-11-05 18:20:56 +01:00
Enno Rehling bad4fb47c5 bad GUARD_NONE conversion, should have been false. 2016-11-05 16:20:00 +01:00
Enno Rehling 467ffe2db0 include guard.h directly, not through laws.h 2016-11-01 22:11:10 +01:00
Enno Rehling 03d90c5680 remove BOM from UTF-8 files, replace Umlauts 2016-11-01 17:25:52 +01:00
Enno Rehling d62e3f4a8a Merge remote-tracking branch 'upstream/develop' into develop 2016-11-01 17:16:29 +01:00
Enno Rehling d008a8167d Merge pull request #599 from ennorehling/feature/guards 
eliminate special cases for guards
 2016-11-01 17:03:12 +01:00
Enno Rehling a1422ce5e4 Make runtests more verbose in case of errors. 
Eliminate stray ERROR messages from tests.
 2016-10-31 20:50:58 +01:00
Enno Rehling 92d027014a Make runtests more verbose in case of errors. 
Eliminate stray ERROR messages from tests.
 2016-10-31 20:36:05 +01:00
Enno Rehling a285bd332c fix lua tests to not expect numeric values for unit.guard 2016-10-31 20:12:19 +01:00
Enno Rehling 313d988e59 fix remaining unit test after guard changes. 2016-10-31 20:10:17 +01:00
Enno Rehling 0bcb3a853f WIP: finish removing GUARD_* flags 
TODO: fix failing tests
 2016-10-31 09:40:36 +01:00
Enno Rehling 754ad78db7 WIP: remove GUARD_* flags. 
TODO: does not compile
TODO: write new guard.test.c tests
 2016-10-31 07:45:06 +01:00
Enno Rehling 182cecf31b fix tests that use leveled resources. 2016-10-30 19:27:00 +01:00
Enno Rehling 2953a5f036 fix swapped assertions. 2016-10-30 09:49:30 +01:00
Enno Rehling eb7199450d fix Linux compilation. 2016-10-30 09:47:18 +01:00
Enno Rehling f147d6a8c8 remove at_guard from guard.c, fix compilation. 2016-10-30 09:43:28 +01:00
Enno Rehling 2c0f708d1b WIP: remove at_guard, GUARD_TREES and GUARD_MINING 
TODO: fix tests
TODO: write new guard coverage
 2016-10-30 09:18:19 +01:00
Enno Rehling 8597e8b16a move guard test to guard.test.c 2016-10-30 05:39:25 +01:00
Enno Rehling a5e63a2472 move GUARD_* flags to guard.h 2016-10-30 05:37:12 +01:00
Enno Rehling 1116afed2b merge conflict resolve 2016-10-29 19:19:22 +02:00
Enno Rehling 1ea8c80845 test that is_guard changes when armedmen does. 2016-10-29 19:19:11 +02:00
Enno Rehling 4487f4d3e1 missing declaration 2016-10-29 19:19:02 +02:00
Enno Rehling 29c5bd6f55 test that regular guards need weapons and skills 2016-10-29 19:18:55 +02:00
Enno Rehling 7c827c0389 add test for races with "unarmed guard" flag. 2016-10-29 19:18:49 +02:00
Enno Rehling 654926fa06 add a failing test for "monsters can guard when unarmed" 2016-10-29 19:18:43 +02:00
Enno Rehling 5bb2dbfd87 move is_guarded from move.h to guard.h 
Conflicts:
	src/move.c
 2016-10-29 19:15:49 +02:00
Enno Rehling 59c8fbc5a5 fix bad Lua test for ents, so they actually guard. 2016-10-29 17:51:01 +02:00
Enno Rehling 6075396de3 WIP: make guard tests pass. 
BUG: monsters are always allowed to guard unarmed.
TODO: more code duplication, refactor it.
TODO: ents do not guard resources?
 2016-10-29 14:16:40 +02:00
Enno Rehling f1d07fb647 I no longer use CRTDBG to find bugs. Valgrind rules. 2016-10-29 10:53:18 +02:00
Enno Rehling f17b6f2bb5 WIP: additional testing for GUARD. 
BUG: ents cannot guard, do not protect trees.
FIX: issue #589 (bad test for stardust)
 2016-10-28 20:26:34 +02:00
Enno Rehling e0a6618199 WIP: test production guarding. 
ents are not working, because they rely on being part of the monster faction? bad!
 2016-10-28 19:42:47 +02:00
Enno Rehling cf666f53a2 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-10-26 14:35:45 +02:00
Enno Rehling 91ae9245ca armedmen tests. 
check missing weapons, WTF_SIEGE and minskill
 2016-10-25 15:01:54 +02:00
Enno Rehling 97918799c1 additional testing for armedmen(). 2016-10-25 00:16:13 +02:00
Enno Rehling 8f802c11e1 off-by-one error for early break from loop. 2016-10-25 00:12:18 +02:00
Enno Rehling 7e8b54c996 Merge pull request #597 from ennorehling/develop 
FIX: glaciers made with snowglobes have no luxuries
 2016-10-24 14:02:18 +02:00
Enno Rehling e5dc754c25 fix demand in broken regions, after load. 2016-10-24 13:54:53 +02:00
Enno Rehling cd69936922 fix demand in terraformed regions. 
https://bugs.eressea.de/view.php?id=2249
 2016-10-24 13:47:38 +02:00
Enno Rehling 2fbc7a44d5 add missing tests for recent failures. 2016-10-23 13:02:53 +02:00
Enno Rehling 92e4643b72 Merge pull request #596 from ennorehling/develop 
duplicate curse ids
 2016-10-23 12:15:54 +02:00
Enno Rehling a921a6594a Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-10-23 10:03:46 +02:00
Enno Rehling f12eda8bdf remove cfindhash, again. 
curse and unit ids can collide, there is no reason why they should be from the same pool.
 2016-10-23 10:03:33 +02:00
Enno Rehling ac4e32a8f5 Merge branch 'master' into develop 2016-10-23 09:59:42 +02:00
Enno Rehling bca90d2076 buildno.h is gone, don't try to read it. 2016-10-23 09:42:43 +02:00
Enno Rehling ccfe616380 release version 3.9.4 2016-10-22 22:40:18 +02:00
Enno Rehling 039f38cbdb Merge branch 'master' of github.com:eressea/server 2016-10-22 22:39:24 +02:00
Enno Rehling b350370b2b Merge pull request #595 from ennorehling/master 
hotfix duplicate curse ids.
 2016-10-22 22:39:14 +02:00
Enno Rehling 34a6dd8d54 fix crash in 997: re-introduce cfindhash. 
this prevents duplicate curse.no values.
 2016-10-22 22:35:10 +02:00
Enno Rehling c7ede945b3 use site packages on Travis CI, revert to Lua 5.1 2016-10-17 19:59:06 +02:00
Enno Rehling 641c1e1979 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-10-17 15:50:02 +02:00