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

4308 Commits

Author SHA1 Message Date
Enno Rehling f19f4b3037 add an easy configuration script 
update core and cmake submodules to latest version
now using lua 5.2
now using bool where available
 2013-01-22 00:38:54 -08:00
Enno Rehling 8239c492ec update to new version of crypto library 2013-01-21 22:42:31 -08:00
Enno Rehling 3d7be88bad Working on http://bugs.eressea.de/view.php?id=1946 (WIP) 2012-10-21 19:48:40 -07:00
Enno Rehling 79feb5723c also test changing persons 2012-10-21 19:47:40 -07:00
Enno Rehling 5e58f3a881 start adding test coverage for res_changeitem 2012-10-21 18:37:51 -07:00
Enno Rehling e378397fb4 searching for bug where owners leave castle 2012-08-03 00:52:24 -07:00
Enno Rehling 0748b98c4b fix broken laen tests by hacking in another config setting 2012-08-03 00:41:27 -07:00
Enno Rehling cde0ce0742 fix broken laen tests by hacking in another config setting 2012-08-03 00:41:17 -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 1fe075e82d laen test does not work. trying to make setresource add the raw material to fix it 2012-08-02 00:06:03 -07:00
Enno Rehling 166d4ccc2c make the fighter in this test not die 2012-08-01 23:20:59 -07:00
Enno Rehling 65e5a82504 we can now compare regions, do not need to compare ids 2012-08-01 23:12:23 -07:00
Enno Rehling d056f6049e fix an intermittently segfaulting test 2012-08-02 08:09:56 +02:00
Enno Rehling 94c6709e37 fix a crash caused by an old curse 2012-07-29 00:37:44 +02:00
Enno Rehling f6b5728b49 Merge branch 'master' of github.com:eressea/core 2012-07-29 00:37:17 +02:00
Enno Rehling dbc09d35ac fix a crash caused by an old curse 2012-07-29 00:36:42 +02:00
Steffen Mecke 379e1a8f3f fix bug #1795: demon recruitment limit 2012-07-26 10:44:47 +02:00
Steffen Mecke 69a51c4b2c add message if implicit leave of building owner fails (see bug #1870) 2012-07-26 10:44:39 +02:00
Steffen Mecke f286c51862 test effect of mine (hunting bug #1926) 
test that laen is processed correctly
 2012-07-26 10:44:16 +02:00
Steffen Mecke b02f275582 fixed bug #1879: CAST should not prevent FOLLOW UNIT 2012-07-26 10:43:10 +02:00
Enno Rehling 72579b0272 Merge branch 'master' of github.com:eressea/core 2012-07-24 00:19:14 -07:00
Enno Rehling ea618453f7 bind more processing functions to Lua (almost done) 2012-07-24 00:16:25 -07:00
Enno Rehling ba328d913e math.mod is deprecated 2012-07-10 09:22:51 +02:00
Enno Rehling 64658bd260 fixing intermittent test 2012-07-09 08:28:08 +02:00
Enno Rehling 5abfaad528 fixing intermittent tests 2012-07-09 08:27:41 +02:00
Enno Rehling 3fda0ab144 added an option to disable storms from configuration files 2012-07-08 23:15:22 -07: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 366f0feeaa need to mark ships for fishing even if not drifting (this code is bad) 2012-07-08 19:15:06 -07: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 f4761867cd Merge branch 'master' of github.com:eressea/core 2012-07-09 01:25:57 +02:00
Enno Rehling cb56a820b5 fix gcc compilation 
fix broken test for duplicate orders
 2012-07-09 01:25:39 +02:00
Enno Rehling e01a420aa8 translate travel-through message 2012-07-08 16:10:48 -07:00
Enno Rehling 9af5f08a8a translate region visibility in NR 2012-07-08 16:04:45 -07:00
Enno Rehling e7f0650e4c translate diplomatic status in the NR 2012-07-08 15:59:27 -07:00
Enno Rehling 9812a8dc34 translate spell modifiers 2012-07-08 15:40:37 -07:00
Enno Rehling 7b0bdd568d fix previous commit 2012-07-08 11:44:57 -07:00
Enno Rehling d4bd2bc7f7 remove DELIVER 
translate hunger in the NR
 2012-07-08 11:37:19 -07:00
Enno Rehling 0a756efba9 Merge branch 'master' of github.com:eressea/core 
Conflicts:
	src/kernel/move_test.c
 2012-07-02 03:38:51 +02:00
Enno Rehling f3286cbd0a gcc is picky 
Conflicts:

	src/kernel/move_test.c
 2012-07-02 03:38:17 +02:00
Enno Rehling 9d8e02d094 test that movement into coastal regions is blocked when no harbor exists, unless ship is allowed in this terrain. 2012-07-01 18:00:31 -07:00
Enno Rehling c1a6d4ac03 Merge branch 'master' of github.com:eressea/core 2012-06-30 20:30:00 +02:00
Enno Rehling 5f5b4a3947 there is an old version of tolua on gelbbaer that doesn't do comparisons of 
user types. ugh.
 2012-06-30 20:29:42 +02:00
Enno Rehling 6911af02b1 moving the ally struct into a separate file, with interface and test coverage. 2012-06-30 11:07:28 -07:00
Enno Rehling d98742e4b5 Merge branch 'e4combat' 2012-06-27 20:43:39 -07:00
Enno Rehling 5e3ce7ad4d export more battle functions for e4 combat 
alliances have lists of diplomatic relations (enemies)
 2012-06-26 20:29:32 -07:00
Enno Rehling bd34cbd350 lua 5.1 and lua 5.2 side-by-side 2012-06-26 05:17:11 -07:00
Enno Rehling cb14492ccd make cmake find the best Lua version that's installed 2012-07-01 22:31:14 +02:00
Enno Rehling 3cee3d1415 lua 5.2 compat changes 2012-07-01 19:28:28 +02:00
Enno Rehling a8324f16fd make some prototypes use bool, not int 2012-06-24 08:04:12 +02:00