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

374 Commits

Author SHA1 Message Date
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 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 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 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
Enno Rehling 347ff0dd77 snprintf is evil and dangerous. 2012-05-29 12:17:25 -07:00
Enno Rehling 330bc9c13b added slprintf and tests for the bsdstring functions 2012-05-29 10:46:48 -07:00
Enno Rehling 131efac393 add a test for f_regionid, catch missing zero-termination 2012-05-28 23:35:27 -07:00
Enno Rehling 7152ffd40f this spell school was misnamed. that's trouble. 2012-05-27 09:52:44 -07:00
Enno Rehling 131840054c giving ownerships over buildings was broken by a recent refactoring 2012-05-27 08:50:34 -07:00
Enno Rehling 36ad727394 avoid duplicate spells in spellbooks (it's a bit hackish) 2012-05-26 15:15:18 -07:00
Enno Rehling e4244f6282 Familiars and monsters should not get spells from the faction's list. 2012-05-26 14:50:00 -07:00
Enno Rehling 62a91f4558 kill tybied in E3, make common spells the source for random choices 2012-05-26 14:19:35 -07:00
Enno Rehling 2103c1725e Fix accidental parsing of empty strings (Bug 1917) 2012-05-26 12:23:22 -07:00
Enno Rehling 707262c61d fix region owner when a building transfers 2012-05-26 10:43:05 -07:00
Enno Rehling 5547893be7 fix create_roi function in E3 2012-05-26 10:16:39 -07:00
Enno Rehling 8a27917f27 we have one more famililar spell that got renamed 2012-05-26 09:57:07 -07:00
Enno Rehling da345f0cea only read spellbooks when they are specialized (familiars, monsters, E3 factions) 2012-05-26 09:38:34 -07:00
Enno Rehling 8619bd74a8 slow but working solution for getspell. rebuilding that radix tree for every call is insanity. 2012-05-26 09:05:03 -07:00
Enno Rehling 998549e687 mages have spellbooks now 2012-05-26 08:20:26 -07:00
Enno Rehling 409328a9c2 unit tests for setting combat spells 2012-05-26 07:27:59 -07:00
Enno Rehling 3b3343ae72 spells no longer have a level (or need one) 2012-05-26 00:57:13 -07:00
Enno Rehling d884446aea we do not require spell-levels in the xmlreader 2012-05-26 00:38:52 -07:00
Enno Rehling 9d1b62d463 updating spell-lists is a thing of the past now 
almost everything uses books, except sc_mage
 2012-05-26 00:33:55 -07:00
Enno Rehling c73297ba44 fix an indexing error in pick_random_spell 2012-05-25 23:47:24 -07:00
Enno Rehling 6ffe9cac33 these spells are only in the E2 and E3 source 2012-05-25 23:31:37 -07:00
Enno Rehling bc95ea80fb espionage messages will now report spellbooks 2012-05-25 23:01:21 -07:00
Enno Rehling 303dd7cc94 creport will now print spellbooks 2012-05-25 22:54:18 -07:00
Enno Rehling faa72b66b1 untangle the spaghetti a little bit 
struct spell is now in spell.h where it belongs
some functions have moved as a result
 2012-05-25 22:25:23 -07:00
Enno Rehling 8a4c71f430 unit_add_spell gets a level 
added two tests that fail for get_spellfromtoken if spell is not stored with the unit
 2012-05-25 21:49:15 -07:00
Enno Rehling a015d72add unit_add_spell gets a level 
added a test that fails for get_spellfromtoken if spell is not stored with the unit
 2012-05-25 21:07:26 -07:00
Enno Rehling d58e853074 allow setting a faction's magic school from Lua 2012-05-25 20:15:57 -07:00
Enno Rehling 24cba1bea7 testing spells in the example server also 
WIP: create_roi is broken until mages have spellbooks
 2012-05-25 19:55:47 -07:00
Enno Rehling 071f67ea7c use the reportpath from the config file, do not build your own 2012-05-25 18:50:14 -07:00
Enno Rehling fc259d232b fix spellbook entries in at_reportspell (crash) 2012-05-25 18:30:18 -07:00
Enno Rehling 58cbc3ccbc add some tests for pools, because I found a bug here and we don't want to have that happen again. 2012-05-25 16:15:21 -07:00
Enno Rehling 3b05e2e09e fix compilation on ubuntu 2012-05-25 15:40:03 -07:00
Enno Rehling fef92e4971 added more test for pay_spell so I don't break it. 2012-05-25 15:38:24 -07:00
Enno Rehling 88db0a8df7 change_resource did not return new value for some types 2012-05-25 15:35:11 -07:00
Enno Rehling ae9f12c904 added a test for pay_spell so I don't break it. 2012-05-25 12:46:00 -07:00
Enno Rehling f5b35a9a2b equipment sets that include spells now have levels on them and store in a spellbook. 
add some tests for equipment.
 2012-05-25 00:45:12 -07:00
Enno Rehling 8ecda7b203 factions have spellbooks and the read/write function for spellbooks is now accessible from other places (we'll need this for units) 2012-05-24 22:26:05 -07:00
Enno Rehling 707349d014 at_reportspell is now a message about a spellbook-entry, not just a spell 2012-05-24 22:10:18 -07:00
Enno Rehling 6cb4322c1d rename: spellbook_clear is more accurate 2012-05-24 21:57:23 -07:00
Enno Rehling b8d8bac9ae fix trying to add to null-spellbook. 
all unit tests pass.
 2012-05-24 20:35:13 -07:00
Enno Rehling 6417f55ec6 specify levels with magic attacks (step one to removing spell->level) 2012-05-24 10:24:37 -07:00
Enno Rehling 3514218dba factions have working spellbooks 
update of spellbooks for E3 should be functional
old data file is getting read, and levels guessed?
 2012-05-24 00:56:54 -07:00
Enno Rehling 9b3234a067 fix the xmlreader to not assert on invalid data 2012-05-23 21:06:19 -07:00
Enno Rehling 92e96689bb spellbooks fully operational (and could be loaded from XML definitions if I had them) 
fixed the cleanup between tests to properly free locales
 2012-05-23 20:22:12 -07:00
Enno Rehling f45a494277 new datafile version: spell names are now unique (or will be soon), and writing the magic school with each is irrelevant. 2012-05-23 15:19:40 -07:00
Enno Rehling db7ed24b3e adding spellbooks. 
spellbooks will take the level and magic school out of the spell definitions, and aggregate a list of spells with their minimum levels for learning from. factions will have a list of books they can learn from (different in E2 and E3 already).
 2012-05-23 12:42:14 -07:00
Enno Rehling eea6bdb888 comparison to boolean values is bad form. 2012-05-23 00:09:19 -07:00
Enno Rehling 22ccb5cf95 Merge branch 'master' of gitorious.org:eressea/server 2012-05-22 22:01:57 -07:00
Enno Rehling 56083b1fcf fixing something. findresourcetype, I think? 2012-05-22 22:01:48 -07:00
Enno Rehling 31e4a8432b fix find_spell and create_spell to only create each spell once. 
kill register_spell
make some critbit changes (need to transfer them upstream)
 2012-05-22 18:44:54 -07:00
Enno Rehling 1672637b17 better command line parsing 
fix compilation problem
 2012-05-22 14:53:46 -07:00
Enno Rehling 2872dfa772 Added a test that fails for Bug 1909 (findresourcetype is borken) 2012-05-21 21:39:18 -07:00
Enno Rehling 6c51013e14 Nachrichten haben keine Attribute: http://bugs.eressea.de/view.php?id=1912 2012-05-21 21:00:04 -07:00
Enno Rehling d7c2824ba9 keywords use critbits now 2012-05-21 18:09:30 -07:00
Enno Rehling ad146602c7 change the order in which TARNE arguments are checked, to handle simple cases first. 2012-05-21 17:56:27 -07:00
Enno Rehling 3394766ab9 double the buffer size for region names 2012-05-21 17:46:59 -07:00
Enno Rehling 1b038a7eaf delete wisps, or any other border that can be read but not written 2012-05-21 17:46:32 -07:00
Enno Rehling a45eb53191 findskill uses critbits now 
killing old PTRIES code
 2012-05-21 17:45:54 -07:00
Enno Rehling ad59fe96b0 buffer size was too small for some special items 2012-05-21 15:47:18 -07:00
Enno Rehling 1e9c10fbe2 finditemtype works as tested. 
starting to think about removing default_locale in lieu of a hierarchical system.
 2012-05-21 13:18:05 -07:00
Enno Rehling 5ab1b2881a This patches the failure of the test, but it is slow as heck. 2012-05-20 23:06:12 -07:00
Enno Rehling 52e323fef8 added a test that fails because of stupid static state in finditemtype 2012-05-20 23:03:16 -07:00