scrawl f2a7acb102 Merge branch 'next' into terrain ...

Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.cpp

2012-03-24 13:19:17 +01: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

bugfixes

2012-03-23 17:37:56 +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

Merge branch 'next' into terrain

2012-03-24 13:19:17 +01:00

mwscript

fixed handling of optional instruction/function arguments; removed choice workaround

2012-03-17 19:32:44 +01:00

mwsound

Removed a couple of warnings with nosound

2012-03-18 22:50:52 +02:00

mwworld

Merge branch 'next' into minimap

2012-03-22 19:36:37 +01:00

CMakeLists.txt

Merge branch 'next' into terrain

2012-03-24 13:19:17 +01: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