Commit Graph

5835 Commits

Author SHA1 Message Date
Steffen Mecke 81e96c121a typo 2015-04-27 15:14:42 +02:00
Enno Rehling 4dd0ffefe1 Merge pull request #176 from badgerman/develop
Umlaute Reparatur
2015-04-26 23:20:11 +02:00
Enno Rehling 38fe2b1144 Hier hat ein commit aus dem github-Editor das Encoding zerstört, scheint mir. 2015-04-26 23:02:37 +02:00
Enno Rehling 25305d93cb Merge pull request #175 from badgerman/develop
Fix keepitem flag in XML ("Menschen geben nichts ab")
2015-04-22 12:39:32 +02:00
Enno Rehling 30e4dc6cdc Fix keepitem flag in XML ("Menschen geben nichts ab") 2015-04-22 12:33:55 +02:00
Enno Rehling 4ea14398e8 Merge pull request #174 from badgerman/develop
fixing sea serpent names
2015-04-21 12:52:11 +02:00
Enno Rehling 88d370a7b8 fixing sea serpent names
https://bugs.eressea.de/view.php?id=2057
2015-04-21 12:35:39 +02:00
Enno Rehling 078106432e Merge pull request #173 from badgerman/develop
Diverse Tippfehler
2015-04-20 19:22:41 +02:00
Enno Rehling fdb0a79c07 https://bugs.eressea.de/view.php?id=2085
Tippfehler
2015-04-20 19:05:26 +02:00
Enno Rehling e31b671b84 https://bugs.eressea.de/view.php?id=2092
Tippfehler
2015-04-20 19:03:53 +02:00
Enno Rehling 3b6add91e6 https://bugs.eressea.de/view.php?id=2091
Tippfehler
2015-04-20 19:01:49 +02:00
Enno Rehling 2c40a9f593 https://bugs.eressea.de/view.php?id=2090
Tippfehler
2015-04-20 19:00:52 +02:00
Enno Rehling a18c61439b Merge pull request #172 from badgerman/develop
Bug 2089: Untote geben keine Gegenstände ab. Additional Tests for FOLLOW.
2015-04-20 15:57:24 +02:00
Enno Rehling a5e68e10fe test for FOLLOW SHIP 2015-04-20 15:19:17 +02:00
Enno Rehling d2fbdec831 re-enable disabled tests for E2, add test for FOLLOW. 2015-04-20 15:07:10 +02:00
Enno Rehling f06e3371a0 Bug 2089 again. rename giveitem flag to keepitem, because races should default to not holding on to their stuff. 2015-04-19 12:49:39 +02:00
Enno Rehling 71d0558403 Bug 2089: remove the giveitem restriction from all races.
https://bugs.eressea.de/view.php?id=2089
2015-04-19 09:49:52 +02:00
Enno Rehling 6cb85fd12d Merge pull request #171 from badgerman/develop
MAX_VERSION define
2015-04-19 08:37:47 +02:00
Enno Rehling 6e9fca5e2f allow version.h to declare a future version that is compatible with the current code as MAX_VERSION that save.c will accept. 2015-04-19 08:36:15 +02:00
Enno Rehling 3e1ae5e0f2 allow reading of JSON_REPORT_VERSION from future source release 2015-04-19 08:13:40 +02:00
Enno Rehling b7959a8fd8 Merge pull request #169 from badgerman/develop
bugfixes and crashes
2015-04-17 21:36:33 +02:00
Enno Rehling 93e79fcf8f Merge remote-tracking branch 'upstream/develop' into develop 2015-04-17 16:33:30 +02:00
Enno Rehling 961f5e8445 Merge branch 'develop' of github.com:badgerman/eressea into develop 2015-04-17 16:32:53 +02:00
Enno Rehling 743ea02331 test_peasantluck_effect fails on my atom netbook 2015-04-14 03:09:52 +02:00
Enno Rehling ae9fb399f3 unit tests walkingcapacity, configurable trollbelt effect 2015-04-14 02:32:01 +02:00
Enno Rehling a5da77c376 Merge pull request #168 from badgerman/hotfix-3-4-5
tests for volcanooutbreak and spyreport messages
2015-04-10 11:13:44 +02:00
Enno Rehling 359cd6139d Merge pull request #167 from badgerman/bug-1510-trollbelt
fixing the trollbelt multiplier.
2015-04-09 22:48:55 +02:00
Enno Rehling d2eac946f1 ALLY command crashes when incomplete. 2015-04-09 17:16:34 +02:00
Enno Rehling b9a41bc39f fixing the trollbelt multiplier.
it was multiplying the weight of the unit, too, leading to far too big bonuses.
https://bugs.eressea.de/view.php?id=1510
2015-04-09 15:59:00 +02:00
Enno Rehling f320a50853 Merge pull request #166 from badgerman/bug-1504-shipdamage-combat
Ships not getting damage in short battles.
2015-04-09 14:53:10 +02:00
Enno Rehling 11243741ab Merge pull request #164 from badgerman/develop
Bugfix: CLAIM crashing the server.
2015-04-09 14:41:47 +02:00
Enno Rehling f68be23f69 damage taken in the first round of combat does not cause ships to get flagged for damage. 2015-04-09 14:30:49 +02:00
Enno Rehling ad0a753c52 CLAIM command did not like that tokens could be NULL. 2015-04-09 12:33:23 +02:00
Enno Rehling 224a9af33c Test "guarding makes ATTACK a short command"
https://bugs.eressea.de/view.php?id=1493
expose unit.guard values to Lua
2015-04-09 12:19:17 +02:00
Enno Rehling 4db2531c75 Merge pull request #163 from badgerman/develop
Test legal movement of dolphins.
2015-04-09 02:30:42 +02:00
Enno Rehling b1c27ac210 Test legal movement of dolphins.
There were some unsubstantiated reports of dolphins possibly being able to walk on land, but tests do not confirm this.
2015-04-09 01:41:16 +02:00
Enno Rehling fb6ada9b57 Merge pull request #162 from badgerman/develop
https://bugs.eressea.de/view.php?id=2067 duplicate emails
2015-04-09 01:17:55 +02:00
Enno Rehling f1786d4cf0 https://bugs.eressea.de/view.php?id=2067 duplicate emails 2015-04-09 01:13:22 +02:00
Enno Rehling 168fa02e68 for reasons, sometimes libxml2 is not compile, and all tests will fail. detect that. 2015-04-06 17:49:40 +02:00
Enno Rehling 4fb0c133e8 enable json reports for develop branch 2015-04-05 12:50:10 +02:00
Enno Rehling 82926318c0 fix creating factions with invalid race (return nil) 2015-04-04 15:08:35 +02:00
Enno Rehling 4513a8749b Merge pull request #161 from badgerman/develop
remove the (broken) summon_alp spell
2015-04-04 11:05:04 +02:00
Enno Rehling 88a6813358 Merge remote-tracking branch 'upstream/develop' into develop 2015-04-04 11:04:29 +02:00
Enno Rehling 7e92e6501c remove the (broken) summon_alp spell, by request
https://bugs.eressea.de/view.php?id=2086
2015-04-04 11:02:56 +02:00
Enno Rehling cda55ef8fb Merge pull request #160 from badgerman/feature-jsreport
JSON reports
2015-04-04 09:39:36 +02:00
Enno Rehling bd3c9f1fcb Merge pull request #159 from badgerman/develop
remove the change_locales code
2015-04-04 09:21:42 +02:00
Enno Rehling d8c1f03f55 new module to enable jsreport for selected factions. 2015-04-04 09:19:10 +02:00
Enno Rehling 757e196973 remove the change_locales code, this feature was moved in eressea/locales.lua some time ago 2015-04-04 08:55:58 +02:00
Enno Rehling 9664f2b191 Implement an optional JSON report writer. Currently writes readable maps for Tiled. 2015-03-29 14:03:56 +02:00
Enno Rehling d802b297e9 Merge branch 'develop' of github.com:eressea/server into develop 2015-03-19 15:31:33 +01:00