Enno Rehling
618902f723
eliminate Visual C++ warning about pointless range check
2015-05-27 22:44:12 +02:00
Enno Rehling
e954b210d4
Merge remote-tracking branch 'upstream/develop' into develop
2015-05-24 16:25:10 +02:00
Enno Rehling
b8de887399
change log level from warn->info
2015-05-24 16:21:12 +02:00
Enno Rehling
202d52e7f3
Merge pull request #214 from eressea/release-3-5
...
merge changes from release branch back into develop
2015-05-24 14:11:07 +02:00
Enno Rehling
59400b1e27
Merge branch 'release-3-5' into develop
...
Conflicts:
s/runtests
src/buildno.h
2015-05-24 14:10:42 +02:00
Enno Rehling
24fc66ad1e
update build no, re-enable test
2015-05-24 14:05:03 +02:00
Enno Rehling
a5f056b4b6
re-enable an assertion that was commented out.
...
fix a size_t range warning, change error code for wrptr().
2015-05-24 14:01:37 +02:00
Enno Rehling
4971795be1
Merge pull request #211 from badgerman/master
...
test_peasant_luck_effect failure on x86
2015-05-24 13:49:57 +02:00
Enno Rehling
820974869b
Merge pull request #212 from badgerman/release-3-5
...
fix test_peasant_luck_effect failure on x86
2015-05-24 13:49:51 +02:00
Enno Rehling
06a908a702
Merge pull request #213 from badgerman/develop
...
fix test_peasant_luck_effect failure on x86
2015-05-24 13:49:45 +02:00
Enno Rehling
9695b49f40
fix floating point inconsistency on 32-bit x86 CPUs
2015-05-24 13:12:23 +02:00
Enno Rehling
0c3e310e39
working around floating point inconsistencies on 32 bit x86s
2015-05-24 13:06:20 +02:00
Enno Rehling
1371985776
working around a possible bug in gcc 4.9.2-10ubuntu13
2015-05-24 12:20:24 +02:00
Enno Rehling
6260a45be5
running the test 1000 times should not change the result.
...
if it does, that is because it depends on state (of the random number generator), which is bad and needs to be fixed if it makes the test intermittent.
2015-05-24 11:32:16 +02:00
Enno Rehling
8674fc18c7
ignore gdb_history file
2015-05-24 11:28:58 +02:00
Enno Rehling
4b721e074d
diable test_peasantluck, it fails on master
...
do not load any config for run-tests.lua
2015-05-24 10:31:11 +02:00
Enno Rehling
4aceb204ea
Merge pull request #210 from badgerman/develop
...
fix pool test (GiveRestriction broke it).
2015-05-24 09:48:06 +02:00
Enno Rehling
e9992db51c
fix pool test (GiveRestriction broke it).
...
- do not default to loading the E2 rules for tests, so GiveRestriction
will not be set to a default value.
- only load configuration if a ruleset has been defined.
2015-05-24 09:09:34 +02:00
Enno Rehling
fb39835cf0
Merge pull request #209 from badgerman/release-3-5
...
Release 3.5.1
2015-05-24 08:00:57 +02:00
Enno Rehling
9780ec845f
still having problems with GiveRestriction
2015-05-24 07:49:01 +02:00
Enno Rehling
34b1ead0ac
Make GiveRestriction default to 0, do not cache the value in a static variable.
2015-05-24 07:44:02 +02:00
Enno Rehling
6f50027088
use_item can return positive values now
2015-05-24 07:43:11 +02:00
Enno Rehling
e99db198eb
bugfix use_item (use_skillpotion did not use pool).
...
from here on, all use_* functions return the number of items used, and
use_item handles removing them from the unit (or the pool).
2015-05-24 07:17:23 +02:00
Enno Rehling
2ddabc1477
Merge branch 'cursefix2' of https://github.com/stm2/server into stm2-cursefix2
2015-05-22 17:27:51 +02:00
Enno Rehling
3e93ebfcb7
Merge pull request #206 from badgerman/feature-giverestriction-default
...
Make GiveRestriction default to 0, do not cache
2015-05-22 17:25:15 +02:00
Enno Rehling
73fa9a276d
Make GiveRestriction default to 0, do not cache the value in a static variable.
2015-05-22 16:23:18 +02:00
Enno Rehling
1a8c95dc61
Merge pull request #205 from badgerman/bug-2103-missing-translation
...
Bug 2103: Fehlende Zauberbeschreibung im englischen CR
2015-05-22 15:45:00 +02:00
Enno Rehling
16dead2626
Merge pull request #204 from badgerman/issue-203-no_terrain_id
...
kill some invalid log spam
2015-05-22 15:44:52 +02:00
Enno Rehling
0ea0936156
Use default locale when missing a translation, only warn once.
...
https://bugs.eressea.de/view.php?id=2103
remove locale::fallback, it was never set anyhow (also, we have no good fallbacks).
2015-05-22 14:14:02 +02:00
Enno Rehling
eb6215e018
https://github.com/eressea/server/issues/203 terrain_t check was exactly wrong, causing log spam.
...
remove obsolete line from E4 config.
2015-05-22 13:52:45 +02:00
Enno Rehling
7a65658cc5
Merge pull request #202 from badgerman/develop
...
valgrind test for travis, fix runtests script, fix bad tests
2015-05-21 21:31:35 +02:00
Enno Rehling
b8e87617f1
Merge pull request #1 from badgerman/feature-valgrind-test
...
Include valgrind check as part of the Travis build
2015-05-21 18:58:09 +02:00
Enno Rehling
b7f6bea569
suppress zlib bugs on Travix boxen
2015-05-21 18:03:24 +02:00
Enno Rehling
0838218706
generate suppressions, fix valgrind exit code
2015-05-21 17:48:45 +02:00
Enno Rehling
090197866b
investigating travis build environment
2015-05-21 17:44:36 +02:00
Enno Rehling
ac01d33cd2
try to locate zlib valgrind problem on the travis boxen.
...
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=577135
use set -e to terminate when any part of the build fails
2015-05-21 17:29:13 +02:00
Enno Rehling
f29d573c3e
fix travis build writing reports with valgrind
2015-05-21 16:30:14 +02:00
Enno Rehling
f69d46404c
remove cruft from ini file
2015-05-21 13:23:07 +02:00
Enno Rehling
5c62bf2401
include valgrind in the travis build
2015-05-21 13:21:53 +02:00
Enno Rehling
d9ffd24ea5
Merge branch 'develop' of github.com:badgerman/eressea into develop
2015-05-21 12:35:41 +02:00
Enno Rehling
dde139f784
Merge remote-tracking branch 'upstream/develop' into develop
2015-05-21 12:04:13 +02:00
Enno Rehling
70f5633c41
Merge branch 'develop' of github.com:badgerman/eressea into develop
2015-05-21 11:58:09 +02:00
Enno Rehling
cf88280595
fix build_building tests, require an order argument.
...
test current replace_order behavior.
2015-05-21 11:52:31 +02:00
Enno Rehling
1c4778e3ef
abort tests when non-zero exit-code is returned, fix GiveRestriction for pool tests
2015-05-21 11:05:24 +02:00
Enno Rehling
88f454e1f7
failed tests abort runtests and return an error code
...
small test world for (future) valgrind tests.
2015-05-21 08:29:22 +02:00
Enno Rehling
22ae1b63de
Merge pull request #201 from badgerman/issue-199-sparagraph
...
bugfix sparagraph (github issue #199 ).
2015-05-20 22:54:53 +02:00
Enno Rehling
58ec65923d
Merge pull request #200 from badgerman/develop
...
Fix for embassy.lua in new games
2015-05-20 20:07:55 +02:00
Enno Rehling
465dcf4e1c
bugfix sparagraph (github issue #199 ).
...
adding tests.
2015-05-20 18:05:25 +02:00
Enno Rehling
657c621582
if the game has no region named Muschelplateau, then ignore this code
2015-05-20 13:05:47 +02:00
Enno Rehling
4607515e24
Merge pull request #197 from badgerman/bug-2070-negative-origin
...
Bug 2070: negative origin crashes the server
2015-05-20 11:09:08 +02:00