Marc Zinnschlag 42ef7a61a0 Merge branch 'script' ... Conflicts: apps/openmw/engine.cpp apps/openmw/mwworld/world.cpp apps/openmw/mwworld/world.hpp		2011-01-09 20:56:21 +01:00
..
mwclass	Merge branch 'script'	2011-01-09 20:56:21 +01:00
mwdialogue	moved PlayerPos class from MWRender to MWWorld and renamed it to Player	2011-01-04 15:58:22 +01:00
mwgui	Merge branch 'script'	2011-01-09 20:56:21 +01:00
mwinput	split Player class into a MWWorld and a MWRender component	2011-01-08 15:11:37 +01:00
mwmechanics	moved PlayerPos class from MWRender to MWWorld and renamed it to Player	2011-01-04 15:58:22 +01:00
mwrender	Merge branch 'script'	2011-01-09 20:56:21 +01:00
mwscript	added Enable/DisableCollision instructions	2011-01-09 20:44:17 +01:00
mwsound	Merge remote branch 'pvdk/master'	2011-01-06 09:45:14 +01:00
mwworld	Merge branch 'script'	2011-01-09 20:56:21 +01:00
CMakeLists.txt	Merge branch 'playerpos' into script	2011-01-09 19:22:27 +01:00
doc.hpp	first set of additional doxygen comments	2010-09-25 15:03:53 +02:00
engine.cpp	Merge branch 'script'	2011-01-09 20:56:21 +01:00
engine.hpp	Converted all tabs to four spaces	2011-01-05 22:18:21 +01:00
main.cpp	Converted all tabs to four spaces	2011-01-05 22:18:21 +01:00