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
Enno Rehling
e91310f576
Merge pull request #422 from ennorehling/feature/issue-418-seaserpent-piracy-crash
...
issue #419 , eliminate language_struct.h, make the struct module-private
2015-12-02 11:52:16 +01:00
Enno Rehling
6ac6a19e7a
Merge pull request #421 from stm2/issue418
...
fix piracy_cmd for sea serpents
2015-12-02 11:46:46 +01:00
Steffen Mecke
e3d7d23d00
re-enable sea serpent piracy
2015-12-01 22:30:51 +01:00
Steffen Mecke
9c076ba6b9
fix piracy_cmd for swimmers and flyers
2015-12-01 22:13:20 +01:00
Enno Rehling
9b645bf46c
issue #419 , eliminate language_struct.h, make the struct module-private
2015-12-01 12:24:22 +01:00
Enno Rehling
70354a355b
disable piracy for sea serpents, piracy_cmd cannot handle it (issue #418 )
2015-12-01 12:22:03 +01:00
Enno Rehling
ceab5245ca
Merge pull request #417 from stm2/bug2169
...
Hervorragende Arbeit, Holmes. Debugging mit den echten Spieldaten hat genau diesen Fehler gefunden.
2015-12-01 11:50:06 +01:00
Steffen Mecke
eae87bc7f1
fix null pointer access, bug2169
2015-11-29 21:06:35 +01:00
Enno Rehling
b1ac0fe0b1
Merge branch 'stm2-massive_overload' into develop
2015-11-27 12:40:45 +01:00
Enno Rehling
4b7cb824bd
Merge branch 'massive_overload' of https://github.com/stm2/server into stm2-massive_overload
...
Conflicts:
src/move.c
src/tests.c
2015-11-27 12:40:17 +01:00
Enno Rehling
097ff40823
Merge branch 'develop' of https://github.com/ennorehling/eressea into develop
2015-11-26 21:13:24 +01:00
Enno Rehling
8cf62ee236
merge the various Christmas modules into one file, make them trigger on a turn, reduce spam
2015-11-26 21:13:01 +01:00
Enno Rehling
950bf91850
fix merge conflict in PR #397 (config changes)
2015-11-26 18:48:21 +01:00
Enno Rehling
6ad5db8e22
Merge pull request #397 from stm2/taxing_message
...
taxing without skill does not fail silently any more
2015-11-26 18:43:57 +01:00
Enno Rehling
cf4bb060b7
Merge branch 'stm2-market_tests' into develop
2015-11-26 18:42:34 +01:00
Enno Rehling
0410581907
Merge branch 'market_tests' of https://github.com/stm2/server into stm2-market_tests
...
Conflicts:
src/move.test.c
src/study.c
2015-11-26 18:42:23 +01:00
Enno Rehling
7dd4475939
Merge branch 'develop' of github.com:eressea/server into develop
2015-11-26 16:38:23 +01:00
Enno Rehling
20087260c9
Merge branch 'master' into develop
2015-11-26 16:38:11 +01:00
Enno Rehling
5145362485
backup datafile and eressea.db to box.net
2015-11-26 16:36:50 +01:00
Steffen Mecke
fe49f01bb6
added moa tests for buildingtype_exists
2015-11-25 23:25:59 +01:00
Enno Rehling
5cf5a49219
Merge pull request #415 from ennorehling/develop
...
re-enable monster tests
2015-11-25 15:36:19 +01:00
Enno Rehling
6c2f4be4af
fix sea serpents using piracy (by re-ordering the decision making process)
2015-11-25 15:29:26 +01:00
Enno Rehling
90b0bdd44e
re-enable all monster tests except piracy for seaserpents, which is red.
2015-11-25 14:53:29 +01:00
Enno Rehling
1cf805649e
Merge remote-tracking branch 'upstream/develop' into develop
...
Conflicts:
src/monsters.c
src/monsters.test.c
2015-11-25 14:38:26 +01:00
Enno Rehling
08c8824094
Merge branch 'stm2-monster_leftovers' into develop
2015-11-25 14:25:58 +01:00
Enno Rehling
c85e489f4f
Merge branch 'monster_leftovers' of https://github.com/stm2/server into stm2-monster_leftovers
...
Conflicts:
src/kernel/unit.c
src/laws.test.c
src/monsters.c
2015-11-25 14:25:42 +01:00
Enno Rehling
b6bb5dee85
fix last merge to work with new config code
2015-11-25 13:27:44 +01:00
Enno Rehling
677f7eac0a
Merge branch 'master' into develop
...
Conflicts:
src/move.c
2015-11-25 13:25:36 +01:00
Enno Rehling
41a6265a80
Merge pull request #412 from ennorehling/develop
...
cleaning up config.c some more
2015-11-25 12:11:30 +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
f559c263e3
cleanup of config.c: move more code to other modules like unit.c and faction.c
2015-11-24 19:53:27 +01:00
Enno Rehling
8aa7fec54c
config.c cleanup: move attribute registration to attributes.c
2015-11-24 19:32:52 +01:00
Enno Rehling
84a943b698
fix gcc build
2015-11-24 19:15:53 +01:00
Enno Rehling
64b84481b2
refactoring: move parsing and allies code out of config.c
2015-11-24 18:52: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
Enno Rehling
190bdccc71
Merge pull request #409 from ennorehling/develop
...
delete two old, unused features
2015-11-24 12:33:23 +01:00
Enno Rehling
817d81dbf9
remove the rules.hunger.reduces_skill variable, no game was doing anything other than the default.
2015-11-23 21:05:25 +01:00
Enno Rehling
0a47f0e398
eliminate SkillCap feature, it was stupid and not used by any game, ever
2015-11-23 20:58:51 +01:00
Enno Rehling
a1b6befa7d
Merge remote-tracking branch 'upstream/develop' into develop
2015-11-23 20:35:51 +01:00
Enno Rehling
2a9dee4134
Merge branch 'master' into develop
...
Conflicts:
src/move.c
2015-11-23 20:33:47 +01:00
Enno Rehling
f09833142a
Merge pull request #408 from ennorehling/master
...
https://bugs.eressea.de/view.php?id=2164
2015-11-23 19:10:24 +01:00
Enno Rehling
d45f16982d
https://bugs.eressea.de/view.php?id=2164
...
ships no longer receive damage from drifting. eliminating the code for this, instead of just the configuration parameters, since all active games now agree on this rule.
2015-11-23 18:41:11 +01:00
Enno Rehling
410fab2d84
Merge remote-tracking branch 'upstream/develop' into develop
2015-11-23 18:33:33 +01:00
Enno Rehling
5b9333f6d9
Merge branch 'release-3.7' into develop
...
Conflicts:
src/buildno.h
src/monsters.c
2015-11-23 17:12:48 +01:00
Enno Rehling
1ed0eaf473
release version 3.7.3
2015-11-23 17:10:49 +01:00