Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
4691 commits 10 branches 0 tags 41 MiB
Commit graph

4691 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Enno Rehling
f893ea03b6 E4 combat prototype (WIP) 2012-06-23 22:50:56 -07:00
Enno Rehling
1861268109 remove custom boolean type 
use bool when we have C99, or our own typedef for bool
 2012-06-23 22:41:07 -07:00
Enno Rehling
7359eea184 use bool type where it's available 
when using gcc, compile as C99
 2012-06-24 07:08:16 +02:00
Enno Rehling
413edd9be6 compilation fix for gcc C99 2012-06-24 06:56:42 +02:00
Enno Rehling
8987d01214 fix compilation on gcc 2012-06-24 05:09:13 +02:00
Enno Rehling
a08cb98fd2 remove unused code paths from combat code before refactoring it 2012-06-21 21:42:11 -07:00
Enno Rehling
59665de7ba binding GUARD to lua 2012-06-17 23:13:58 -07:00
Enno Rehling
64a91a75a1 bind regeneration (of health and aura) to Lua 2012-06-17 22:31:30 -07:00
Enno Rehling
e579210fec kill the eventbus, it was never used 2012-06-17 18:52:51 -07:00
Enno Rehling
1298684fd9 bind GIVE CONTROL to lua 2012-06-17 17:55:46 -07:00
Enno Rehling
648de4d36c Binding CAST, ENTER, CONTACT to Lua 2012-06-17 17:24:23 -07:00
Enno Rehling
573d4c3e97 binding HELP to Lua 2012-06-17 15:55:23 -07:00
Enno Rehling
d02857ebb9 binding COMBATSPELL to Lua 2012-06-17 12:51:48 -07:00
Enno Rehling
d880bf281a remove WAR, PEACE, JIHAD 2012-06-17 11:30:11 -07:00
Enno Rehling
1230e2b962 removing PRAY and SACRIFICE orders 2012-06-17 11:28:03 -07:00
Enno Rehling
b532673f89 remove deprecated commands 2012-06-17 20:22:01 +02:00
Enno Rehling
f11005c686 remove the XONTORMIA & WEREWOLF commands. 2012-06-17 11:08:48 -07:00