scrawl 1b5bfc52a1 Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips ...

Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwgui/window_manager.cpp

2012-04-24 02:02:03 +02:00

..

mwbase

Issue #255: deleted the old environment class and using the new one instead

2012-04-23 15:27:03 +02:00

mwclass

Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips

2012-04-24 02:02:03 +02:00

mwdialogue

Merge branch 'master' into next

2012-04-23 15:32:02 +02:00

mwgui

Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips

2012-04-24 02:02:03 +02:00

mwinput

disable some player controls in gui mode

2012-04-18 19:03:26 +02:00

mwmechanics

Issue #255: deleted the old environment class and using the new one instead

2012-04-23 15:27:03 +02:00

mwrender

Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips

2012-04-24 02:02:03 +02:00

mwscript

Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips

2012-04-24 02:02:03 +02:00

mwsound

Issue #255: deleted the old environment class and using the new one instead

2012-04-23 15:27:03 +02:00

mwworld

Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips

2012-04-24 02:02:03 +02:00

CMakeLists.txt

Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips

2012-04-24 02:02:03 +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

Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips

2012-04-24 02:02:03 +02:00

engine.hpp

Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips

2012-04-24 02:02:03 +02:00

main.cpp

removed --report-focus which is now useless

2012-04-19 01:16:41 +02:00