Commit Graph

1003 Commits

Author SHA1 Message Date
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 563a08de97 Merge branch 'develop' of github.com:eressea/server into develop 2015-06-08 09:44:04 +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 29753985f7 Merge branch 'master' into release-3-5
Conflicts:
	src/laws.test.c
2015-06-08 08:50:18 +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 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 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 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 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 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 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 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 dde139f784 Merge remote-tracking branch 'upstream/develop' into develop 2015-05-21 12:04:13 +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 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 465dcf4e1c bugfix sparagraph (github issue #199).
adding tests.
2015-05-20 18:05:25 +02:00
Enno Rehling 5af69f1821 re-enable test_peasant_luck_effect, add testing for adjust_coordinates 2015-05-20 08:15:12 +02:00
Enno Rehling 32298bd50d gcc: do not error on warnings that Visual Studio doesn't know about. 2015-05-20 07:30:59 +02:00
Enno Rehling 250880f067 fix gcc warning (unused variable) 2015-05-20 07:19:50 +02:00
Enno Rehling 3a03579a65 rename set_origin/get_origin into faction.c, remove argument from adjust_coordinates. add test for bug 2070. 2015-05-19 08:27:16 +02:00
Enno Rehling e7661434e3 fix an out-of-bounds error in the new stream-based report code when centering very short headlines, refactor indentation code, add tests. 2015-05-19 08:26:44 +02:00
Enno Rehling d0f8825240 use the syntax_error function where appropriate.
fix bug w. releasing message too soon.
2015-05-18 11:34:52 +02:00
Enno Rehling dbf022b757 fix loop termination, sparagraph 2015-05-18 09:37:31 +02:00
Enno Rehling c6b4c51b0d fix endless loop bug. 2015-05-18 09:21:41 +02:00