scrawl b2afb1fd5c Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement ...

Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwgui/spellbuyingwindow.cpp
	apps/openmw/mwgui/trainingwindow.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp

2012-11-08 23:16:40 +01:00

..

mwbase

Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement

2012-11-08 23:16:40 +01:00

mwclass

Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement

2012-11-08 23:16:40 +01:00

mwdialogue

Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement

2012-11-08 23:16:40 +01:00

mwgui

Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement

2012-11-08 23:16:40 +01:00

mwinput

changed OIS includes since OIS_INCLUDE_DIR is already an include directory

2012-11-06 15:26:51 +01:00

mwmechanics

Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement

2012-11-08 23:16:40 +01:00

mwrender

Merge remote-tracking branch 'greye/store' into next

2012-11-07 19:34:28 +01:00

mwscript

new interface in manualref, fix various typos

2012-11-06 13:43:48 +04:00

mwsound

applying new interface vol.3, inconsistent

2012-11-05 21:45:35 +04:00

mwworld

Merge remote-tracking branch 'greye/player-dynamics' into next

2012-11-08 18:32:25 +01:00

CMakeLists.txt

just replace esmstore, inconsistent

2012-11-05 18:09:58 +04: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

Fixed: engine: Bug #437 Stop animations when paused better fix; scene: Bug #430 Teleporting and using loading doors linking within the same cell reloads the cell

2012-11-03 19:29:55 +00:00

engine.hpp

Issue #352: added --script-run switch

2012-07-30 12:37:46 +02:00

main.cpp

disabling gcc extensions

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