scrawl b1c84f28a9 Merge branch 'master' into water ...

Conflicts:
	files/settings-default.cfg

2012-04-08 16:11:16 +02:00

..

mwclass

Merge branch 'autoequip'

2012-04-08 13:01:25 +02:00

mwdialogue

Merge remote branch 'gus/DialogueSystem'

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

mwgui

Merge remote-tracking branch 'upstream/master' into windowsPinning

2012-04-07 17:30:20 +03:00

mwinput

removed remains of input framelistener

2012-04-06 10:39:55 +02:00

mwmechanics

exclude player from auto equip

2012-04-08 13:01:03 +02:00

mwrender

removed the now unneccesary SG for transparent objects

2012-04-08 14:37:36 +02:00

mwscript

Merge branch 'master' into minimap

2012-04-02 14:38:02 +02:00

mwsound

Add sound volume settings

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

mwworld

Merge branch 'master' into water

2012-04-08 16:11:16 +02:00

CMakeLists.txt

Merge branch 'autoequip'

2012-04-07 18:48:30 +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 branch 'master' into water

2012-04-08 16:11:16 +02:00

engine.hpp

parse fallback with boost program option custom validators

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

main.cpp

typo 2 -.-

2012-04-05 00:16:44 +02:00