Everything about development and the OpenMW source code.
I've commited the code in my journal branch. Right now, i'm not focusing anymore in having the journal in the right place (ie in the center of the screen), but if anyone is willing to help, you just need to look at openmw_journal_layout.xml (it's a very simple XML file).
Does not build for me.
You probably forgot to add the new source files to cmake. Also, the name of the new source files does not match our naming convention (see wiki).CMakeFiles/openmw.dir/mwgui/window_manager.cpp.o: In function `MWGui::WindowManager::WindowManager(MyGUI::Gui*, MWWorld::Environment&, Compiler::Extensions const&, bool, bool)':
window_manager.cpp:(.text+0x5b8): undefined reference to `MWGui::JournalWindow::JournalWindow(MWGui::WindowManager&)'
CMakeFiles/openmw.dir/mwgui/window_manager.cpp.o: In function `MWGui::WindowManager::WindowManager(MyGUI::Gui*, MWWorld::Environment&, Compiler::Extensions const&, bool, bool)':
window_manager.cpp:(.text+0x1166): undefined reference to `MWGui::JournalWindow::JournalWindow(MWGui::WindowManager&)'
Nope. Doesn't even merge without conflict. Looks like you are using really outdated cmake scripts. No point in trying to resolve these conflicts. I suggest you throw away the changes to the cmake files, merge in my master and then redo them.
Well, it merges cleanly and builds too. But it crashes on startup:
Loading config file: /home/marc/.config/openmw/openmw.cfg... done.
Loading config file: ./openmw.cfg... done.
Using default (English) font encoding.
Ignoring all but the first master file (multiple master files not yet supported).
Data dir ./data
Loading ESM ./data/Morrowind.esm