Enno Rehling
bafc7f8237
Merge branch 'release-3-5'
2015-06-08 08:50:51 +02:00
Enno Rehling
29753985f7
Merge branch 'master' into release-3-5
...
Conflicts:
src/laws.test.c
2015-06-08 08:50:18 +02:00
Enno Rehling
5cf02e35e1
Merge branch 'release-3-5' of github.com:eressea/server into release-3-5
2015-06-08 08:49:14 +02:00
Enno Rehling
6e9f889e77
Merge branch 'master' of github.com:eressea/server
...
Conflicts:
src/laws.test.c
2015-06-08 08:47:36 +02:00
Enno Rehling
91a945929e
Merge branch 'release-3-5'
2015-06-08 08:46:07 +02:00
Enno Rehling
32b5d7c3d3
Merge branch 'master' into release-3-5
...
Conflicts:
scripts/tests/e3/rules.lua
src/buildno.h
src/kernel/version.h
2015-06-08 08:45:48 +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
9695b49f40
fix floating point inconsistency on 32-bit x86 CPUs
2015-05-24 13:12:23 +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
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
72e4ee8e9f
Merge pull request #188 from badgerman/develop
...
fixes to Solthar's commit
2015-05-13 20:25:10 +02:00
Enno Rehling
2df0743439
Merge remote-tracking branch 'origin/develop' into develop
2015-05-13 03:18:55 -07:00
Enno Rehling
c57907e340
setup new games defaulting to turn 0
2015-05-12 14:30:49 -07:00
Enno Rehling
0fb547f7c2
Beispiel Trolle -> Schlümpfe
...
Test des Atom Editors
2015-05-12 08:41:14 -07:00
Enno Rehling
3574d4a0b9
fix a Visual Studio /Wall warning
2015-05-12 00:12:58 -07:00
Enno Rehling
bf5fae2ef5
Fix visual studio compilation for Solthar's curse changes (float/int conversions, uninitialized variable).
2015-05-11 23:54:21 -07:00
Enno Rehling
94929be51f
Merge pull request #187 from badgerman/develop
...
Convert all XML files to UTF-8
2015-05-11 23:29:28 -07:00
Enno Rehling
a0c6bbb9aa
fix encoding conversion errors from previous commit
2015-05-11 23:20:32 -07:00
Enno Rehling
a4774be652
Convert all XML files to UTF-8, to allow editing with Atom.
2015-05-11 16:55:11 -07:00
Enno Rehling
a4de46dab5
Merge pull request #181 from stm2/missing_curse_name
...
fix crash of Analyze Magic (mantis bug 2099)
2015-05-10 19:49:57 -07:00
Enno Rehling
7f1ee527d9
Merge pull request #186 from badgerman/develop
...
newplayer script updates, small gmtool fixes
2015-05-10 14:05:39 -07:00
Enno Rehling
82d020701f
consistent naming of new players file across scripts and autoseed
2015-05-10 13:56:24 -07:00
Enno Rehling
dc0897b122
fix gmtool and setup script to match the GM guide document.
2015-05-10 13:41:48 -07:00
Enno Rehling
628af4f6ad
Merge pull request #182 from stm2/dreams_fix
...
refactoring + tests for good/bad dreams
2015-05-08 09:37:22 -07:00
Enno Rehling
ac2099aa0f
Merge pull request #185 from stm2/race_attacks
...
apply possible number of racial attacks consistently
2015-05-08 09:30:54 -07:00
Steffen Mecke
2d27442681
apply possible number of racial attacks consequently
2015-05-08 13:02:54 +02:00
Steffen Mecke
05ffb95c65
deactivated write_reports in test, because it's irritating
2015-05-07 18:28:44 +02:00
Steffen Mecke
d9f8479055
removed duplication in good/bad dreams code
2015-05-07 17:54:59 +02:00
Steffen Mecke
ca89213295
fixed mallorn curse message
2015-05-07 17:51:44 +02:00
Steffen Mecke
94ae774fed
fix spelling of spell titles
2015-05-07 17:51:43 +02:00
Steffen Mecke
9407b4c9c0
fixed crash of analyze magic
...
because of missing spell/curse description
2015-05-07 17:51:43 +02:00
Steffen Mecke
dedf9f2009
clear CURSE_ISNEW explicitly in age(), not implicitly in write/read
2015-05-07 17:51:43 +02:00
Steffen Mecke
553cf23e9e
crash more gracefully on missing description
2015-05-07 17:51:38 +02:00
Steffen Mecke
231f9bb39a
check for existence of spell descriptions
2015-05-07 13:31:19 +02:00
Steffen Mecke
22e8e39a99
check that analyze magic works
2015-05-07 13:28:37 +02:00
Steffen Mecke
b41049da53
test good/bad dreams
2015-05-06 18:15:10 +02:00
Enno Rehling
03084a7ee7
set_origin: renaming German function name to English, add a simple test for it.
2015-05-05 09:47:44 -07:00
Enno Rehling
42783ff02c
binding a magician's spellbook to Lua, with test.
2015-05-05 08:44:58 -07:00
Enno Rehling
0db74d1c09
re-enable unit spells binding to Lua, remove some TODOs from the code.
2015-05-05 08:07:20 -07:00
Enno Rehling
031826902d
Merge remote-tracking branch 'upstream/develop' into develop
2015-05-05 14:20:52 +02:00
Enno Rehling
5291b32459
new players are now read from a players.txt file
...
check for duplicates
start with better miners
2015-05-05 14:20:19 +02:00
Enno Rehling
e55c2d63bf
remove email address
...
should not put player emails in the source of this script, obfuscating to prevent misuse
2015-05-04 22:23:18 +02:00