Chris Robinson 74e79bb4af Merge remote branch 'zini/master' into sound-rewrite ... Conflicts: apps/openmw/mwsound/soundmanager.cpp apps/openmw/mwsound/soundmanager.hpp		2012-03-20 06:17:02 -07:00
..
mwclass	another armour class detection fix	2012-03-15 15:05:14 +01:00
mwdialogue	silenced some warnings	2012-03-20 10:30:21 +01:00
mwgui	Merge remote branch 'kromgart/master'	2012-03-20 10:17:35 +01:00
mwinput	minor fix	2012-02-10 21:24:33 +01:00
mwmechanics	Empty npcs	2011-12-09 00:08:30 -05:00
mwrender	removed preprocessor constants	2012-03-18 20:32:50 +01:00
mwscript	fixed handling of optional instruction/function arguments; removed choice workaround	2012-03-17 19:32:44 +01:00
mwsound	Merge remote branch 'zini/master' into sound-rewrite	2012-03-20 06:17:02 -07:00
mwworld	disabled solstheim weather (we can't travel there anyway)	2012-03-19 22:54:04 +01:00
CMakeLists.txt	Merge remote branch 'zini/master' into sound-rewrite	2012-03-20 06:17:02 -07: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 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem	2012-03-19 00:20:43 +01:00
engine.hpp	implemented dialogue scripts	2012-03-05 16:56:14 +01:00
main.cpp	temporarily disabled multi data path support in OpenMW	2012-02-28 09:27:35 +01:00