gugus 4f5c4bf89a Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue ...

Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwgui/dialogue.cpp
	apps/openmw/mwgui/dialogue.hpp
	apps/openmw/mwgui/mode.hpp
	apps/openmw/mwgui/windowmanagerimp.cpp

2012-09-28 17:09:15 +02:00

..

mwbase

Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue

2012-09-28 17:09:15 +02:00

mwclass

fixing some unrelated warnings

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

mwdialogue

Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue

2012-09-28 17:09:15 +02:00

mwgui

Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue

2012-09-28 17:09:15 +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 branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue

2012-09-28 17:09:15 +02:00

mwscript

Merge branch 'master' into next

2012-09-22 20:48:55 +02:00

mwsound

Issue #372: fixed positions in SoundManager

2012-08-29 18:48:20 +02:00

mwworld

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

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

CMakeLists.txt

Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue

2012-09-28 17:09:15 +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