Marc Zinnschlag 8be3ffc2a0 Merge remote-tracking branch 'scrawl/magic' ...

Conflicts:
	apps/openmw/mwworld/worldimp.cpp

2013-11-09 10:54:51 +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

Dialog function 72 is not player-specific

2013-08-08 06:02:16 -07: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

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

2013-11-09 07:51:46 +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 remote-tracking branch 'scrawl/magic'

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

CMakeLists.txt

Merge remote-tracking branch 'scrawl/ui'

2013-11-06 10:21:41 +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