Marc Zinnschlag 2c70a93553 Merge branch 'master' into potions ...

Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp

2012-07-17 10:32:18 +02:00

..

activator.cpp

Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp

2012-07-03 13:15:20 +02:00

activator.hpp

Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips

2012-04-24 02:02:03 +02:00

apparatus.cpp

Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp

2012-07-03 13:15:20 +02:00

apparatus.hpp

merged by branches together, starting with alchemy window

2012-05-24 15:57:23 +02:00

armor.cpp

Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp

2012-07-03 13:15:20 +02:00

armor.hpp

make Class::use method return an equip action for equippable items, add sound for equipping

2012-05-16 16:08:55 +02:00

book.cpp

Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp

2012-07-03 13:15:20 +02:00

book.hpp

using items via the inventory is now possible by dragging them on the avatar (only implemented for books right now)

2012-05-15 18:05:53 +02: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

Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp

2012-07-03 13:15:20 +02:00

clothing.hpp

make Class::use method return an equip action for equippable items, add sound for equipping

2012-05-16 16:08:55 +02:00

container.cpp

Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp

2012-07-03 13:15:20 +02:00

container.hpp

allow the 'lock' and 'unlock' script commands to work on containers, like in morrowind

2012-06-18 00:21:55 +02:00

creature.cpp

Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp

2012-07-03 13:15:20 +02:00

creature.hpp

Mostly removal of unnecessary #include's and a little clean up

2012-07-17 09:27:12 +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

Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp

2012-07-03 13:15:20 +02:00

door.hpp

Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips

2012-04-24 02:02:03 +02:00

ingredient.cpp

Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp

2012-07-03 13:15:20 +02:00

ingredient.hpp

Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI

2012-05-11 10:40:40 +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

Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp

2012-07-03 13:15:20 +02:00

light.hpp

fixed some issues:

2012-06-04 21:48:20 +02:00

lockpick.cpp

Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp

2012-07-03 13:15:20 +02:00

lockpick.hpp

fixed some issues:

2012-06-04 21:48:20 +02:00

misc.cpp

Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp

2012-07-03 13:15:20 +02:00

misc.hpp

Prepending m to the name of every member variable.

2012-07-13 03:51:58 -07:00

npc.cpp

Merge branch 'master' into potions

2012-07-17 10:32:18 +02:00

npc.hpp

Merge branch 'master' into potions

2012-07-17 10:32:18 +02:00

potion.cpp

Issue #314: fix to potion use function (was mixing up potion with potion user)

2012-07-13 15:51:57 +02:00

potion.hpp

Merge branch 'master' into potions

2012-07-17 10:32:18 +02:00

probe.cpp

Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp

2012-07-03 13:15:20 +02:00

probe.hpp

fixed some issues:

2012-06-04 21:48:20 +02:00

repair.cpp

Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp

2012-07-03 13:15:20 +02:00

repair.hpp

Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI

2012-05-11 10:40:40 +02:00

static.cpp

Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp

2012-07-03 13:15:20 +02:00

static.hpp

Prepending m to the name of every member variable.

2012-07-13 03:51:58 -07:00

weapon.cpp

Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp

2012-07-03 13:15:20 +02:00

weapon.hpp

make Class::use method return an equip action for equippable items, add sound for equipping

2012-05-16 16:08:55 +02:00