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

353 commits

This branch
This branch
All branches
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
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
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
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
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
Enno Rehling
ee456c49b1 building new cmake files for the core (WIP) 
fixing a missign header in bsdstring.h (need size_t)
 2012-06-03 11:59:21 -07:00
Enno Rehling
533c267b9a Fixed a bug where a missing resource in E3 would crash the server 2012-06-02 12:49:48 -07:00
Enno Rehling
578334f2d0 fix a warning about %u not being the right format for size_t 2012-06-02 10:44:37 -07:00
Enno Rehling
29cb6f2c7c Getting ready to build on VS2010 again. I still have to figure out a better way to include and build dependencies that are installed on most Linux systems. 2012-06-01 21:09:11 -07:00
Enno Rehling
ab15f24241 fix some compilation issues 2012-06-01 18:05:07 -07:00
Enno Rehling
d940444751 license file 2012-06-01 16:36:50 -07:00
Enno Rehling
db094810fd removing quicklist, importing it from a submodule 2012-05-30 19:55:17 -07:00
Enno Rehling
6e106c9fc0 out with the old critbit code, in with the new (submodule) 2012-05-30 19:43:11 -07:00
Enno Rehling
9f2e1d475b Moving some things around in the external directory. 
I am deliberately breaking the VS2010 projects with this.
I am probably breaking the Eressea server.
 2012-05-30 19:17:08 -07:00
Enno Rehling
af7d059834 Merge branch 'master' of gitorious.org:eressea/server 2012-05-30 08:14:19 +02:00
Enno Rehling
46d02cf226 Merge branch 'release-774' 
Conflicts:
	shared/src/gamecode/market_test.c
	shared/src/kernel/item.c
	shared/src/kernel/item_test.c
	shared/src/tests.c
	shared/src/tests_test.c
 2012-05-30 08:12:46 +02:00
Enno Rehling
3e67e7fb4e Lua unit:cast_spell should only cast spells the unit knows. 
do not allow payment for spells cast at level <= 0
 2012-05-29 20:58:33 -07:00
Enno Rehling
44e5c60c96 test added: when a spell is not found, we do not have to pay for it 2012-05-29 20:44:25 -07:00
Enno Rehling
5e26d246a2 more Lua functions using the wrong stack index. 2012-05-29 20:13:54 -07:00
Enno Rehling
cb0e406733 repair lua spells (bad stack index) 
add a whole bunch more spell tests
allow spell tests to disable fumbles
 2012-05-29 18:45:50 -07:00