Marc Zinnschlag d42747e85b Merge branch 'master' into dialogue ...

Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/creature.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp

2010-08-06 19:20:05 +02:00

..

activator.cpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

activator.hpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

apparatus.cpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

apparatus.hpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

armor.cpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

armor.hpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

book.cpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

book.hpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

classes.cpp

added missing record classes

2010-08-03 15:24:44 +02:00

classes.hpp

moved concrete record classes to separate sub-system (mwclass)

2010-08-03 13:17:31 +02:00

clothing.cpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

clothing.hpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

container.cpp

Merge branch 'master' into container

2010-08-06 14:37:53 +02:00

container.hpp

Merge branch 'master' into container

2010-08-06 14:37:53 +02:00

creature.cpp

Merge branch 'master' into dialogue

2010-08-06 19:20:05 +02:00

creature.hpp

Merge branch 'master' into dialogue

2010-08-06 19:20:05 +02:00

creaturelevlist.cpp

added getName function

2010-08-03 17:11:41 +02:00

creaturelevlist.hpp

added getName function

2010-08-03 17:11:41 +02:00

door.cpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

door.hpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

ingredient.cpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

ingredient.hpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

itemlevlist.cpp

added getName function

2010-08-03 17:11:41 +02:00

itemlevlist.hpp

added getName function

2010-08-03 17:11:41 +02:00

light.cpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

light.hpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

lockpick.cpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

lockpick.hpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

misc.cpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

misc.hpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

npc.cpp

Merge branch 'master' into dialogue

2010-08-06 19:20:05 +02:00

npc.hpp

Merge branch 'master' into dialogue

2010-08-06 19:20:05 +02:00

potion.cpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

potion.hpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

probe.cpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

probe.hpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

repair.cpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

repair.hpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

static.cpp

added getName function

2010-08-03 17:11:41 +02:00

static.hpp

added getName function

2010-08-03 17:11:41 +02:00

weapon.cpp

integrated activation into script system

2010-08-05 15:40:03 +02:00

weapon.hpp

integrated activation into script system

2010-08-05 15:40:03 +02:00