Chris Robinson 991f942fba Merge remote-tracking branch 'zini/master' into sound ...

Conflicts:
	apps/openmw/mwsound/soundmanagerimp.cpp
	apps/openmw/mwsound/soundmanagerimp.hpp

2012-09-30 16:57:54 -07:00

..

mwbase

Merge remote-tracking branch 'zini/master' into sound

2012-09-30 16:57:54 -07:00

mwclass

fixing some unrelated warnings

2012-09-23 19:36:37 +02:00

mwdialogue

Task #400 Review GMST access

2012-09-22 21:35:57 +02:00

mwgui

WakeUpPc instruction

2012-09-29 09:41:34 +02:00

mwinput

enableRestMenu & enableLevelupMenu

2012-09-15 20:18:41 +02:00

mwmechanics

per NPC ID interaction tracking

2012-09-25 10:48:57 +02:00

mwrender

Merge remote-tracking branch 'chris/animation'

2012-09-29 12:39:56 +02:00

mwscript

WakeUpPc instruction

2012-09-29 09:41:34 +02:00

mwsound

Merge remote-tracking branch 'zini/master' into sound

2012-09-30 16:57:54 -07:00

mwworld

Merge remote-tracking branch 'scrawl/book_skillgain' into next

2012-09-26 20:35:48 +02:00

CMakeLists.txt

Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap

2012-09-20 17:41:14 +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

moved global map from RenderingManager to gui and removed world method

2012-09-21 14:11:01 +02:00

engine.hpp

Issue #352: added --script-run switch

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

main.cpp

re-enabling support for multiple data directories

2012-08-16 12:59:28 +02:00