Marc Zinnschlag 43912f927a Merge remote-tracking branch 'potatoesmaster/importer' into next ...

Conflicts:
	apps/openmw/mwworld/worldimp.cpp

2013-02-06 10:12:40 +01:00

..

mwbase

Merge remote-tracking branch 'wheybags/containerscripts'

2013-01-21 23:02:45 +01:00

mwclass

NPC: take stats from NPDT12 into account

2013-01-20 17:44:08 +01:00

mwdialogue

Dialogue: do not filter on disposition for creatures

2013-01-24 19:43:21 +01:00

mwgui

refactored special variable code

2013-02-03 13:27:27 +00:00

mwinput

Merge branch 'master' into videoplayback

2013-01-07 13:25:15 +01:00

mwmechanics

Issue #479: Use magnitude specified when adding disease

2013-01-13 14:52:55 +01:00

mwrender

Merge branch 'master' of git://github.com/zinnschlag/openmw into terrainfix

2013-02-05 00:21:42 +01:00

mwscript

refactored special variable code

2013-02-03 13:27:27 +00:00

mwsound

Use const references where appropriate

2013-01-15 12:07:15 -08:00

mwworld

Merge remote-tracking branch 'potatoesmaster/importer' into next

2013-02-06 10:12:40 +01:00

CMakeLists.txt

Merge remote-tracking branch 'wheybags/master' into next

2013-02-05 11:55:47 +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

Fixed crash on changing cell due to Utf8Encoder going out of scope

2013-01-12 01:18:36 +01:00

engine.hpp

Fixed crash on changing cell due to Utf8Encoder going out of scope

2013-01-12 01:18:36 +01:00

main.cpp

added option to override the activation distance

2013-01-08 20:00:06 -08:00