Enno Rehling
f3286cbd0a
gcc is picky
...
Conflicts:
src/kernel/move_test.c
2012-07-02 03:38:17 +02: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
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
f11005c686
remove the XONTORMIA & WEREWOLF commands.
2012-06-17 11:08:48 -07:00
Enno Rehling
1b24f14da0
typo fix
2012-06-16 23:39:03 -07:00
Enno Rehling
9124fe2c6d
added promote, renumber, restack to eressea.process interface
...
fixed a test that relied on no random skill progress
2012-06-16 23:31:25 -07:00
Enno Rehling
a662f88868
kill the RESTART order
...
make more parts of process_order their own function
started writing process_order in Lua, to see how far I've gotten
fix a bug in the logging library
2012-06-16 22:38:44 -07:00
Enno Rehling
abca123b76
Merge branch 'master' of github.com:eressea/core
...
Conflicts:
src/bindings/bindings.c
2012-06-16 19:24:56 -07:00
Enno Rehling
7618dc588d
better handling of missing entry points
2012-06-16 19:23:45 -07:00
Enno Rehling
c98612f44e
adding battle and siege to the eressea.process module
2012-06-16 19:14:23 -07:00
Enno Rehling
527d6c8bf9
Merge branch 'master' of github.com:eressea/core
2012-06-16 09:17:51 -07:00
Enno Rehling
8dee09b088
reduce warnings
2012-06-16 09:17:29 -07:00
Enno Rehling
483615c458
bindings for LEAVE command
2012-06-13 23:28:56 -07:00
Enno Rehling
09800b8387
moving things into laws.c, where a lot of order processing happens now.
2012-06-13 23:25:20 -07:00
Enno Rehling
d38c5f5cfb
fix production of items in produce()
...
add use, move and study/teach to bindings
2012-06-12 22:36:29 -07:00
Enno Rehling
77575bad89
remove bson dependency
2012-06-11 22:24:50 -07:00
Enno Rehling
a093f782d9
Merge branch 'master' of github.com:eressea/core
2012-06-10 05:28:38 -07:00
Enno Rehling
6aa08b60fd
more process-related bindings and tests
2012-06-10 05:28:19 -07:00
Enno Rehling
457c111da2
order of commands needs to be altered so bindings get the correct
...
include directory.
2012-06-07 12:43:37 -07:00
Enno Rehling
e23016f0f0
killing old MSVC project files
2012-06-07 12:26:27 -07:00
Enno Rehling
dafb2fc2ab
adding a lot of test coverage
...
extending the binding generation to more processing functions
2012-06-07 09:47:02 -07:00
Enno Rehling
d2cee21af5
include headers for MSVC
2012-06-06 20:33:15 -07:00
Enno Rehling
8b3d735e8c
Begin of massive changes to the Lua API.
...
Everything will live in a single eressea module now, and the global
namespace will no longer be polluted by all kinds of modules and
functions.
Also new: Bindings will be generated by tolua from .pkg files,
starting with settings, eressea (read/write/free_game) and process in
this commit.
2012-06-06 19:29:36 -07:00
Enno Rehling
8327db65b8
I have a slightly broken version of tolua installed which doesn't compare
...
user types. Working around that bug by comparing integers instead. Sigh.
2012-06-09 09:18:17 +02:00
Enno Rehling
2292c61601
small changes from code-review
2012-06-09 09:06:59 +02:00
Steffen Mecke
9d58f65404
fixed bug #1875 : demons use their own peasantblood before other unit's
2012-06-09 00:13:13 +02:00
Gerd Wellenreuther
74ddb1f881
Bugfix 1922 entering of RF_BLOCKED regions with ships
2012-06-07 21:06:14 +02:00
Enno Rehling
2bf3c840ae
beware: new directory layout, new server
2012-06-05 07:36:05 -07:00
Enno Rehling
6b57791acb
add another core type to the list
2012-06-04 21:43:28 -07:00
Enno Rehling
a6785c6b7b
have the bson-attrib tests all in one place so we can choose not to use them
2012-06-05 05:14:24 +02:00
Enno Rehling
86928b5c31
disable bson dependency, nobody is using that code
2012-06-04 16:23:02 -07:00