Marc Zinnschlag 8c4303399f Merge branch 'master' into dialogue ...

Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loadinfo.hpp

2013-11-10 13:21:39 +01:00

..

mwbase

Refactor ActiveSpells to track range type. Added basic self range magic.

2013-11-09 07:51:46 +01:00

mwclass

silenced a warning

2013-10-16 21:33:11 +02:00

mwdialogue

added missing columns to topic info table

2013-11-05 11:41:48 +01:00

mwgui

Merge remote-tracking branch 'scrawl/magic'

2013-11-09 10:54:51 +01:00

mwinput

Fix exiting OpenMW via the window close button (regression)

2013-11-05 03:02:28 +01:00

mwmechanics

Implemented Fortify/Drain skill magic effects. Scroll of icarian flight works!

2013-11-09 10:49:00 +01:00

mwrender

Refactor ActiveSpells to track range type. Added basic self range magic.

2013-11-09 07:51:46 +01:00

mwscript

Implement Disable/EnableLevitation script functions

2013-10-02 15:33:20 +02:00

mwsound

Slightly randomize time between environment sounds

2013-08-27 16:04:19 -07:00

mwworld

Merge branch 'master' into dialogue

2013-11-10 13:21:39 +01:00

CMakeLists.txt

Merge remote-tracking branch 'scrawl/magic'

2013-11-09 17:00:27 +01: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 'openmw-27'

2013-11-06 10:21:25 +01:00

engine.hpp

Issue #913: Merge --master and --plugin switches

2013-09-29 09:11:57 +02:00

main.cpp

Issue #913: Merge --master and --plugin switches

2013-09-29 09:11:57 +02:00