Enno Rehling
78857d8aa3
Merge pull request #240 from badgerman/feature/bug-2069-familiar-races
...
bug 2069: familiar races
2015-07-02 11:23:25 +02:00
Enno Rehling
a70b0d4902
Merge pull request #241 from badgerman/feature/bug-1890-monster-give-orders
...
bug 1890: make monsters give GIVE orders
2015-07-02 11:23:13 +02:00
Enno Rehling
b53d01eb18
Bug 1890: monsters do not respect the rules when giving excess weight to peasants.
...
https://bugs.eressea.de/view.php?id=1890
fixed by creating a give order instead of calling give_item directly.
2015-07-02 11:08:38 +02:00
Enno Rehling
414f6d3210
bug 2069: not all E3 magic schools have a familiar.
...
https://bugs.eressea.de/view.php?id=2069
quick fix: defaulting all additional schools to the illaun familiar.
2015-07-02 09:49:51 +02:00
Enno Rehling
258f3c37c0
add test coverage for bug report 2094 (prove that it is invalid)
2015-07-02 08:55:05 +02:00
Enno Rehling
b9f41526ef
Merge pull request #239 from badgerman/feature/bug-1949-magicbag
...
bug 1949: magicbag contents
2015-07-01 22:34:00 +02:00
Enno Rehling
e0a383aa24
test the upper limit of the bag, too.
2015-07-01 22:16:43 +02:00
Enno Rehling
c634a01a3f
Bug 1949: Zauberbeutelverhalten (magic bag tests & config changes)
...
https://bugs.eressea.de/view.php?id=1949
2015-07-01 22:13:24 +02:00
Enno Rehling
e59a23fae7
Merge pull request #238 from badgerman/develop
...
cleaning up tests, fixing a few internal bugs (squashed)
2015-07-01 21:55:47 +02:00
Enno Rehling
2f21f3c086
Merge remote-tracking branch 'upstream/develop' into develop
2015-07-01 21:28:29 +02:00
Enno Rehling
15e9c5962c
merge feature/test-cleanup
...
removing old test files
merging old tests into current system
fixing some internal bugs (i.e. adjust_coordinates)
2015-07-01 21:24:44 +02:00
Enno Rehling
7934917607
pull latest version before building develop
2015-06-28 13:38:13 +02:00
Enno Rehling
59b0c7b957
Merge pull request #236 from badgerman/develop
...
Bug 2113: player-controlled dragon movement
2015-06-27 11:48:49 +02:00
Enno Rehling
0ee76ea8dd
Bug 2113: player-owned dragons did not get movement bonuses.
...
https://bugs.eressea.de/view.php?id=2113
2015-06-26 20:12:01 +02:00
Enno Rehling
f1e3bc7013
Merge pull request #235 from badgerman/develop
...
fixing some small non-critical bugs
2015-06-26 15:57:20 +02:00
Enno Rehling
94ec39d7bb
Bug 2114: broken army listing during combat.
...
https://bugs.eressea.de/view.php?id=2114
2015-06-26 14:44:28 +02:00
Enno Rehling
3ba2b3d4d7
indentation fixes (tab->spaces)
2015-06-26 14:31:21 +02:00
Enno Rehling
9b42824a5e
Bug 2112: volcano stops smoking after it has erupted.
...
https://bugs.eressea.de/view.php?id=2112
2015-06-26 14:26:42 +02:00
Enno Rehling
b7b20bdec6
fewer units for new players, two players per region
2015-06-26 14:19:36 +02:00
Enno Rehling
6a42b6231e
Merge branch 'master' into develop
...
Conflicts:
src/buildno.h
2015-06-21 18:32:10 +02:00
Enno Rehling
ecb2b9b3b3
Merge pull request #234 from badgerman/hotfix/issue-233-invalid-read
...
invalid read, dead factions must leave their alliance
2015-06-21 18:29:00 +02:00
Enno Rehling
a085442b8f
eliminate unused variable.
2015-06-21 17:54:39 +02:00
Enno Rehling
04bf7153f0
remove a faction from its alliance when it is dead.
2015-06-21 17:49:22 +02:00
Enno Rehling
7cf1062650
cmake changes from gruenbaer
2015-06-21 16:29:48 +02:00
Enno Rehling
6fa39da6f6
cmake submodule update
2015-06-21 16:27:35 +02:00
Enno Rehling
5667b6dc8c
Merge branch 'develop' of github.com:eressea/server into develop
2015-06-21 16:24:46 +02:00
Enno Rehling
d2037a5cd9
Merge pull request #232 from badgerman/develop
...
after combat, eject enemies only
2015-06-20 15:56:50 +02:00
Enno Rehling
659aa6c973
after combat, eject enemies only
2015-06-20 14:28:16 +02:00
Enno Rehling
ca7c4804da
Merge pull request #231 from badgerman/develop
...
Revert "disable force_leave code, it is too surprising"
2015-06-19 15:04:07 +02:00
Enno Rehling
9d1eac2f6a
Merge pull request #230 from badgerman/feature-force-leave-postcombat
...
force leave after combat
2015-06-19 15:03:30 +02:00
Enno Rehling
5afd58faff
Revert "disable force_leave code, it is too surprising"
...
This reverts commit f27d60e1b2
.
2015-06-19 13:37:15 +02:00
Enno Rehling
9b7a4e813b
functional test for forced leave configuration.
...
functional test for forced leave after combat.
functional test for MAKE TEMP.
error handling for Lua function building.create().
reduce some errors to warnings.
initialize race.battle_flags correctly (when not created through XML).
re-initialize processor in case config has changed.
handle missing translation of combat status, with error message.
2015-06-19 13:17:01 +02:00
Enno Rehling
e7bffb7533
implement post-combat forced leave from ship/building
2015-06-19 07:53:11 +02:00
Enno Rehling
75f87494d2
Merge pull request #229 from badgerman/develop
...
disable force_leave code, it is too surprising
2015-06-18 08:13:07 +02:00
Enno Rehling
f27d60e1b2
disable force_leave code, it is too surprising
2015-06-18 00:01:11 +02:00
Enno Rehling
6e4c7c12d5
disable force_leave code, it is too surprising
2015-06-17 23:58:18 +02:00
Enno Rehling
d541e8b1e3
Merge pull request #228 from badgerman/develop
...
fix open github issues
2015-06-17 14:25:28 +02:00
Enno Rehling
b630c9ee45
oops. the name of the server is gruenbaer, not eressea
2015-06-17 08:07:47 +02:00
Enno Rehling
5257848648
do not install crontab, except on eresseaserver. fixes issue #226
2015-06-17 08:06:01 +02:00
Enno Rehling
e6b3a6da65
suppress valgrind warning form issue #227
2015-06-17 07:54:56 +02:00
Enno Rehling
32bd8c4353
make preview script valgrind use suppression file, closing issue #154
2015-06-17 07:50:35 +02:00
Enno Rehling
ff3fdb62cd
enable valgrind suppressions for QA previews
2015-06-17 07:30:06 +02:00
Enno Rehling
4fa3f81baa
Merge pull request #225 from badgerman/develop
...
bug 2057: fixing sea serpents with empty names, again.
2015-06-12 18:08:32 +02:00
Enno Rehling
272653f8ba
fixing sea serpents with empty names, again. https://bugs.eressea.de/view.php?id=2057
2015-06-12 18:05:56 +02:00
Enno Rehling
6306ed754b
Merge pull request #224 from badgerman/feature/lua-5-3
...
travis build now runs a full turn
2015-06-09 08:48:08 +02:00
Enno Rehling
8080adcd2b
travis build now runs a full turn for acceptance.
...
* new cmake module (lus/tolua changes).
* valgrind suppression for glibc strtod problems.
2015-06-09 08:39:22 +02:00
Enno Rehling
8ecf51b057
cmake will use LD_LUA and LD_TOLUA environment variables to search
2015-06-08 22:23:07 +02:00
Enno Rehling
d5aae430a6
Merge pull request #223 from badgerman/develop
...
score module changes and lua 5.3 prep
2015-06-08 21:22:38 +02:00
Enno Rehling
4e33e59d64
more lua_pushinteger conversion for lua 5.3
2015-06-08 21:19:17 +02:00
Enno Rehling
84f8a9f746
calculate simple default scores for items that do not have one defined in XML.
2015-06-08 21:15:07 +02:00