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

6580 Commits

Author SHA1 Message Date
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
Enno Rehling edb862a8fc CID 22461 Division or modulo by zero 
partial fix github issue #326
also fewer calls to rmoney
 2015-11-09 20:10:02 +01:00
Enno Rehling e14cc50252 CID 22522, 22520 Resource leak 
helping coverity scan to understand this code
 2015-11-09 20:05:55 +01:00
Enno Rehling 66e43caf9d CID 32303 Unchecked return value 
appeasing coverity
 2015-11-09 20:03:38 +01:00
Enno Rehling bed1d6e6ae Merge pull request #381 from ennorehling/develop 
shock trigger fix
 2015-11-09 19:53:48 +01:00
Enno Rehling 32c777d428 add missing test file, try again 2015-11-09 19:46:01 +01:00
Enno Rehling ea8721367a test and fix shock trigger. 
https://bugs.eressea.de/view.php?id=2154
 2015-11-09 19:43:51 +01:00
Enno Rehling fed660987a CID 22519 et al (resource leaks) 
make the failure case for get_spellbook a little slower, but make static analysis happy.
 2015-11-09 19:16:20 +01:00
Enno Rehling 83c607a403 Merge pull request #380 from ennorehling/develop 
division by zero errors, coverity
 2015-11-09 18:27:09 +01:00
Enno Rehling 9ff6aa0d42 CID 22472 Division or modulo by zero 
CID 22471 Division or modulo by zero
github issue #350
github issue #349
 2015-11-09 18:06:11 +01:00
Enno Rehling 2e7a1a3ded CID 32208 Time of check time of use 2015-11-09 18:03:19 +01:00
Enno Rehling 4477785da0 first release candidate 2015-11-09 17:08:41 +01:00
Enno Rehling 82994e5fd1 version number increase for planned february release 2015-11-09 17:04:50 +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