Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,457 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

520 Commits

Author SHA1 Message Date
Enno Rehling 99274e3ab1 make runtests.bat not crash. 
disable auto-load of config.lua (sob).
free messages and config in config.reset().
 2017-01-23 21:35:01 +01:00
Enno Rehling 6d9d920f81 fix issue #477 (intermittent volcano) 2017-01-23 11:45:05 +01:00
Enno Rehling 94fcef2fac the locales module is deprecated. 
let's do this in custom.lua from now on.
 2017-01-22 19:32:03 +01:00
Enno Rehling f09259f2b3 eliminate duplicate password message 2017-01-22 18:51:20 +01:00
Enno Rehling 2c38883362 configure dbname in eressea.ini (or don't use DB if not 2017-01-22 13:09:32 +01:00
Enno Rehling 8d4a83d1b4 make these modules optional 2017-01-22 11:38:01 +01:00
Enno Rehling d29fd96f59 no starting equipment. 
do not let the addplayer function give equipment.
rename equipment for autoseed.
 2017-01-22 08:05:19 +01:00
Enno Rehling 31b3f2b2de remove Umlaut from Lua script 2016-12-10 16:22:57 +01:00
Enno Rehling 14b4ae5859 set volcano acitvation chance to 0 during test. 
should fix issue #606 for good.
also: additional tests for renumbering ships, Xolgrim is wrong.
 2016-11-18 22:31:06 +01:00
Enno Rehling ecbd0ba83c github issue #606 
disable volcano terrain change for snowglobe test
 2016-11-18 13:30:30 +01:00
Enno Rehling 251c7bb559 re-enable snowglobe assert. 2016-11-16 19:43:06 +01:00
Enno Rehling 17365edff7 move renumber command to a separate module. 2016-11-15 23:34:20 +01:00
Enno Rehling 92d027014a Make runtests more verbose in case of errors. 
Eliminate stray ERROR messages from tests.
 2016-10-31 20:36:05 +01:00
Enno Rehling a285bd332c fix lua tests to not expect numeric values for unit.guard 2016-10-31 20:12:19 +01:00
Enno Rehling 182cecf31b fix tests that use leveled resources. 2016-10-30 19:27:00 +01:00
Enno Rehling 59c8fbc5a5 fix bad Lua test for ents, so they actually guard. 2016-10-29 17:51:01 +02:00
Enno Rehling f17b6f2bb5 WIP: additional testing for GUARD. 
BUG: ents cannot guard, do not protect trees.
FIX: issue #589 (bad test for stardust)
 2016-10-28 20:26:34 +02:00
Enno Rehling e0a6618199 WIP: test production guarding. 
ents are not working, because they rely on being part of the monster faction? bad!
 2016-10-28 19:42:47 +02:00
Enno Rehling 5a129f8bd4 Create the snowman with full hitpoints. 
https://bugs.eressea.de/view.php?id=2239
 2016-10-02 11:42:31 +02:00
Enno Rehling 7ef316f773 Merge branch 'develop' into kill-seen-region 2016-09-18 13:42:32 +02:00
Enno Rehling 18fcba3ed6 failing test for a new bug: empty dummy units get stuck in faction.units after recruiting. 2016-09-18 11:14:00 +02:00
Enno Rehling ac8332c896 re-enable report tests. 
RF_LIGHTHOUSE also flags for lighthouses with size 0.
 2016-09-18 10:24:08 +02:00
Enno Rehling 929db73102 disable integration tests 
combine prepare_ functions
 2016-09-14 17:14:04 +02:00
Enno Rehling 576f183afb separate tests.report module (lua) 
disable all report testing for now
 2016-09-14 17:04:23 +02:00
Enno Rehling 452614307d require at least 2K peasants in starting regions 2016-09-11 21:27:46 +02:00
Enno Rehling 2294de44c2 accidental duplicate close. 2016-09-11 20:14:19 +02:00
Enno Rehling f926d89929 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-09-11 20:10:01 +02:00
Enno Rehling fdb5ecc68b always call close() in lua when you're done with a file. 2016-09-11 19:32:54 +02:00
Enno Rehling c21ecba8dd always call close() in lua when you're done with a file. 2016-09-11 19:28:25 +02:00
Enno Rehling 0124bafdc4 delete dead code 2016-09-11 16:44:35 +02:00
Enno Rehling 9c92582b3a Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2016-09-08 20:37:03 +02:00
Enno Rehling 544af40981 fix seeding new factions 2016-09-08 20:34:25 +02:00
Enno Rehling 02374cd492 fix intermittent piracy test. 
https://bugs.eressea.de/view.php?id=2233
 2016-09-02 09:09:55 +02:00
Enno Rehling 1ef8049668 adding Solthar's test to show that the bug exists 2016-08-19 18:22:38 +02:00
Enno Rehling ecffed0577 verify data after deleting planes, do not delete plane 50 (yet) 2016-08-18 19:11:26 +02:00
Enno Rehling e5f5dc6aa4 fail when there are borders that can't be read because their endpoints are missing 2016-08-18 19:11:10 +02:00
Enno Rehling a3ff8781c4 setting herbs will warn if they are the wrong herbs. 
planes can be erased.
add a script that erases unused planes from E2.
 2016-08-18 19:04:48 +02:00
Enno Rehling 6aebb12fd5 Fix duplicate market effect. 
https://bugs.eressea.de/view.php?id=2225
The Lua markets module is wrong, so the C code is being used.
Disable the Lua module for now, either fix or delete it later?
 2016-08-06 21:51:31 +02:00
Enno Rehling 3ea33c6895 repair magic item: stardust 
https://bugs.eressea.de/view.php?id=2226
 2016-08-06 18:16:50 +02:00
Enno Rehling 0a9cbc308b Merge pull request #523 from ennorehling/feature/bug-2207 
fix seeding new players (bug 2207)
 2016-07-30 22:54:51 +02:00
Enno Rehling eebdcf5d93 control log level from command line (with -l, like -v) 
make newplayer.lua use the autoseed module, eliminate duplication
seeding new players is broken

Conflicts:
	src/gmtool.c
	src/main.c
	src/util/log.c
	src/util/log.h
 2016-07-30 22:46:57 +02:00
Enno Rehling eb57473af5 slightly relax limits on quality for new player regions 2016-07-30 22:01:24 +02:00
Enno Rehling f2c02232cd http://bugs.eressea.de/view.php?id=2207 
check that there are any regions that we can seed new factions into
don't run into endless loop
 2016-07-30 22:01:10 +02:00
Enno Rehling 31feeecbd8 logging and fixing of live data for bug 2221 
additional lua test that failed to find the issue
https://bugs.eressea.de/view.php?id=2221
 2016-07-30 21:13:42 +02:00
Enno Rehling e6aec1dde4 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2016-05-17 15:47:21 +02:00
Enno Rehling b5a84f07ba release version 3.8.11 
- disable autoseed (endless loop)
 2016-05-17 15:46:14 +02:00
Enno Rehling 21ee84dc65 autoseed barfs on blank lines, catch that case 2016-05-15 10:35:23 +02:00
Enno Rehling 65a163b4d9 do not seed new factions if there isn't a minimum number of them 2016-05-05 13:51:31 +02:00
Enno Rehling 75f2be75d8 remove code for alp (non-functional) 
remove code for removecurse trigger (only used by alp)
 2016-03-25 21:18:57 +01:00
Steffen Mecke 11b8d85167 fixed reversed logic for demon peasant hunger (bug 2187) 
renamed config variable hunger.demons to hunger.demons.peasant_tolerance and reversed reversed logic in upkeep.c
 2016-02-28 16:15:48 +01:00
Steffen Mecke aa3397a24f reduced report directory spam 2016-02-28 16:15:47 +01:00
Enno Rehling b0be24245b disable intermittent test. see issue #477 2016-02-13 22:21:34 +01:00
Enno Rehling 88f3a46142 generate htpasswd files, understand apr1 hashes in confirmation script 2016-02-10 14:12:38 +01:00
Enno Rehling b6b452c77b Make this error a warning instead, Eternath is over. 
Disable Eternath in E2.
 2016-01-24 11:07:07 +01:00
Enno Rehling c2e837e826 deprecated module, turn error into warning 2016-01-21 12:34:55 +01:00
Enno Rehling ae0206652e passwords are write-only, cannot read them in tests 2016-01-12 07:25:57 +01:00
Enno Rehling 4f7b274bf6 Merge branch 'master' into develop 
Conflicts:
	res/core/messages.xml
	src/buildno.h
 2016-01-01 16:38:57 +01:00
Enno Rehling 25966b3d7f add tests for snowglobe error messages 2016-01-01 16:30:09 +01:00
Enno Rehling 4952f212b8 snowglobe error messages. todo: testing (how?) 2015-12-31 14:43:38 +01:00
Enno Rehling e1f3b3cdcf passing order object into lua use-functions, so we can use them in error messages. 2015-12-30 21:20:59 +01:00
Enno Rehling 2aafb841a5 Merge branch 'master' into develop 
Conflicts:
	res/core/messages.xml
	scripts/eressea/e3/init.lua
	scripts/eressea/xmas.lua
	scripts/eressea/xmasitems.lua
	src/buildno.h
	src/laws.c
 2015-12-26 14:46:20 +01:00
Enno Rehling d9588fb7fb no snowglobe in E3 
include xmas tests in tests/e2, not in run-tests files
 2015-12-26 11:20:37 +01:00
Enno Rehling b66b6f7f4c testing christmas items, removing old xmas scripts 2015-12-22 19:33:44 +01:00
Enno Rehling e678c1bcce disable snowglobe test, because we are not ready yet 2015-12-22 18:49:11 +01:00
Enno Rehling cf90f8cf93 it's beginning to look a lot like christmas 
Conflicts:
	scripts/eressea/xmas.lua
 2015-12-22 18:46:57 +01:00
Enno Rehling 80e0707cb2 snowglobe transformations for several trerrains. messages still TBD 2015-12-22 18:46:45 +01:00
Enno Rehling 3fd4884584 putting all of the pieces together for the snow globe, with final use implementation still TBD 
Conflicts:
	scripts/eressea/xmasitems.lua
	src/laws.c
 2015-12-22 18:46:42 +01:00
Enno Rehling 55c15c1905 add a lua binding to convert user-language strings to directions 2015-12-22 18:38:12 +01:00
Enno Rehling 810ad094af suppress misc warnings in the log file by reorganizing E3 strings and tuning down log levels 2015-12-18 15:13:15 +01:00
Enno Rehling 78c13d3ca2 bugfix dupe message 
http://bugs.eressea.de/view.php?id=2178
 2015-12-12 21:34:56 +01:00
Enno Rehling f747b4ee05 Merge remote-tracking branch 'upstream/develop' into develop 2015-12-05 18:34:59 +01:00
Enno Rehling 02c249d61e fix not giving christmas trees 
https://bugs.eressea.de/view.php?id=2171
 2015-12-05 17:33:41 +01:00
Enno Rehling 3e048e2a84 Merge branch 'bug_2139' of https://github.com/stm2/server into stm2-bug_2139 
Conflicts:
	scripts/tests/e3/castles.lua
	scripts/tests/e3/rules.lua
 2015-12-03 11:06:55 +01:00
Enno Rehling 097ff40823 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2015-11-26 21:13:24 +01:00
Enno Rehling 8cf62ee236 merge the various Christmas modules into one file, make them trigger on a turn, reduce spam 2015-11-26 21:13:01 +01:00
Enno Rehling 0410581907 Merge branch 'market_tests' of https://github.com/stm2/server into stm2-market_tests 
Conflicts:
	src/move.test.c
	src/study.c
 2015-11-26 18:42:23 +01:00
Enno Rehling ef7b252260 fix intermittent test 2015-11-16 14:34:18 +01:00
Enno Rehling d91c9fb880 fix intermittent test 2015-11-16 14:31:53 +01:00
Steffen Mecke dcca3f1424 test and fix for market operation, bug2083 
http://bugs.eressea.de/view.php?id=2083
 2015-11-16 01:13:01 +01:00
Steffen Mecke e2b56cd04a fix morale change when region owner changes 
http://bugs.eressea.de/view.php?id=2139
 2015-11-12 16:09:26 +01:00
Enno Rehling e9ed30f9db Merge pull request #377 from ennorehling/develop 
Bug 2152: Parteitarnung
 2015-11-09 16:30:57 +01:00
Enno Rehling b43a89e4ec fixing TARNE PARTEI NUMMER tests 2015-11-09 14:17:12 +01:00
Enno Rehling 46bc0eb620 some tests don't belong in Lua 2015-11-09 14:06:55 +01:00
Enno Rehling 43ab9e3304 Merge pull request #372 from TurnerSE/bug/#1859 
Scheint ja zu funktionieren? Wenn etwas anderes kaputt geht, dann hat das nicht genug Tests, das ist auch eine Lehre. Und noch ist ja Zeit zum Release, um das zu merken.
 2015-11-07 19:21:16 +01:00
Philipp Dreher 4f5a02a1a3 new lua-test for castle-stages 
(Messed up the previous commit)
New lua-test for the behaviour concerning the castle-stages and their
min-skills. (Bug 1859)
 2015-11-06 20:59:45 +01:00
Philipp Dreher b0a986e155 Revert "added a lua-test" 
This reverts commit a452ad1517.
 2015-11-06 20:57:19 +01:00
Philipp Dreher a452ad1517 added a lua-test 
New lua-test for the bug concerning the minskill for castle-stages.
(#1859)
 2015-11-06 20:53:10 +01:00
Enno Rehling c9f886078b CID 22452 'Constant' variable guards dead code 
github issue #353 there is no a_fshidden attribute.
 2015-11-04 19:08:45 +01:00
Enno Rehling d4ff807c20 Merge pull request #364 from ennorehling/coverity-fixes 
several smaller coverity fixes
 2015-11-04 11:04:32 +01:00
Enno Rehling 024e4c45ca fix a bug introduced by f78fe842 (CID 22443) 2015-11-04 10:40:53 +01:00
Enno Rehling c57668e6ee failing test for newly discovered storage problems 2015-11-04 09:48:51 +01:00
Enno Rehling 1993e5e384 Merge branch 'master' into develop 2015-11-04 09:05:04 +01:00
Enno Rehling 1c85f0e1de fix scripting bug in new autoseed module 2015-11-04 08:56:31 +01:00
Enno Rehling 5bcc0699a1 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2015-11-03 12:29:55 +01:00
Enno Rehling 451303d7d3 autoseed as a module for E2 
made from pieces of newplayer.lua and populate.lua
 2015-11-03 11:54:08 +01:00
Enno Rehling 936c201d0b Merge pull request #312 from eressea/master 
pull latest changes from master into develop
 2015-10-11 16:47:29 +02:00
Enno Rehling a3c843f90d clean up after tests 
update runtests.bat script for windows development in VS2015
 2015-10-11 14:57:35 +02:00
Enno Rehling a795226368 just a script for fixing broken familiar links between releases 2015-09-15 17:43:22 +02:00
Enno Rehling 47c48d2985 Merge branch 'master' into develop 2015-09-12 22:27:14 +02:00
Enno Rehling 871373a0e5 be less verbose about cursing 2015-09-12 22:26:54 +02:00
Enno Rehling a01955e06a disable features by name that are not keywords 2015-09-12 17:37:29 +02:00
Enno Rehling bd1b568da2 Präfix Erz 2015-09-12 14:13:45 +02:00
Enno Rehling 42f1030251 separate test script for E4: 
even though it has mostly the same rules, it does not have xmastrees, and loads a different config
remove dead `inactivefaction` function, we have no use for the file it creates.
 2015-09-12 14:10:08 +02:00
Enno Rehling 3003b7fc61 remove prefixes from E3 
move prefix test to common.lua
 2015-09-12 13:37:43 +02:00
Enno Rehling 767ef13722 add a functional test for prefixes in E2 before refactoring any of that code. 2015-09-12 12:05:38 +02:00
Enno Rehling cf08cdf3fb configuration type-fixes: int to bool where appropriate (possibly incomplete) 
rename some rules to make it more obvious that they are flags or other integer values.
 2015-09-11 10:04:08 +02:00
Enno Rehling 1a9dd531c5 use boolean values in E2 config. 
add a runtests.bat file for windows developers.
make some tests clean up after themselves (os.remove on files they create).
 2015-09-11 09:34:38 +02:00
Enno Rehling 9bb2a625f9 fix xmlreader bug introduced by last commit (xpath->node not initialized) 2015-09-11 09:10:00 +02:00
Enno Rehling 34580ab9fa fix test requiring a data directory (sigsegv) 2015-09-06 20:07:15 +02:00
Enno Rehling b33babd316 fix cursed factions (broke it during bit32 changes) 2015-09-06 13:20:37 +02:00
Enno Rehling 552f32ff97 bugfix https://bugs.eressea.de/view.php?id=2133 
era in the CR is wrong for E2
build in the CR should be a string (did not have quotes)
Lua < 5.2 does not have bit32 (and Windows build uses 5.1)
 2015-09-04 14:39:44 +02:00
Enno Rehling f0a9cc8233 added a lua module that marks factions as cursed 2015-08-31 12:50:58 +02:00
Enno Rehling f12454870f fix segfault, disable intermittent test 2015-08-20 16:17:19 +02:00
Enno Rehling 5537f0ac68 simple and basic tests for ships 2015-08-07 13:03:19 +02:00
Enno Rehling d1b638f9b1 Merge branch 'feature/test-world' of https://github.com/ennorehling/eressea into ennorehling-feature/test-world 
Conflicts:
	scripts/tests/e2/init.lua
	scripts/tests/e3/init.lua
 2015-08-07 00:16:32 +02:00
Enno Rehling 3081a89f1c Merge branch 'develop' of github.com:ennorehling/eressea into develop 2015-08-06 19:17:00 +02:00
Enno Rehling 397a157fdc Merge branch 'develop' into feature/bug-1588-magicpower-limit 
Conflicts:
	scripts/tests/e2/init.lua
	src/battle.c
	src/bind_unit.c
	src/kernel/spellid.h
	src/magic.c
	src/magic.h
 2015-08-06 19:16:05 +02:00
Enno Rehling b8a2b9d0b7 Merge pull request #7 from ennorehling/feature/bug-2101-study-teach-testing 
bug 2101: increase max printed length of orders
 2015-08-06 17:05:32 +02:00
Enno Rehling 420574c7e4 add unit-test for casting spells, fix spell-casting (was looking for thisorder), all E3 tests pass again 2015-08-05 10:25:25 +02:00
Enno Rehling 4d061d8592 repair update_long_order and K_DESTROY handling according to discussion in https://bugs.eressea.de/view.php?id=2080 2015-08-04 22:47:55 +02:00
Enno Rehling 802f8b08d6 try setting origin manually 2015-07-31 14:10:30 +02:00
Enno Rehling 51fc6680dd require trees for new player regions 2015-07-28 10:51:14 +02:00
Enno Rehling a31dd95de0 give the first unit a sword, set skills from the equipment-config, not script 
make the preview link use a soft-link, not calculate the build-directory again.
 2015-07-19 20:07:08 +02:00
Enno Rehling 38ecf783c2 ignore comments 2015-07-12 16:16:57 +02:00
Enno Rehling 083c848db1 merge with latest hotfix 2015-07-12 04:53:10 +02:00
Enno Rehling 6d4f05fad8 quicklist updates 2015-07-11 12:48:03 +02:00
Enno Rehling f1217ed7a9 Bug 1965: verify that buildings cannot be built on packice. 2015-07-08 16:11:25 +02:00
Enno Rehling cc3c5580d4 rewrite and unit tests 2015-07-07 20:23:24 +02:00
Enno Rehling c1ba6a99e3 add a holy ground curse to all new starting regions. 2015-07-05 18:45:15 +02:00
Enno Rehling 7906d4469d return to old mechanism of equipping the first unit, and give some basic necessities to special races. 2015-07-05 16:40:49 +02:00
Enno Rehling 6672251b2d fewer units for new players, two players per region 2015-07-05 16:03:04 +02:00
Enno Rehling 3074a6077d avoid monsters: only seed new factions in hexes that have no units nearby. 2015-07-05 15:24:06 +02:00
Enno Rehling 9185b2af28 simplify test setup: as long as all games have nmr.removenewbie set to off by their config, no test should need to disable it. 2015-07-05 15:23:54 +02:00
Enno Rehling 89ea0b9946 simplify test setup: as long as all games have nmr.removenewbie set to off by their config, no test should need to disable it. 2015-07-05 14:16:17 +02:00
Enno Rehling 03a8c6a89f avoid monsters: only seed new factions in hexes that have no units nearby. 2015-07-05 14:08:06 +02:00
Enno Rehling b2d981e577 improved tests for DESTROY, fix destroy-after-attack 2015-07-03 13:08:06 +02:00
Enno Rehling 37eb189cd0 Merge pull request #242 from badgerman/feature/bug-2080-move-after-destroy 
bug 2080: long actions after DESTROY
 2015-07-02 11:58:12 +02:00
Enno Rehling fc2b8f3471 bug 2080: long actions after DESTROY 
https://bugs.eressea.de/view.php?id=2080
we forgot to set the flags. also added a test for the future.
 2015-07-02 11:42:18 +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 258f3c37c0 add test coverage for bug report 2094 (prove that it is invalid) 2015-07-02 08:55:05 +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 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 b7b20bdec6 fewer units for new players, two players per region 2015-06-26 14:19:36 +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 6e9f889e77 Merge branch 'master' of github.com:eressea/server 
Conflicts:
	src/laws.test.c
 2015-06-08 08:47:36 +02:00
Enno Rehling b8de887399 change log level from warn->info 2015-05-24 16:21:12 +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