Marc Zinnschlag 37f478b69a Merge branch 'spells' ...

Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwmechanics/npcstats.hpp

2012-04-13 11:32:33 +02:00

..

mwclass

Merge branch 'spells'

2012-04-13 11:32:33 +02:00

mwdialogue

Merge remote branch 'gus/DialogueSystem'

2012-04-03 18:27:36 +02:00

mwgui

use the cursors from morrowind.bsa and remove mwpointer.png

2012-04-12 14:26:21 +02:00

mwinput

only fists support lacks

2012-04-08 13:17:16 +02:00

mwmechanics

Merge branch 'spells'

2012-04-13 11:32:33 +02:00

mwrender

removed 2 unneeded lines

2012-04-12 19:18:38 +02:00

mwscript

added addspell and removespell script instructions

2012-04-13 11:12:53 +02:00

mwsound

Add sound volume settings

2012-04-07 16:00:30 -07:00

mwworld

Merge remote branch 'minty3/testbranch'

2012-04-08 23:40:48 +02:00

CMakeLists.txt

Merge branch 'spells'

2012-04-13 11:32:33 +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 remote branch 'scrawl/graphics'

2012-04-12 18:46:02 +02:00

engine.hpp

parse fallback with boost program option custom validators

2012-04-03 02:14:39 +02:00

main.cpp

Revert "test commit"

2012-04-08 11:30:17 +02:00