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

55 Commits

Author SHA1 Message Date
Enno Rehling 7a6b237de0 Merge branch 'master' of github.com:TomBraun/server into TomBraun-master 
Conflicts:
	src/kernel/build.c
	src/kernel/item.c
 2014-06-29 20:05:44 -07:00
TomBraun 50ff812bb8 Add test Iron Golems now use the corect number of iron. 
Test also Iron Golems can now create dwarfen only items
(makes irongolems usable for dwarfs)
 2014-06-25 13:26:34 +02:00
TomBraun fa9ac186d7 Test a bug that crasehed the server 
when Stonegolems created a new building and
the whole unite was consumed during this process
(could not enter the new building as no one was left in the unit)
 2014-06-25 13:20:00 +02:00
Enno Rehling 7adb8498aa Merge branch 'fix_block_movement' of github.com:stm2/server into stm2-fix_block_movement 
Conflicts:
	scripts/tests/eressea.lua
	src/kernel/move.c
 2014-06-23 20:34:07 -07:00
Enno Rehling 24dc006e43 fix json config for terrains, some other stuff. 2014-06-13 17:36:05 -07:00
Enno Rehling 6e56c56d39 read ships from config file (only very basic) and create them in a lua test. 2014-06-13 08:28:33 -07:00
Enno Rehling d503937999 working on making json config understand ships and buildings. 
new tests in progress.
remove giveitem.c attribute, the name clashed with a trigger,
and it was only part of an arena that is gone from the game, I think.
 2014-06-12 22:14:07 -07:00
Enno Rehling 30c1b0e1ff new lua test framework, work in progress. 2014-06-12 17:41:03 -07:00
Steffen Mecke dc3eea0c70 take best unit and count amulet at most once for guards blocking movement 2014-06-04 11:04:17 +02:00
Enno Rehling 77a3dc91d5 disable test, because bug 1738 is still not fixed 2014-06-02 05:49:34 +02:00
Enno Rehling 443583a6d6 fix intermittent test for e3 building owners 2014-03-17 08:52:33 +01:00
Enno Rehling 6e3ed568ea fix lua test for blessed harvest. 2014-03-17 08:21:35 +01:00
Thomas Troeger d2267db53a - minor spelling fix. 2014-03-16 23:18:00 +01:00
Thomas Troeger 33b68ecc19 - moved test for bug 1738 to better location. 2014-03-16 23:17:48 +01:00
Enno Rehling e350b8a146 rebuild lua bindings 
fix json export
add a script to reset submodules
 2014-03-16 02:12:49 -07:00
Enno Rehling a774f882e5 fix a test that compared structs 2014-01-07 06:47:20 +01:00
Enno Rehling ca79c28eaf kill empty folder 2013-12-27 01:07:55 +01:00
Enno Rehling e378397fb4 searching for bug where owners leave castle 2012-08-03 00:52:24 -07:00
Enno Rehling d5443f88d8 laen test does not work. trying to make setresource add the raw material to fix it 2012-08-02 00:06:22 -07:00
Enno Rehling 64658bd260 fixing intermittent test 2012-07-09 08:28:08 +02:00
Enno Rehling f33226947d test was intermittent for mallorn forests 2012-07-09 07:31:34 +02:00
Enno Rehling 9abac59f4b fix soem tests that were intermittent 
use latest eressea module
 2012-07-09 04:18:08 +02:00
Enno Rehling f7edcf589a update to latest version of the eressea module 
fixes for bool type
fixes for lua 5.2
fixes for some intermittent tests
 2012-07-09 02:51:48 +02:00
Enno Rehling 619e84d0f7 make all tests use the new lua API 2012-06-17 02:59:56 +02:00
Enno Rehling ecc03a7f2c make e3 server work with new bindings library 2012-06-10 22:33:05 +02:00
Enno Rehling bff66773cf update the arda server to use submodules and new cmake layout 2012-06-07 12:44:25 -07:00
Enno Rehling 10e7f0dd72 new directory layout, all tests pass 2012-06-05 07:36:33 -07:00
Enno Rehling 4160e01787 fix this test until we support this feature again (should just fix the feature, but I need to run) 2012-05-26 10:45:15 -07:00
Enno Rehling 8ca04a02aa fix region owner when a building transfers 2012-05-26 10:43:37 -07:00
Enno Rehling 2bbcfa7e0c test this spell 2012-05-25 19:55:03 -07:00
Enno Rehling 05aba860f0 http://bugs.eressea.de/view.php?id=1855 
fixing delayed-action potions.
 2011-06-04 11:20:04 -07:00
Enno Rehling 191bd4e1b7 we never checked if building maintenance was paid (see also #1740) 2011-03-09 21:00:29 +01:00
Enno Rehling 929ee605e1 insects trying to land in glaciers should not damage ships (cf. #1729) 2011-03-09 21:00:26 +01:00
Enno Rehling c08fba8308 fix the morale test, needs to update_owners() first. 2011-03-08 21:21:11 -08:00
Enno 8e650ce4e9 an equals operator on these would be neat 2011-03-05 04:49:08 +01:00
Enno de4a69e2df fix test, cannot compare factions directly (why is that?) 2011-02-25 16:32:11 +01:00
Enno Rehling e3dbd71137 test alliance memberlist 2011-02-25 07:28:27 -08:00
Enno Rehling 1dd659ce78 vs 2010 is the new default 2011-02-19 05:13:57 -08:00
Enno Rehling 2073e8f860 http://bugs.eressea.de/view.php?id=1816 
repair snowmen (xmas 2004)
 2010-11-20 18:01:46 -08:00
Enno Rehling 7b08767aa5 * fix tests to no longer depend on certain common functions 
* decouple tests from upkeep
 2010-10-31 23:49:05 -07:00
Enno Rehling 8000b9bb2b test learning and teaching, eliminate randomness 2010-10-08 23:40:19 -07:00
Enno Rehling 21eef2159b we want to test teaching. 2010-10-05 22:12:17 -07:00
Enno Rehling cfa66a87c7 functional test of the new packice terrain 2010-09-11 20:46:46 -07:00
Enno Rehling 201ae39a4d re-enable stealth faction (anon) 2010-08-28 17:54:15 -07:00
Enno Rehling bac180afb7 No need to add the spell twice. 2010-08-08 23:38:06 -07:00
Enno 0f93601454 undo CRLF crazy 2010-08-08 09:40:42 +02:00
Enno Rehling f8094f77dc use libraries from the external folder, don't depend on any additional installations (VS 2010) 2010-08-07 22:53:41 -07:00
Enno Rehling 8713daf906 making markets more fun. 2010-04-19 23:44:36 -07:00
Enno Rehling 91c2227051 http://bugs.eressea.de/view.php?id=1756 
bugfix region owners guarding resources (test)
 2010-03-31 21:38:05 -07:00
Enno Rehling 20b915151d halfling bonus removed 
new e3 rule for dwarven castles
 2010-03-24 23:14:46 -07:00