Marc Zinnschlag d1d861e1be Merge branch 'run' ... Conflicts: apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/data.cpp components/CMakeLists.txt		2014-09-14 11:59:54 +02:00
..
mwbase	Remove a useless method	2014-09-13 07:57:15 +02:00
mwclass	Merge remote-tracking branch 'scrawl/master'	2014-09-11 09:01:21 +02:00
mwdialogue	Encapsulate magic effect magnitude (Feature #1489)	2014-08-17 03:58:04 +02:00
mwgui	Merge remote-tracking branch 'ragora/bounditemflag'	2014-09-14 10:54:07 +02:00
mwinput	Add a hack to support binding the console to a printable key (Fixes #371) and change default console key to morrowind default (GRAVE)	2014-09-10 18:13:39 +02:00
mwmechanics	Merge remote-tracking branch 'scrawl/master'	2014-09-11 09:01:21 +02:00
mwrender	Ignore text keys for zero-length animations (Fixes #1876)	2014-09-08 15:23:35 +02:00
mwscript	Merge remote-tracking branch 'scrawl/master'	2014-09-11 09:01:21 +02:00
mwsound	Merge branch 'master' of https://github.com/OpenMW/openmw	2014-07-29 19:35:44 +02:00
mwstate	Remove an unneeded include	2014-09-07 18:55:59 +02:00
mwworld	Merge branch 'run'	2014-09-14 11:59:54 +02:00
android_main.c	fixe all code v 2	2014-08-06 00:46:21 +04:00
CMakeLists.txt	Merge branch 'run'	2014-09-14 11:59:54 +02:00
crashcatcher.cpp	fixes building on systems with kFreeBSD kernel	2014-08-18 17:19:54 +02:00
doc.hpp	first set of additional doxygen comments	2010-09-25 15:03:53 +02:00
engine.cpp	Merge branch 'run'	2014-09-14 11:59:54 +02:00
engine.hpp	Merge branch 'run'	2014-09-14 11:59:54 +02:00
main.cpp	fixed --data switch (was missing composing option)	2014-09-13 20:41:57 +02:00