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

77 Commits

Author SHA1 Message Date
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 483615c458 bindings for LEAVE command 2012-06-13 23:28:56 -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 6aa08b60fd more process-related bindings and tests 2012-06-10 05:28:19 -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 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
Enno Rehling 86928b5c31 disable bson dependency, nobody is using that code 2012-06-04 16:23:02 -07:00
Enno Rehling aeec7b9468 complete rewrite of cmake files 2012-06-03 18:41:07 -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 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 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 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 707262c61d fix region owner when a building transfers 2012-05-26 10:43:05 -07:00
Enno Rehling 998549e687 mages have spellbooks now 2012-05-26 08:20:26 -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 071f67ea7c use the reportpath from the config file, do not build your own 2012-05-25 18:50:14 -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 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 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 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 08adc91534 gcc 4.6 is a lot more picky about unused variables, so I shall appease it. 2012-05-20 00:16:12 -07:00
Enno Rehling 775e8edae1 as much as possible, replace the UFL_OWNER flag with checking the owner the canonical way. 2012-05-17 16:40:50 -07:00
Enno Rehling ff33af3c65 ship and building owners encapsulated in accessors 
tests added
 2012-05-17 15:23:15 -07:00
Enno Rehling d12fe2dbed begin making shipowner use ship->owner. 
fix a broken test caused by locale_string returning null.
 2012-05-17 00:13:30 -07:00
Enno Rehling ecbe770fce rename _log_error to log_error and get rid of the cumbersome #define 2012-05-16 16:52:01 -07:00
Enno Rehling 14d62afb0d rename _log_warn to log_warning and get rid of the cumbersome #define 2012-05-16 15:52:37 -07:00
Enno Rehling 53b9de957c putting the crit-bit tree to use. finding special region resources is faster this way than doing individual strcmp calls. 2012-05-14 16:36:17 -07:00
Enno Rehling 67ef4c52a3 combat spell functions have the same interface as spells now. 2012-05-09 18:28:33 -07:00
Enno Rehling 06e0d2b3b6 cleaning up castorder, unifying access to target region and caster. 2012-05-09 14:16:41 -07:00
Enno Rehling 02559f6869 refactoring castorder, because it's a bit of a mess of units, fighters, familliars and casters. 2012-05-09 13:46:10 -07:00
Enno Rehling c10e2552ad get_spellfromtoken needs a mage, not any unit. 2012-05-09 13:06:16 -07:00
Enno Rehling c22f49ec36 replace spellid_t with unsigned int 
fix finding spells by token
make magic_t an enum
 2012-05-09 03:14:54 -07:00
Enno Rehling e01c6bb8b1 make merge request sing with Eressea 
added a missing file (move_test.c)
changing the way tests are included
making some lua code prettier (too many parens)
 2011-03-08 21:06:38 -08:00
Enno Rehling 8714957a61 fixed two bugs: harbours were not unique and multiple instances of unique buildings could still be built 2011-03-09 00:28:37 +01:00
Enno Rehling b4c5607747 compiling with -pedantic on linux 2011-03-08 08:44:20 +01:00
Enno Rehling 496aa22e65 fixes for -ansi -pedantic 2011-03-07 17:29:19 +01:00
Enno Rehling 78b7dcd727 more indentation cleanup 2011-03-06 23:40:55 -08:00
Enno Rehling 791e4cd673 fix CRLF massacre 2011-03-07 08:35:23 +01:00