scrawl c64eb96952 Merge branch 'Travel_Dialogue' into training_travel ...

Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwgui/dialogue.cpp
	apps/openmw/mwrender/globalmap.cpp
	files/mygui/CMakeLists.txt

2012-10-17 18:17:53 +02:00

..

dialoguemanager.hpp

Issue #107: minor corrections

2012-08-09 12:05:47 +02:00

environment.cpp

fix WindowManager destruction

2012-08-12 21:21:23 +02:00

environment.hpp

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

2012-08-12 18:11:09 +02:00

inputmanager.hpp

loading screen

2012-09-11 16:37:54 +02:00

journal.hpp

MSCV compatibility fix

2012-08-11 12:03:22 +02:00

mechanicsmanager.hpp

sleeping restoration of health, magicka, and fatigue

2012-09-21 17:53:16 +02:00

scriptmanager.hpp

Issue #107: minor corrections

2012-08-09 12:05:47 +02:00

soundmanager.hpp

disabling gcc extensions

2012-10-09 17:10:25 +02:00

windowmanager.hpp

Merge branch 'Travel_Dialogue' into training_travel

2012-10-17 18:17:53 +02:00

world.hpp

moved global map from RenderingManager to gui and removed world method

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