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

6854 Commits

Author SHA1 Message Date
Steffen Mecke 069303d0ae slightly improved monster code 
change normalvariate to more efficient dice based method
try harder to learn a useful skill
 2015-11-17 02:14:28 +01:00
Steffen Mecke 8cec4b20e0 reduce code obfuscation 2015-11-17 02:14:08 +01:00
Steffen Mecke 1789bc06e9 monster faction may learn from experience 2015-11-17 02:13:57 +01:00
Enno Rehling efc87a16e3 clarify dragon planning code (bug 2159) 2015-11-16 16:57:51 +01:00
Steffen Mecke b34fca4633 hopefully fixing travis build (thanks, valgrind) 2015-11-16 14:40:18 +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 d91c9fb880 fix intermittent test 2015-11-16 14:31:53 +01:00
Enno Rehling 6237e6dfe2 Merge branch 'release-3.7' into develop 2015-11-16 14:30:31 +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
Steffen Mecke 4fdb9e86e7 test for follow ship error msg 2015-11-16 12:51:34 +01:00
Steffen Mecke a6fe494ff4 error msg for movement should contain FOLLOW SHIP order 
http://bugs.eressea.de/view.php?id=2161
 2015-11-16 12:47:20 +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
Steffen Mecke 5326bbd9e4 refactored inside_building/building_is_active/active_building 2015-11-16 02:13:48 +01:00
Steffen Mecke dcca3f1424 test and fix for market operation, bug2083 
http://bugs.eressea.de/view.php?id=2083
 2015-11-16 01:13:01 +01:00
Steffen Mecke 3a18384ddb overfull ships do not drift but take damage 
http://bugs.eressea.de/view.php?id=2157
removed exploit:
ships more than 2 times over their ship type's capacity do not drift but take 30% to 100% damage
 2015-11-15 12:43:05 +01:00
Steffen Mecke 01f4ebd4ce test for fixed value instead of range 2015-11-14 17:14:38 +01:00
Steffen Mecke 493b45c832 taxing without skill does not fail silently any more 
http://bugs.eressea.de/view.php?id=2158
added configuration parameter for tax per level
 2015-11-14 15:36:14 +01:00
Steffen Mecke f9c2994de1 fixing memory bug 2015-11-13 15:52:32 +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 477d69152f added tests for all kinds of syntax parameters 2015-11-13 00:57:14 +01:00
Steffen Mecke 4ab92e3caf fixed descriptions of spells with parameters (bug #2060+1867) 2015-11-13 00:57:14 +01:00
Steffen Mecke f3972a2390 prepared test for nr_spell 2015-11-13 00:57:14 +01:00
Steffen Mecke 251126054e add missing NULL check to in_safe_building 2015-11-13 00:50:54 +01:00
Enno Rehling 5ef9b624ff Merge branch 'release-3.7' into develop 2015-11-12 18:11:21 +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
Steffen Mecke e2b56cd04a fix morale change when region owner changes 
http://bugs.eressea.de/view.php?id=2139
 2015-11-12 16:09:26 +01:00
Enno Rehling c3f1d68f3b Merge pull request #391 from ennorehling/develop 
CID 22512 Out-of-bounds read
 2015-11-11 17:05:37 +01:00
Enno Rehling c2d969c33e CID 22512 Out-of-bounds read 2015-11-11 16:36:57 +01:00
Enno Rehling 385a5dbe3a Merge pull request #390 from ennorehling/develop 
latest batch of coverity scan fixes
 2015-11-11 16:19:03 +01:00
Enno Rehling c5965fcd59 CID 22455 Logically dead code 
github issue #359
 2015-11-11 16:00:07 +01:00
Enno Rehling 972b8cee40 CID 22436 Ignoring number of bytes read 
github issue #333
 2015-11-11 15:55:39 +01:00
Enno Rehling 1949e8710d CID 22536: Resource leak (RESOURCE_LEAK) 
github issue #388
 2015-11-11 15:51:48 +01:00
Enno Rehling fc73da4ae4 CID 22484 Explicit null dereferenced 
github issue #386
 2015-11-11 15:48:11 +01:00
Enno Rehling 3cd47bb8fa CID 22503 Negative array index write 
github issue #387
I was pretty sure I had submitted this before. What is going on?
 2015-11-11 15:48:09 +01:00
Enno Rehling dee05076ac Merge remote-tracking branch 'upstream/develop' into develop 2015-11-11 15:17:04 +01:00
Enno Rehling f69311b141 Merge branch 'develop' of github.com:eressea/server into develop 2015-11-11 15:15:30 +01:00
Enno Rehling d11f8ead56 Merge branch 'release-3.7' into develop 
Conflicts:
	src/buildno.h
 2015-11-11 15:15:08 +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 14e830e8c5 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2015-11-11 12:20:28 +01:00
Enno Rehling a4fc9c35de Merge pull request #383 from ennorehling/develop 
expandloot calculation repairs
 2015-11-10 11:09:05 +01:00
Enno Rehling 34c9958368 CID 22584 Result is not floating-point 
github issue #326
chance of morale loss is 20-100 percent depending on loss of silver
 2015-11-10 10:44:17 +01:00
Enno Rehling 6d3efca8b3 Merge remote-tracking branch 'upstream/develop' into develop 2015-11-09 20:21:13 +01:00
Enno Rehling a2ac68197d Merge pull request #382 from ennorehling/develop 
coverity scan fixes / help
 2015-11-09 20:20:43 +01:00
Enno Rehling 8358c98b7e Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2015-11-09 20:10:14 +01:00