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

401 Commits

Author SHA1 Message Date
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