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

6439 Commits

Author SHA1 Message Date
Enno Rehling dedbd67d07 re-apply fix for CID 22551: dereference before null check (merge conflict) 2015-11-04 09:36:09 +01:00
Enno Rehling 1993e5e384 Merge branch 'master' into develop 2015-11-04 09:05:04 +01:00
Enno Rehling 0414890923 Merge pull request #363 from ennorehling/master 
fix scripting bug in new autoseed module
 2015-11-04 09:02:09 +01:00
Enno Rehling 1c85f0e1de fix scripting bug in new autoseed module 2015-11-04 08:56:31 +01:00
Enno Rehling 0be8724093 CID 22475 Dereference after null check 2015-11-04 07:56:19 +01:00
Enno Rehling 5aa5d52022 Merge pull request #362 from TurnerSE/bug/#2104 
ohne die alle gelesen zu haben, akzeptiere ich das mal. Ist auf jeden Fall besser als keine Beschreibung, da bin ich sicher.
 2015-11-04 07:45:00 +01:00
Philipp Dreher 56aeae4fbe one last, but big, translation... 2015-11-04 00:40:24 +01:00
Enno Rehling 04b5bc0c60 CID 22474 Evaluation order violation 2015-11-03 23:19:35 +01:00
Enno Rehling 7efda5f967 CID 22468 Division or modulo by zero 2015-11-03 23:18:56 +01:00
Enno Rehling 1f055b3175 CID 22466 Division or modulo by zero 2015-11-03 23:17:11 +01:00
Enno Rehling 103c480c91 CID 22465 Division or modulo by zero 2015-11-03 23:15:26 +01:00
Enno Rehling 1093a23d5a CID 22464 Division or modulo by zero 2015-11-03 23:14:06 +01:00
Enno Rehling 876e4122b1 CID 22463 Division or modulo by zero 2015-11-03 23:13:04 +01:00
Enno Rehling fff40f048b CID 22462 Division or modulo by zero 2015-11-03 23:11:34 +01:00
Enno Rehling e6973ff394 CID 22445 Unchecked return value 2015-11-03 23:05:44 +01:00
Enno Rehling f78fe84216 CID 22443 Ignoring number of bytes read 2015-11-03 23:03:40 +01:00
Enno Rehling 870d42ccfe CID 22442 Unchecked return value from library 2015-11-03 23:01:09 +01:00
Enno Rehling 307c5ec85b CID 22435 Unchecked return value from library 2015-11-03 22:56:05 +01:00
Enno Rehling 0c5ef21c10 CID 22434 Ignoring number of bytes read 
also potential missing  null-termination
 2015-11-03 22:53:19 +01:00
Enno Rehling 165d287d59 fixing CID 22537, leak in cb_insert 2015-11-03 22:47:21 +01:00
Philipp Dreher 42d0a1beef more spells translated 2015-11-03 22:43:26 +01:00
Enno Rehling 4854a4f765 Merge pull request #355 from ennorehling/feature/battle-test 
bug 2149: armor vs. projectile weapons
 2015-11-03 20:52:51 +01:00
Enno Rehling 154c2076a2 fixing bug 2149: projectile armor shall only protect against projectiles 
https://bugs.eressea.de/view.php?id=2149
 2015-11-03 19:12:40 +01:00
Enno Rehling cfc31c6598 provide a failing test for issue 2149 2015-11-03 19:11:03 +01:00
Enno Rehling f959f43f1e extensive tests for armor calculation 2015-11-03 18:59:09 +01:00
Enno Rehling cc89e9c9da fix crash when rules do not define a unicorn item 2015-11-03 17:33:44 +01:00
Philipp Dreher d6bcc8345b translated some more spells 2015-11-03 16:41:57 +01:00
Enno Rehling 15ff621cbb refactor: extract damage calculation from terminate 
start writing tests (WIP)
 2015-11-03 14:22:50 +01:00
Enno Rehling 91a6324a97 cleanup: functions do not need to be dereferenced with an & in C. 2015-11-03 13:30:34 +01:00
Philipp Dreher 8d70a07901 added english descriptions for a few spells 2015-11-03 13:22:44 +01:00
Enno Rehling 7e81b98fa4 Merge pull request #339 from TurnerSE/improvement/CID22481 
Improvement/cid22481
 2015-11-03 13:08:03 +01:00
Enno Rehling 4052f52472 Merge pull request #345 from TurnerSE/bug/#2145 
Bug/#2145
 2015-11-03 13:04:28 +01:00
Enno Rehling c371454a0a Merge branch 'TurnerSE-enhancement/airship_refactoring' into develop 2015-11-03 13:02:56 +01:00
Enno Rehling ae28cbd7c3 Merge branch 'enhancement/airship_refactoring' of https://github.com/TurnerSE/server into TurnerSE-enhancement/airship_refactoring 
Conflicts:
	src/spells/shipcurse.c
 2015-11-03 13:02:42 +01:00
Enno Rehling 5bcc0699a1 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2015-11-03 12:29:55 +01:00
Enno Rehling ee6db51068 release version 3.6.6 2015-11-03 12:27:51 +01:00
Enno Rehling b5ce026d6d Merge pull request #346 from ennorehling/master 
autoseed module for new players
 2015-11-03 12:17:43 +01:00
Enno Rehling bd46d08446 Merge branch 'master' of https://github.com/ennorehling/eressea 2015-11-03 11:56:47 +01:00
Enno Rehling 451303d7d3 autoseed as a module for E2 
made from pieces of newplayer.lua and populate.lua
 2015-11-03 11:54:08 +01:00
Philipp Dreher 5178bbd674 moved application of armor-penetration 
halfed armor now includes the effect of natural armor, but not the
effect of magic armor
 2015-11-03 00:05:55 +01:00
Philipp Dreher bf42143b11 Revert "WIP new test for armor penetration" 
This reverts commit dab8bdf7ef.
 2015-11-03 00:01:10 +01:00
Philipp Dreher 0e83cc69d3 missed a spot... 2015-11-02 18:27:07 +01:00
Philipp Dreher c2a8c32be0 forgot fwd-declaration of structs... 2015-11-02 18:08:35 +01:00
Philipp Dreher 07fd3dc970 formal correction 2015-11-02 18:06:19 +01:00
Philipp Dreher 30dce18697 small formal corrections 2015-11-02 17:58:14 +01:00
Philipp Dreher 96ccb046ab added test-suite for flyingship.c 
some general testing of the spells functionality for future maintenance
purposes
 2015-11-02 17:54:23 +01:00
Enno Rehling 63541dcc5d Merge pull request #338 from TurnerSE/improvement/test_skillpotion 
Improvement/test skillpotion
 2015-11-02 17:38:47 +01:00
Philipp Dreher 29173887b6 test_create_castorder can take spelllparameters now too 2015-11-02 17:09:16 +01:00
Enno Rehling 01078460bb Merge pull request #343 from ennorehling/feature/bug-2143-monsters-attack-buildings 
bug 2143: monsters attack buildings
 2015-11-02 16:40:32 +01:00
Philipp Dreher 0e8365c802 moved convenience function for convenience 
the formerly static function test_create_castorder is now available for
general usage via tests.h/.c
 2015-11-02 16:12:56 +01:00