Marc Zinnschlag bc92b7b1fa Merge branch 'directories' into next ...

Conflicts:
	components/files/multidircollection.hpp
	components/nifogre/ogre_nif_loader.hpp

2011-06-15 22:40:24 +02:00

..

mwclass

Merge branch 'directories' into next

2011-06-15 22:40:24 +02:00

mwdialogue

added topic tracking

2011-04-26 20:48:36 +02:00

mwgui

don't create a new virtual machine for each script and frame

2011-05-18 16:01:19 +02:00

mwinput

changed OGRE framelistener function from frameStarted to frameRenderingQueued

2011-05-18 16:37:09 +02:00

mwmechanics

Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions

2011-03-15 13:36:25 +01:00

mwrender

Merge branch 'directories' into next

2011-06-15 22:40:24 +02:00

mwscript

don't create a new virtual machine for each script and frame

2011-05-18 16:01:19 +02:00

mwsound

more cleanup

2011-06-15 22:33:31 +02:00

mwworld

some cleanup

2011-05-30 14:27:04 +02:00

CMakeLists.txt

Merge branch 'journal'

2011-04-28 10:27:18 +02:00

doc.hpp

first set of additional doxygen comments

2010-09-25 15:03:53 +02:00

engine.cpp

more cleanup

2011-06-15 22:33:31 +02:00

engine.hpp

changed OGRE framelistener function from frameStarted to frameRenderingQueued

2011-05-18 16:37:09 +02:00

main.cpp

added --fs-strict switch

2011-05-05 19:56:16 +02:00