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

6564 Commits

Author SHA1 Message Date
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
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 2942babb0d make curl be quiet when uploading to the cloud 2015-11-28 22:09:59 +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