Marc Zinnschlag 7483c78b4a Merge remote branch 'jhooks/clothingarmor' ...

Conflicts:
	apps/openmw/mwrender/npcanimation.cpp

2012-04-16 14:06:27 +02:00

..

mwclass

Merge remote branch 'jhooks/clothingarmor'

2012-04-15 22:06:05 +02:00

mwdialogue

corrected a bug about rank.

2012-04-12 17:29:05 +02:00

mwgui

F10 hotkey toggle FPS

2012-04-13 13:17:50 +02:00

mwinput

F10 hotkey toggle FPS

2012-04-13 13:17:50 +02:00

mwmechanics

Undefining some windows defines

2012-04-13 15:09:38 +02:00

mwrender

Merge remote branch 'jhooks/clothingarmor'

2012-04-16 14:06:27 +02:00

mwscript

fixed ForceGreeting

2012-04-15 17:08:22 +02:00

mwsound

Add sound volume settings

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

mwworld

Merge remote branch 'jhooks/clothingarmor'

2012-04-15 22:06:05 +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