gugus b664b174f0 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into object_movement_creation ...

Conflicts:
	apps/openmw/mwscript/transformationextensions.cpp

2012-08-09 23:50:44 +02:00

..

mwbase

resolving conflicts

2012-08-09 21:49:00 +04:00

mwclass

resolving conflicts

2012-08-09 21:49:00 +04:00

mwdialogue

Issue #107: Journal is accessed only through the interface class from now on

2012-08-09 12:56:03 +02:00

mwgui

Issue #107: SoundManager is accessed only through the interface class from now on

2012-08-09 14:33:21 +02:00

mwinput

fix disabled camera on start

2012-08-09 13:29:13 +04:00

mwmechanics

CreatureStats class

2012-07-22 18:29:54 +04:00

mwrender

resolving conflicts

2012-08-09 21:49:00 +04:00

mwscript

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

2012-08-09 23:50:44 +02:00

mwsound

Merge branch 'decouple' into player_control

2012-08-09 16:12:10 +02:00

mwworld

resolving conflicts

2012-08-09 21:49:00 +04:00

CMakeLists.txt

Merge branch 'decouple' into player_control

2012-08-09 16:12:10 +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

Issue #107: SoundManager is accessed only through the interface class from now on

2012-08-09 14:33:21 +02:00

engine.hpp

Issue #352: added --script-run switch

2012-07-30 12:37:46 +02:00

main.cpp

improved the help text for --script-run; updated readme.txt

2012-07-30 12:43:23 +02:00