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

6466 Commits

Author SHA1 Message Date
Enno Rehling 1b3c8ea466 import monsters tests from PR #404 
Monsters (i.e. sea serpents) can attack on oceans, when not guarding
 2015-11-24 14:57:50 +01:00
Enno Rehling f09833142a Merge pull request #408 from ennorehling/master 
https://bugs.eressea.de/view.php?id=2164
 2015-11-23 19:10:24 +01:00
Enno Rehling d45f16982d https://bugs.eressea.de/view.php?id=2164 
ships no longer receive damage from drifting. eliminating the code for this, instead of just the configuration parameters, since all active games now agree on this rule.
 2015-11-23 18:41:11 +01:00
Enno Rehling 1ed0eaf473 release version 3.7.3 2015-11-23 17:10:49 +01:00
Enno Rehling 0e5fcbbc7c Merge pull request #407 from ennorehling/release-3.7 
bugfixes 2163, 2164 and 2165
 2015-11-23 17:07:11 +01:00
Enno Rehling 4b7b32cbb5 use monster_attack, not explicit create_order, because we need to check buildings, etc. 2015-11-23 17:00:07 +01:00
Enno Rehling defd870cd1 https://bugs.eressea.de/view.php?id=2163 
Fix order of Arguments when checking for defensive building.
Solthar reminds us that good variable names are good.
 2015-11-23 16:48:05 +01:00
Enno Rehling b6a947ca0c https://bugs.eressea.de/view.php?id=2165 
Monster bewachten nicht, wenn sie nicht ausreichend bewaffnet waren, weil der nötige Check nicht in can_start_guarding gemacht wurde, sondern in guard_on_cmd.
 2015-11-23 15:35:26 +01:00
Enno Rehling c7ab0e8f59 fix https://bugs.eressea.de/view.php?id=2164 (ships get no damage when they drift). 
simplify attack_chance configuration, set it only once.
this way, I can more easily fudge it to 1.0 in the debugger.
 2015-11-23 12:37:42 +01:00
Enno Rehling f0a47321d6 reduce log spam 2015-11-21 21:49:33 +01:00
Enno Rehling 8e4b9283a3 release version 3.7.2 2015-11-16 14:34:30 +01:00
Enno Rehling ef7b252260 fix intermittent test 2015-11-16 14:34:18 +01:00
Enno Rehling bf969879cd release version 3.7.1 2015-11-16 14:28:47 +01:00
Enno Rehling c404f40d86 Merge pull request #403 from ennorehling/release-3.7 
fix a minor warning, get ready for 3.7 release
 2015-11-16 14:27:23 +01:00
Enno Rehling d07f359acb fix a minor warning, get ready for 3.7 release 2015-11-16 14:12:51 +01:00
Enno Rehling 2fa388d099 Merge pull request #399 from TurnerSE/bug/#2119-2 
Moved the description of skillpotion to another namespace
 2015-11-16 13:52:14 +01:00
Philipp Dreher 1562439ca9 Moved the description of skillpotion to another namespace 
Skillpotion isn't actually defined as a potion (or part of the
alchemy-system), therefore the description needs to be moved to the
namespace "iteminfo" to be found.
 2015-11-16 03:22:19 +01:00
Enno Rehling c9c5a22c85 Merge pull request #395 from stm2/fix394 
add missing NULL check to in_safe_building
 2015-11-13 11:18:08 +01:00
Steffen Mecke 251126054e add missing NULL check to in_safe_building 2015-11-13 00:50:54 +01:00
Enno Rehling 449f1c51ac Merge pull request #394 from ennorehling/release-3.7 
in_safe_building needed a test and some changes to logic
 2015-11-12 18:09:13 +01:00
Enno Rehling 7fb5adc7af in_safe_building needs a test and some changes to logic 
github issue #393 fixed
 2015-11-12 17:55:39 +01:00
Enno Rehling e5a5f05410 Merge pull request #384 from ennorehling/release-3.7 
monster attacks, final touches
 2015-11-11 15:14:30 +01:00
Enno Rehling 4eb4ff40ac https://bugs.eressea.de/view.php?id=2155 
monsters do not attack units inside a castle or watch
dragons do not attack guards
 2015-11-11 14:36:56 +01:00
Enno Rehling 4477785da0 first release candidate 2015-11-09 17:08:41 +01:00
Enno Rehling 58a38cca98 Merge pull request #379 from ennorehling/develop 
E2: cavalry and forest flags missing for plains
 2015-11-09 16:54:15 +01:00
Enno Rehling 2e2bb8b792 E2: cavalry and forest flags missing for plains 
https://bugs.eressea.de/view.php?id=2153
 2015-11-09 16:51:08 +01:00
Enno Rehling 28781dfcc8 Merge pull request #378 from ennorehling/develop 
spells are allowed to have 0 hp
 2015-11-09 16:45:08 +01:00
Enno Rehling 4790950daf spells are allowed to have 0 hp 
https://bugs.eressea.de/view.php?id=2150
 2015-11-09 16:39:30 +01:00
Enno Rehling e9ed30f9db Merge pull request #377 from ennorehling/develop 
Bug 2152: Parteitarnung
 2015-11-09 16:30:57 +01:00
Enno Rehling b43a89e4ec fixing TARNE PARTEI NUMMER tests 2015-11-09 14:17:12 +01:00
Enno Rehling 46bc0eb620 some tests don't belong in Lua 2015-11-09 14:06:55 +01:00
Enno Rehling 6d0bcb246d fix compilation and setting parameters to null 2015-11-09 13:55:09 +01:00
Enno Rehling 2aafa2b54f missing test file 2015-11-09 13:41:53 +01:00
Enno Rehling ee02721c21 fix and tests for otherfaction attributes in E2 
https://bugs.eressea.de/view.php?id=2152
 2015-11-09 13:36:52 +01:00
Enno Rehling bf8cc4cb08 trying to trace down an intermittently failing test on windows 2015-11-08 10:34:43 +01:00
Enno Rehling 318820fb00 eliminate use of test_create_world 2015-11-07 23:49:45 +01:00
Enno Rehling 43ab9e3304 Merge pull request #372 from TurnerSE/bug/#1859 
Scheint ja zu funktionieren? Wenn etwas anderes kaputt geht, dann hat das nicht genug Tests, das ist auch eine Lehre. Und noch ist ja Zeit zum Release, um das zu merken.
 2015-11-07 19:21:16 +01:00
Enno Rehling 1182ccf139 Merge branch 'develop' of github.com:eressea/server into TurnerSE-bug/#2144 2015-11-07 18:54:49 +01:00
Enno Rehling 9f94979b0d Merge branch 'bug/#2144' of https://github.com/TurnerSE/server into TurnerSE-bug/#2144 2015-11-07 18:53:19 +01:00
Philipp Dreher 6f3ea9b85a co is now first checked for validity before it is used for var-initialisation 2015-11-07 18:52:30 +01:00
Enno Rehling 251afca68f Merge pull request #376 from ennorehling/develop 
fix test bugs detected by valgrind
 2015-11-07 18:49:52 +01:00
Enno Rehling e8a42b20dd don't use test_create_world 2015-11-07 18:47:55 +01:00
Enno Rehling 7ef18b1533 call cleanup 2015-11-07 18:45:41 +01:00
Enno Rehling 28b98610eb Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2015-11-07 18:22:14 +01:00
Enno Rehling 242efafd61 Fehlende Initializierung, github #375 2015-11-07 18:21:48 +01:00
Enno Rehling 26b6ae4e30 github issue #374 
stick some assertions in natural_armor
refactor it for readability
eliminate a static memory leak
reset num_races to zero at end of test
 2015-11-07 18:21:47 +01:00
Enno Rehling bb0fd4d810 Fehlende Initializierung, github #375 2015-11-07 18:20:37 +01:00
Enno Rehling d30154f3a5 stick some assertions in natural_armor 
refactor it for readability
eliminate a static memory leak
reset num_races to zero at end of test
 2015-11-07 18:14:38 +01:00
Enno Rehling d780988862 valgrind the unit tests for good measure 2015-11-07 18:04:11 +01:00
Philipp Dreher 43b2e30c46 added initial cleanup 2015-11-07 15:18:23 +01:00