Marc Zinnschlag c995533e07 Merge branch 'dialogue' into saving ... Conflicts: apps/opencs/model/world/columnimp.hpp apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/data.cpp components/esm/loaddial.hpp		2013-10-21 16:45:43 +02:00
..
mwbase	Merge remote-tracking branch 'potatoesmaster/DisableLevitation'	2013-10-12 13:31:06 +02:00
mwclass	silenced a warning	2013-10-16 21:33:11 +02:00
mwdialogue	Dialog function 72 is not player-specific	2013-08-08 06:02:16 -07:00
mwgui	Remember pressed message box button longer	2013-10-14 12:55:06 +02:00
mwinput	Add cut, copy & paste of text	2013-10-17 12:47:49 +02:00
mwmechanics	Merge remote-tracking branch 'rainChu/torches'	2013-10-16 21:24:45 +02:00
mwrender	Merge remote-tracking branch 'scrawl/master'	2013-10-13 18:55:49 +02:00
mwscript	Implement Disable/EnableLevitation script functions	2013-10-02 15:33:20 +02:00
mwsound	Slightly randomize time between environment sounds	2013-08-27 16:04:19 -07:00
mwworld	Merge branch 'dialogue' into saving	2013-10-21 16:45:43 +02:00
CMakeLists.txt	Issue #913: Merge --master and --plugin switches	2013-09-29 09:11:57 +02:00
config.hpp.cmake	another minor correction (fixing the previous one)	2011-07-08 16:16:06 +02:00
doc.hpp	first set of additional doxygen comments	2010-09-25 15:03:53 +02:00
engine.cpp	Merge branch 'dialogue' into saving	2013-10-21 16:45:43 +02:00
engine.hpp	Issue #913: Merge --master and --plugin switches	2013-09-29 09:11:57 +02:00
main.cpp	Issue #913: Merge --master and --plugin switches	2013-09-29 09:11:57 +02:00