1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 19:19:55 +00:00
openmw-tes3mp/apps/openmw
Marc Zinnschlag 10a63b10b5 Merge branch 'master' into container
Conflicts:
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/container.hpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/creature.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
	apps/openmw/mwworld/class.cpp
	apps/openmw/mwworld/class.hpp
2010-08-06 14:37:53 +02:00
..
mwclass Merge branch 'master' into container 2010-08-06 14:37:53 +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 item count 2010-08-04 14:04:22 +02:00
mwscript added activate instruction 2010-08-05 15:52:07 +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 'master' into container 2010-08-06 14:37:53 +02:00
CMakeLists.txt added containerstore 2010-08-04 14:37:23 +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