You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

scrawl ac0c1ea986 Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation ... Conflicts: apps/openmw/mwgui/dialogue.cpp		12 years ago
..
mwbase	Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation	12 years ago
mwclass	fixing some unrelated warnings	12 years ago
mwdialogue	Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation	12 years ago
mwgui	Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation	12 years ago
mwinput	enableRestMenu & enableLevelupMenu	12 years ago
mwmechanics	per NPC ID interaction tracking	12 years ago
mwrender	oops	12 years ago
mwscript	Merge branch 'master' into next	12 years ago
mwsound	Issue #372: fixed positions in SoundManager	13 years ago
mwworld	Merge remote-tracking branch 'scrawl/book_skillgain' into next	12 years ago
CMakeLists.txt	Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation	12 years ago
config.hpp.cmake	another minor correction (fixing the previous one)	14 years ago
doc.hpp	first set of additional doxygen comments	14 years ago
engine.cpp	moved global map from RenderingManager to gui and removed world method	12 years ago
engine.hpp	Issue #352: added --script-run switch	13 years ago
main.cpp	re-enabling support for multiple data directories	13 years ago