Commit Graph

4288 Commits

Author SHA1 Message Date
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 619e84d0f7 make all tests use the new lua API 2012-06-17 02:59:56 +02:00
Enno Rehling 3f2e46c008 use new eressea module functions 2012-06-17 02:54:05 +02: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 ecc03a7f2c make e3 server work with new bindings library 2012-06-10 22:33:05 +02:00
Enno Rehling 56d889c0ce submodule update to latest source 2012-06-10 22:23:21 +02: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 e41f0cb023 use the read-only versions of git submodules
write-access is available for developers only
2012-06-10 03:07:28 -07:00
Enno Rehling caa3f7e862 using bugfixes from the e4 server in e3 2012-06-09 09:21:28 +02:00
Enno Rehling 9e59d4dc50 use current eressea master 2012-06-08 09:08:03 +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 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 64cfce1a75 new submodules added to e3 server 2012-06-07 06:46:19 +02: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 10e7f0dd72 new directory layout, all tests pass 2012-06-05 07:36:33 -07:00
Enno Rehling 2bf3c840ae beware: new directory layout, new server 2012-06-05 07:36:05 -07:00
Enno Rehling 4e7a758a75 making server compile with new github repository layout
todo: fix scripts and config files
2012-06-04 21:45:25 -07:00
Enno Rehling 6b57791acb add another core type to the list 2012-06-04 21:43:28 -07:00
Enno Rehling 21ba523503 now using submodules 2012-06-04 21:08:32 -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
Enno Rehling c44ebad24e missing include files 2012-06-04 02:41:07 -07:00
Enno Rehling ac5c892c52 hammering these makefiles until everything works 2012-06-04 02:35:56 -07:00
Enno Rehling bc8ae48cc9 Make this stuff compile on MSVC 2012-06-03 23:39:32 -07:00
Enno Rehling dd30c9a621 Make this stuff compile on MSVC
Fix some missing headers
I have to redo the tests
2012-06-03 23:36:40 -07:00
Enno Rehling a5a92fc9b4 disable MSVC warnings with a macro 2012-06-03 22:32:59 -07:00
Enno Rehling 6ae4f5a646 Merge branch 'master' of github.com:eressea/core 2012-06-03 20:44:11 -07:00
Enno Rehling 0eae68f34e fix compilation on ARM (differnt char type) 2012-06-04 03:41:34 +00:00
Enno Rehling 9f04f80f45 stop comlaints about missing C++ compiler
fix directory
2012-06-03 20:07:51 -07:00
Enno Rehling 5b06f5d2c8 complete rewrite of cmake files 2012-06-03 18:56:30 -07:00
Enno Rehling 8c5c6aa911 complete rewrite of cmake files 2012-06-03 18:55:52 -07:00
Enno Rehling 7de08fbd8f complete rewrite of cmake files 2012-06-03 18:47:43 -07:00
Enno Rehling aeec7b9468 complete rewrite of cmake files 2012-06-03 18:41:07 -07:00
Enno Rehling a928c6b45c cmake configuration for gamecode 2012-06-03 13:39:42 -07:00
Enno Rehling 5cba331ad3 cmake files for uil and kernel
fixing a bunch of files that do not compile on their own
2012-06-03 12:51:35 -07:00