Marc Zinnschlag 1b5301eec0 Merge branch 'savedgame' ...

Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwbase/soundmanager.hpp
	apps/openmw/mwgui/mapwindow.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwsound/soundmanagerimp.hpp
	components/esm/loadcell.cpp

2014-02-01 18:16:32 +01:00

..

activator.cpp

Respect items belonging to a faction

2014-01-07 20:24:01 +01:00

activator.hpp

Werewolves can't activate activators

2013-08-28 11:36:22 -07:00

apparatus.cpp

Respect items belonging to a faction

2014-01-07 20:24:01 +01:00

apparatus.hpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

armor.cpp

Use some more GMSTs for enchanting

2014-01-29 15:37:26 +01:00

armor.hpp

Use some more GMSTs for enchanting

2014-01-29 15:37:26 +01:00

book.cpp

Use some more GMSTs for enchanting

2014-01-29 15:37:26 +01:00

book.hpp

Use some more GMSTs for enchanting

2014-01-29 15:37:26 +01: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

Use some more GMSTs for enchanting

2014-01-29 15:37:26 +01:00

clothing.hpp

Use some more GMSTs for enchanting

2014-01-29 15:37:26 +01:00

container.cpp

store content of containers in saved game files

2014-01-31 13:25:32 +01:00

container.hpp

store content of containers in saved game files

2014-01-31 13:25:32 +01:00

creature.cpp

Merge branch 'savedgame'

2014-02-01 18:16:32 +01:00

creature.hpp

Merge branch 'savedgame'

2014-02-01 18:16:32 +01:00

creaturelevlist.cpp

Feature #701: Spawn levelled creatures in cells

2014-01-18 07:26:27 +01:00

creaturelevlist.hpp

Feature #701: Spawn levelled creatures in cells

2014-01-18 07:26:27 +01:00

door.cpp

Add getPlayerPtr() utility method. Reduces dependencies a lot.

2014-01-08 18:39:44 +01:00

door.hpp

Cell names localization fix

2012-12-23 23:23:24 +04:00

ingredient.cpp

Add getPlayerPtr() utility method. Reduces dependencies a lot.

2014-01-08 18:39:44 +01:00

ingredient.hpp

Container UI rewrite

2013-05-11 18:38:27 +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

store additional state of lights in saved game files

2014-01-30 12:37:33 +01:00

light.hpp

store additional state of lights in saved game files

2014-01-30 12:37:33 +01:00

lockpick.cpp

Respect items belonging to a faction

2014-01-07 20:24:01 +01:00

lockpick.hpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

misc.cpp

Fix gold bugs (Fixes #1145, Fixes #1146)

2014-01-29 15:37:27 +01:00

misc.hpp

Show marked position on map. Implement Detect X magic effects.

2014-01-01 22:37:52 +01:00

npc.cpp

Merge branch 'savedgame'

2014-02-01 18:16:32 +01:00

npc.hpp

Merge branch 'savedgame'

2014-02-01 18:16:32 +01:00

potion.cpp

Add getPlayerPtr() utility method. Reduces dependencies a lot.

2014-01-08 18:39:44 +01:00

potion.hpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

probe.cpp

Respect items belonging to a faction

2014-01-07 20:24:01 +01:00

probe.hpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

repair.cpp

Respect items belonging to a faction

2014-01-07 20:24:01 +01:00

repair.hpp

Container UI rewrite

2013-05-11 18:38:27 +02:00

static.cpp

Make insertBegin internal

2013-08-07 03:56:07 -07:00

static.hpp

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

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

weapon.cpp

Use some more GMSTs for enchanting

2014-01-29 15:37:26 +01:00

weapon.hpp

Use some more GMSTs for enchanting

2014-01-29 15:37:26 +01:00