Marc Zinnschlag 75f64aa38b Merge branch 'master' into dialogue ...

Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
	apps/openmw/mwmechanics/npcstats.cpp
	apps/openmw/mwmechanics/npcstats.hpp

2012-11-10 15:44:44 +01:00

..

activespells.cpp

applying new interface vol.2, inconsistent

2012-11-05 21:19:22 +04:00

activespells.hpp

Issue #356: Properly support ingredients effect in ActiveSpells (hopefully)

2012-09-13 11:30:59 +02:00

actors.cpp

applying new interface vol.2, inconsistent

2012-11-05 21:19:22 +04:00

actors.hpp

Issue #68: added getdeadcount script function

2012-10-27 11:33:18 +02:00

aipackage.cpp

Issue #389: added AI package base class and AI packages management class

2012-09-04 13:25:53 +02:00

aipackage.hpp

Issue #389: added AI package base class and AI packages management class

2012-09-04 13:25:53 +02:00

aisequence.cpp

Issue #389: added AI package base class and AI packages management class

2012-09-04 13:25:53 +02:00

aisequence.hpp

Issue #389: added AI package base class and AI packages management class

2012-09-04 13:25:53 +02:00

alchemy.cpp

update MWBase::World interface since records contains own id

2012-11-08 01:52:34 +04:00

alchemy.hpp

Issue #61: fixed alchemy skill

2012-10-28 14:07:36 +01:00

creaturestats.cpp

Issue #219: added various creature and NPC stats; implemented respective filters

2012-11-10 13:21:38 +01:00

creaturestats.hpp

Issue #219: added various creature and NPC stats; implemented respective filters

2012-11-10 13:21:38 +01:00

drawstate.hpp

disabling gcc extensions

2012-10-09 17:10:25 +02:00

magiceffects.cpp

resolving conflicts, minor update

2012-09-17 11:37:50 +04:00

magiceffects.hpp

Issue #256: fixed a capitalisation mistake

2012-05-18 15:26:08 +02:00

mechanicsmanagerimp.cpp

Merge branch 'master' into dialogue

2012-11-10 15:44:44 +01:00

mechanicsmanagerimp.hpp

Merge remote-tracking branch 'scrawl/persuasion' into next

2012-11-10 14:59:52 +01:00

movement.hpp

adding up and down move buttons

2012-03-24 22:03:08 -04:00

npcstats.cpp

Merge branch 'master' into dialogue

2012-11-10 15:44:44 +01:00

npcstats.hpp

Merge branch 'master' into dialogue

2012-11-10 15:44:44 +01:00

spells.cpp

disease tests

2012-11-09 18:16:29 +01:00

spells.hpp

disease tests

2012-11-09 18:16:29 +01:00

spellsuccess.hpp

new interface in manualref, fix various typos

2012-11-06 13:43:48 +04:00

stat.hpp

Issue #342: handle magic effects 79-82 and 17-20

2012-07-17 15:49:37 +02:00