Nikolay Kasyanov b21a6291f7 Merge branch 'master' into pgrd-rendering ...

Conflicts:
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwscript/miscextensions.cpp
	apps/openmw/mwworld/world.hpp

2012-03-30 02:50:30 +04: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 'lgro/valgrind'

2012-03-28 21:46:47 +02: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 'master' into pgrd-rendering

2012-03-30 02:50:30 +04:00

mwscript

Merge branch 'master' into pgrd-rendering

2012-03-30 02:50:30 +04:00

mwsound

(Temporary) workaround for broken OpenAL implementations that doesn't return meaningful max counts of sources

2012-03-30 00:12:38 +04:00

mwworld

Merge branch 'master' into pgrd-rendering

2012-03-30 02:50:30 +04:00

CMakeLists.txt

Merge branch 'master' into water

2012-03-28 21:37:20 +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 'master' into water

2012-03-28 21:37:20 +02: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