Enno Rehling
|
f27d60e1b2
|
disable force_leave code, it is too surprising
|
2015-06-18 00:01:11 +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
|
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 |
Enno Rehling
|
2967cd59cf
|
replace pushnumber with pushinteger where applicable (prep for Lua 5.3).
also kill an unreferenced string.
|
2015-06-08 20:53:40 +02:00 |
Enno Rehling
|
69a23d58c9
|
Merge pull request #222 from badgerman/feature/bug-xinclude-catalog
libxml 1.9.x problem, pickier about catalogs
|
2015-06-08 17:35:45 +02:00 |
Enno Rehling
|
3e48b9b966
|
libxml 1.9.x seems to be a bit pickier about how XML catalogs are written.
|
2015-06-08 16:51:41 +02:00 |
Enno Rehling
|
563a08de97
|
Merge branch 'develop' of github.com:eressea/server into develop
|
2015-06-08 09:44:04 +02:00 |
Enno Rehling
|
7a881885c3
|
Merge branch 'badgerman-hotfix/bug-2109-give-unit' into develop
|
2015-06-08 09:43:46 +02:00 |
Enno Rehling
|
266b019928
|
Merge branch 'hotfix/bug-2109-give-unit' of https://github.com/badgerman/eressea into badgerman-hotfix/bug-2109-give-unit
Conflicts:
scripts/eressea/xmlconf.lua
|
2015-06-08 09:43:36 +02:00 |
Enno Rehling
|
12946615e5
|
Bugfix 2109: Einheiten lassen sich nicht mehr zwischen Parteien übergeben
https://bugs.eressea.de/view.php?id=2109
Wenn max_transfers < 0 war, wurde das nur in give_men richtig interpretiert, aber nicht in give_unit.
|
2015-06-08 09:06:20 +02:00 |
Enno Rehling
|
0dd02dbf72
|
add a test for give_unit between two allied factions.
|
2015-06-08 08:57:05 +02:00 |
Enno Rehling
|
59ddbf9f11
|
fix broken merge conflict
|
2015-06-08 08:52:24 +02:00 |
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
|
e507fc948a
|
Merge pull request #218 from badgerman/develop
Fix the 'B' island generation to use the newfactions file
|
2015-06-02 17:20:33 +02:00 |
Enno Rehling
|
0de5d698de
|
Fix the 'B' island generation to use the newfactions file, for use by new GMs.
configurable island size.
|
2015-06-02 15:29:21 +02:00 |
Enno Rehling
|
c90496e60b
|
Merge pull request #217 from badgerman/develop
enable clang warning for tautological comparisons
|
2015-06-02 00:27:04 +02:00 |
Enno Rehling
|
70967fc041
|
Merge pull request #216 from badgerman/feature/issue-198
issue #198: gmtool makes invalid demand
|
2015-06-01 23:39:41 +02:00 |
Enno Rehling
|
6895195659
|
gmtool makes invalid regions (github issue #198).
forgot to null a pointer after freeing it.
|
2015-06-01 19:56:53 +02:00 |
Enno Rehling
|
80deef30b0
|
additional clang warning for tautological comparisons.
added to catch a /Wall VS warning in Travis builds.
|
2015-06-01 08:04:46 +02:00 |
Enno Rehling
|
88be8f670d
|
Merge pull request #215 from badgerman/stm2-cursefix2
testing curses with memstream
|
2015-05-31 11:30:44 +02:00 |
Enno Rehling
|
13a358005f
|
fix memstream-based tests, new storage submodule.
|
2015-05-31 11:03:44 +02:00 |
Enno Rehling
|
69821b2a32
|
cleanup battle.h header
removed some unreferenced functions from battle.h, made them static in battle.c
|
2015-05-30 17:29:01 +02:00 |
Enno Rehling
|
0497cbbdde
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2015-05-27 22:44:55 +02:00 |
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 |