9 commits

Author	SHA1	Message	Date
greye	7606ebafd6	resolving conflicts, minor update	2012-09-17 11:37:50 +04:00
Marc Zinnschlag	2ccd7a480d	Issue #356: added a missing return	2012-09-13 13:01:59 +02:00
Marc Zinnschlag	9de7b3bf90	Issue #356: Properly support ingredients effect in ActiveSpells (hopefully)	2012-09-13 11:30:59 +02:00
Marc Zinnschlag	fca3b67507	Issue #356: basic support for ingredients in ActiveSpells (still using the wrong formula)	2012-09-13 09:30:47 +02:00
Marc Zinnschlag	ec9ebe6b58	Merge branch 'skillgain' into potions ... Conflicts: apps/openmw/mwmechanics/activespells.cpp	2012-07-10 14:08:30 +02:00
Marc Zinnschlag	4c39fefd1e	Issue #107: World is accessed only through the interface class from now on; some include cleanup	2012-07-03 12:30:50 +02:00
Marc Zinnschlag	83c3972a89	Issue #314: added return value to addSpell function	2012-06-24 16:23:43 +02:00
Marc Zinnschlag	aa827442e8	Issue #314: Generalised ActiveSpells class so that it can handle lasting effects from potions too	2012-06-24 11:39:21 +02:00
Marc Zinnschlag	9f1919a230	Issue #256: added active spell management (completely untested)	2012-05-19 15:01:07 +02:00