Marc Zinnschlag 7afc8ffd2e Merge branch 'container' ...

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-07 20:33:07 +02:00

..

mwclass

Merge branch 'container'

2010-08-07 20:33:07 +02:00

mwgui

moved stats label <-> GMST text mapping from mwmechanics to mwgui; added missing stats window labels

2010-08-01 10:25:50 +02:00

mwinput

routed activate signal from input sub-system to engine-class

2010-08-05 13:36:33 +02:00

mwmechanics

fixed a stats bug (reducing modified stats via setModified didn't work correctly

2010-08-05 16:40:21 +02:00

mwrender

implemented take action

2010-08-07 20:25:17 +02:00

mwscript

added RemoveItem

2010-08-07 17:00:04 +02:00

mwsound

moved sound extensions from mwsound to mwscript (reduces coupling between openmw components)

2010-07-10 11:48:05 +02:00

mwworld

Merge branch 'container'

2010-08-07 20:33:07 +02:00

CMakeLists.txt

Merge branch 'container'

2010-08-07 20:33:07 +02:00

engine.cpp

stop local scripts from being run twice in case of activation

2010-08-05 15:46:50 +02:00

engine.hpp

stop local scripts from being run twice in case of activation

2010-08-05 15:46:50 +02:00

main.cpp

Killed clientconsole, mwcompiler, mwinterpreter and command server

2010-07-22 14:15:02 +02:00