Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
6703 commits 10 branches 0 tags 41 MiB
Commit graph

6703 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
a02d71bfef https://bugs.eressea.de/view.php?id=2176 
generate the reduced production message before writing reports, so it shows in the CR.
 2015-12-17 12:40:22 +01:00
Enno Rehling
9e4344e3c3 resolve a TODO, make attribute (and data) a little bit smaller. 2015-12-17 12:23:07 +01:00
Steffen Mecke
09836ed249 make dragon movement more deterministic 2015-12-17 11:47:08 +01:00
Enno Rehling
5187788f3c pass the parent of an attribute into a_age and attrib_type::age 2015-12-16 22:18:44 +01:00
Enno Rehling
d85123fe8b Merge pull request #439 from ennorehling/develop 
MS Visual Studio 2015 update 1 breaking changes
 2015-12-16 17:06:04 +01:00
Enno Rehling
fadccb5bd6 MS Visual Studio 2015 update 1 breaking changes (relative include files) 2015-12-16 17:02:29 +01:00
Enno Rehling
c66d6c7457 Address MS Visual Studio 2015 update 1 breaking changes 2015-12-16 17:01:47 +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
a2e7e6476c Merge branch 'develop' of github.com:eressea/server into develop 2015-12-16 13:32:14 +01:00
Enno Rehling
fa55f84b41 remove unnecessary assert that prevents throwing away money on an ocean 
github issue #437
https://bugs.eressea.de/view.php?id=2173#c6411
 2015-12-16 13:32:02 +01:00
Enno Rehling
0767a42671 Merge pull request #436 from ennorehling/develop 
no optional argument in E3 either
 2015-12-15 22:56:36 +01:00
Enno Rehling
cc88f56a26 no optioinal argument 
http://bugs.eressea.de/view.php?id=2175#c6408
 2015-12-15 07:59:55 +01:00
Enno Rehling
60ea74ce50 Merge pull request #435 from ennorehling/develop 
bugfix dupe message
 2015-12-12 21:38:15 +01:00
Enno Rehling
78c13d3ca2 bugfix dupe message 
http://bugs.eressea.de/view.php?id=2178
 2015-12-12 21:34:56 +01:00
Enno Rehling
ad28b9ae94 Merge pull request #434 from ennorehling/develop 
Fixed PR for negative peasant growth, rand injection
 2015-12-11 18:09:02 +01:00
Enno Rehling
3fafb04b57 fix ahort to int converaion problems, fox PR 2015-12-11 18:03:55 +01:00
Enno Rehling
18bcf83d9b Merge pull request #432 from ennorehling/braineaters 
no natural ac for braineaters
 2015-12-10 22:12:38 +01:00
Enno Rehling
d26cd57934 no natural ac for braineaters 2015-12-10 21:59:14 +01:00
Steffen Mecke
ad74c0a25d fix rare bug that created negative peasants 
when a region had non-standard wage, immigration could cause negative peasants
 2015-12-08 17:57:23 +01:00
Steffen Mecke
1f4c521ac8 encapsulate r->land->peasants, money, horses, herbs, morale 2015-12-08 17:57:23 +01:00
Steffen Mecke
723c3df7b2 test for immigration 2015-12-08 17:57:23 +01:00
Steffen Mecke
703edb676c facility to inject a non-random random generator 
This should be handy for writing tests that make use of randomization.
 2015-12-08 17:57:23 +01:00
Enno Rehling
1a9e3db423 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2015-12-06 20:51:14 +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
50e560c7c0 TODO: still find out how to stop these from being created 2015-12-06 18:43:59 +01:00
Enno Rehling
1075b7ce17 Merge branch 'master' into develop 2015-12-06 18:39:54 +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
b854213be6 Merge pull request #429 from ennorehling/develop 
break_curse spell description error message
 2015-12-06 16:53:04 +01:00
Enno Rehling
6a20345b53 issue #428, fix writing spell description for break_curse 2015-12-06 16:45:31 +01:00
Enno Rehling
65902ca97f do not call a function test_* that is not a test (I got confused and broke it when trying to make a change) 2015-12-06 12:02:16 +01:00
Enno Rehling
6fb9d9d396 Merge pull request #427 from stm2/fiery_breath 
Oh, ich sehe es. Letzten Kommentar von mir ignorieren, Danke!
 2015-12-05 23:58:48 +01:00
Steffen Mecke
864c875316 fix typo: fiery breath was icy 2015-12-05 22:27:03 +01:00
Enno Rehling
905aeff3a7 Merge pull request #426 from ennorehling/develop 
fixing compilation and stuff
 2015-12-05 18:53:53 +01:00
Enno Rehling
c16beeef08 TODO: find out which test left those files behind. 2015-12-05 18:47:11 +01:00
Enno Rehling
435d801239 fix compiation problems after merge 
what is going on with this? why was critbit outdated?
 2015-12-05 18:45:03 +01:00
Enno Rehling
f747b4ee05 Merge remote-tracking branch 'upstream/develop' into develop 2015-12-05 18:34:59 +01:00
Enno Rehling
02c249d61e fix not giving christmas trees 
https://bugs.eressea.de/view.php?id=2171
 2015-12-05 17:33:41 +01:00
Enno Rehling
ee4480250f https://bugs.eressea.de/view.php?id=2172 
desert.road was wrong (probably from migrating XML to JSON)
 2015-12-05 17:30:25 +01:00
Enno Rehling
1d57bf527d Merge branch 'master' into develop 
Conflicts:
	src/battle.test.c
	src/buildno.h
 2015-12-05 17:27:04 +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
4345b774c3 Merge branch 'stm2-bug_2139' into develop 2015-12-03 11:07:01 +01:00
Enno Rehling
3e048e2a84 Merge branch 'bug_2139' of https://github.com/stm2/server into stm2-bug_2139 
Conflicts:
	scripts/tests/e3/castles.lua
	scripts/tests/e3/rules.lua
 2015-12-03 11:06:55 +01:00
Enno Rehling
b3e7fa63e0 Merge pull request #396 from stm2/spell_parameters 
fixed treatment of spell parameters (bug 1867)
 2015-12-03 11:04:57 +01:00