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

..

activator.cpp

Merge remote-tracking branch 'greye/store' into next

2012-11-07 19:34:28 +01:00

activator.hpp

float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()

2012-07-26 16:14:11 +04:00

apparatus.cpp

Merge remote-tracking branch 'greye/store' into next

2012-11-07 19:34:28 +01:00

apparatus.hpp

float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()

2012-07-26 16:14:11 +04:00

armor.cpp

Merge remote-tracking branch 'greye/store' into next

2012-11-07 19:34:28 +01:00

armor.hpp

float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()

2012-07-26 16:14:11 +04:00

book.cpp

Merge remote-tracking branch 'greye/store' into next

2012-11-07 19:34:28 +01:00

book.hpp

float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()

2012-07-26 16:14:11 +04:00

classes.cpp

Mantis: #18 - Move components from global namespace into their own namespace.

2011-06-19 18:14:03 +02:00

classes.hpp

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

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

clothing.cpp

Merge remote-tracking branch 'greye/store' into next

2012-11-07 19:34:28 +01:00

clothing.hpp

float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()

2012-07-26 16:14:11 +04:00

container.cpp

Merge remote-tracking branch 'greye/store' into next

2012-11-07 19:34:28 +01:00

container.hpp

float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()

2012-07-26 16:14:11 +04:00

creature.cpp

Issue #219: rewrote AI settings and implemented AI settings filters

2012-11-10 11:38:37 +01:00

creature.hpp

Issue #68: check for essential actors

2012-10-27 13:33:54 +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

Merge remote-tracking branch 'greye/store' into next

2012-11-07 19:34:28 +01:00

door.hpp

float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()

2012-07-26 16:14:11 +04:00

ingredient.cpp

Merge remote-tracking branch 'greye/store' into next

2012-11-07 19:34:28 +01:00

ingredient.hpp

Issue #356: Implemented ingredient eating

2012-09-13 13:02:26 +02:00

itemlevlist.cpp

added getName function

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

itemlevlist.hpp

more corrections

2011-11-13 18:19:29 -05:00

light.cpp

Merge remote-tracking branch 'greye/store' into next

2012-11-07 19:34:28 +01:00

light.hpp

float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()

2012-07-26 16:14:11 +04:00

lockpick.cpp

Merge remote-tracking branch 'greye/store' into next

2012-11-07 19:34:28 +01:00

lockpick.hpp

float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()

2012-07-26 16:14:11 +04:00

misc.cpp

Merge remote-tracking branch 'greye/store' into next

2012-11-07 19:34:28 +01:00

misc.hpp

float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()

2012-07-26 16:14:11 +04:00

npc.cpp

Merge branch 'master' into dialogue

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

npc.hpp

Issue #68: check for essential actors

2012-10-27 13:33:54 +02:00

potion.cpp

Merge remote-tracking branch 'greye/store' into next

2012-11-07 19:34:28 +01:00

potion.hpp

float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()

2012-07-26 16:14:11 +04:00

probe.cpp

Merge remote-tracking branch 'greye/store' into next

2012-11-07 19:34:28 +01:00

probe.hpp

float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()

2012-07-26 16:14:11 +04:00

repair.cpp

Merge remote-tracking branch 'greye/store' into next

2012-11-07 19:34:28 +01:00

repair.hpp

float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()

2012-07-26 16:14:11 +04:00

static.cpp

Merge remote-tracking branch 'greye/store' into next

2012-11-07 19:34:28 +01:00

static.hpp

float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()

2012-07-26 16:14:11 +04:00

weapon.cpp

Merge remote-tracking branch 'greye/store' into next

2012-11-07 19:34:28 +01:00

weapon.hpp

float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()

2012-07-26 16:14:11 +04:00