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

6465 Commits

Author SHA1 Message Date
Enno Rehling 5072d59636 release version 3.7.9 2016-01-24 14:51:52 +01:00
Enno Rehling c4ad655456 Merge pull request #459 from ennorehling/master 
Workaround and additional assertions for bug 2182
 2016-01-24 14:50:54 +01:00
Enno Rehling a6b15813ed relax strict assertion (should be allowed to set ocean to 0 peasants) 2016-01-24 14:45:46 +01:00
Enno Rehling 023686fab2 add a liberal sprinkling of assertions to catch negative peasants bug 2182 2016-01-24 14:35:46 +01:00
Enno Rehling 3d7b22fa21 avoid crashing because of bug 2182 2016-01-24 14:31:24 +01:00
Enno Rehling b75b25c046 add suppressions for bugs in valgrind vs libc on our debian system 
this fixes issue #456
 2016-01-17 16:10:39 +01:00
Enno Rehling b8a474db27 release version 3.7.8 2016-01-01 16:37:56 +01:00
Enno Rehling c5c0a590a2 Merge branch 'master' of github.com:eressea/server 2016-01-01 16:37:31 +01:00
Enno Rehling 4907073208 Merge pull request #450 from ennorehling/xmas_messages 
Error messages and tests for snowglobe (master)
 2016-01-01 16:37:06 +01:00
Enno Rehling 25966b3d7f add tests for snowglobe error messages 2016-01-01 16:30:09 +01:00
Enno Rehling 4952f212b8 snowglobe error messages. todo: testing (how?) 2015-12-31 14:43:38 +01:00
Enno Rehling e7c23b15db add missing files 2015-12-30 21:22:28 +01:00
Enno Rehling e1f3b3cdcf passing order object into lua use-functions, so we can use them in error messages. 2015-12-30 21:20:59 +01:00
Enno Rehling 14afee6093 Merge pull request #447 from TurnerSE/feature/xmas2015 
Feature/xmas2015 iteminfo
 2015-12-30 11:25:20 +01:00
Philipp Dreher 18f2cc1d70 cosmetic changes to iteminfo of skillpotion 2015-12-29 09:43:30 +01:00
Philipp Dreher 7b2aa821d0 Added iteminfo for snowglobe in DE+EN 2015-12-29 09:42:54 +01:00
Enno Rehling 1dc69bb1e8 release version 3.7.7 2015-12-26 14:40:47 +01:00
Enno Rehling e574919555 Merge branch 'master' of github.com:eressea/server 2015-12-26 14:40:21 +01:00
Enno Rehling 899738a93c Merge pull request #446 from ennorehling/xmas 
xmas item 2015
 2015-12-26 11:49:37 +01:00
Enno Rehling d9588fb7fb no snowglobe in E3 
include xmas tests in tests/e2, not in run-tests files
 2015-12-26 11:20:37 +01:00
Enno Rehling 92636cfcd9 put the new(ish) email subject line in the CR, 
as reported in https://bugs.eressea.de/view.php?id=2016
 2015-12-26 11:05:03 +01:00
Enno Rehling b66b6f7f4c testing christmas items, removing old xmas scripts 2015-12-22 19:33:44 +01:00
Enno Rehling e678c1bcce disable snowglobe test, because we are not ready yet 2015-12-22 18:49:11 +01:00
Enno Rehling cf90f8cf93 it's beginning to look a lot like christmas 
Conflicts:
	scripts/eressea/xmas.lua
 2015-12-22 18:46:57 +01:00
Enno Rehling 80e0707cb2 snowglobe transformations for several trerrains. messages still TBD 2015-12-22 18:46:45 +01:00
Enno Rehling 3fd4884584 putting all of the pieces together for the snow globe, with final use implementation still TBD 
Conflicts:
	scripts/eressea/xmasitems.lua
	src/laws.c
 2015-12-22 18:46:42 +01:00
Enno Rehling 81888132e4 add a lua binding to convert user-language strings to directions 2015-12-22 18:45:27 +01:00
Enno Rehling 55c15c1905 add a lua binding to convert user-language strings to directions 2015-12-22 18:38:12 +01:00
Enno Rehling 1f080e2058 release version 3.7.6 2015-12-20 20:17:10 +01:00
Enno Rehling 274322c5b2 fix desert.road in E3 also for 3.7.x 2015-12-20 20:16:13 +01:00
Enno Rehling c9d74ee6ca Merge branch 'master' of github.com:eressea/server 2015-12-20 20:13:15 +01:00
Enno Rehling 5e3ab01f17 Merge pull request #438 from ennorehling/master 
Address MS Visual Studio 2015 update 1 breaking changes
 2015-12-16 17:00:39 +01:00
Enno Rehling 24f559b4ad Address MS Visual Studio 2015 update 1 breaking changes 2015-12-16 16:55:52 +01:00
Enno Rehling 44024878f9 Merge branch 'master' of github.com:eressea/server 2015-12-06 20:50:06 +01:00
Enno Rehling 9b5b79e75d Merge pull request #431 from ennorehling/master 
magic resistance never higher than 90%
 2015-12-06 20:50:01 +01:00
Enno Rehling 9b7d4adda5 https://bugs.eressea.de/view.php?id=2173#c6397 
by request: magic resistance never higher than 90%, so highly skilled monsters cannot become completely invincible to magic.
 2015-12-06 20:48:22 +01:00
Enno Rehling acf3aaad5a release version 3.7.5 2015-12-06 18:44:31 +01:00
Enno Rehling 6651292e9b Merge pull request #430 from ennorehling/master 
rewrite the rules for magical damage reduction
 2015-12-06 18:38:42 +01:00
Enno Rehling d04d8e782e https://bugs.eressea.de/view.php?id=2173 
rewrite the rules for magical damage reduction
 2015-12-06 18:34:31 +01:00
Enno Rehling bf2920d1ae fix warnings on gcc 2015-12-05 17:25:47 +01:00
Enno Rehling 7c7206fafd Merge pull request #425 from ennorehling/hotfix-3.7.4 
hotfix: https://bugs.eressea.de/view.php?id=2166
 2015-12-05 17:24:23 +01:00
Enno Rehling 62ee1468b8 https://bugs.eressea.de/view.php?id=2166 
* fix magic resistance calculation in calculate_armor.
* add related tests.
* refactor BF_CANATTACK -> BF_NO_ATTACK because it is easier.
 2015-12-05 17:17:21 +01:00
Enno Rehling 2942babb0d make curl be quiet when uploading to the cloud 2015-11-28 22:09:59 +01:00
Enno Rehling 5145362485 backup datafile and eressea.db to box.net 2015-11-26 16:36:50 +01:00
Enno Rehling 0c7c67a7ab Merge pull request #413 from ennorehling/master 
fixed ships taking damage in a storm
 2015-11-25 12:09:28 +01:00
Enno Rehling 4e4a11d40c Merge remote-tracking branch 'upstream/master' 2015-11-25 12:06:22 +01:00
Enno Rehling 42cfe7d5ee Merge pull request #411 from ennorehling/feature/monster-tests 
sea serpents can attack on oceans
 2015-11-25 12:05:18 +01:00
Enno Rehling f301bec623 addressing comments by solthar on bug 2164, PR #408: storms should still cause damage to ships. 
cleaning up some configuration lookups in sail, moving them outside of loops.
 2015-11-25 12:04:09 +01:00
Enno Rehling bdc5372537 disable test for seaserpent piracy (planned for 3.8) 2015-11-24 16:12:33 +01:00
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