Mark Siewert dca8dc4fdb Merge remote-tracking branch 'upstream/master' into multiple_esm_esp ...

Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.hpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/esmreader.hpp

- Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.

2013-01-25 18:22:01 +01:00

..

dialoguemanager.hpp

Merge branch 'master' into dialogue

2012-11-10 15:44:44 +01:00

environment.cpp

change destruction order to fix crash on exit when a video is playing

2012-12-15 22:01:45 +01: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

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

2012-11-10 14:59:52 +01:00

scriptmanager.hpp

Issue #107: minor corrections

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

soundmanager.hpp

Use const references where appropriate

2013-01-15 12:07:15 -08:00

windowmanager.hpp

1. Dialogs in Russian version now works.

2012-12-31 04:15:47 +04:00

world.hpp

Merge remote-tracking branch 'upstream/master' into multiple_esm_esp

2013-01-25 18:22:01 +01:00