Marc Zinnschlag ec575200e3 Merge remote-tracking branch 'gus/MeleeCombat2' ...

Conflicts:
	apps/openmw/mwrender/animation.cpp

2013-07-23 09:12:23 +02:00

..

mwbase

Merge remote-tracking branch 'kolek/thirdpersonzoom'

2013-07-20 18:29:59 +02:00

mwclass

Use the correct formula for NPC health initialization

2013-07-21 10:13:46 +02:00

mwdialogue

Added new game button

2013-05-15 17:54:18 +02:00

mwgui

Merge remote-tracking branch 'gus/MeleeCombat2'

2013-07-23 09:12:23 +02:00

mwinput

Merge remote-tracking branch 'gus/MeleeCombat2'

2013-07-23 09:12:23 +02:00

mwmechanics

Merge remote-tracking branch 'gus/MeleeCombat2'

2013-07-23 09:12:23 +02:00

mwrender

Merge remote-tracking branch 'gus/MeleeCombat2'

2013-07-23 09:12:23 +02:00

mwscript

Allow specifying the sound type to playSound and playSound3D

2013-07-18 21:50:11 -07:00

mwsound

Allow specifying the sound type to playSound and playSound3D

2013-07-18 21:50:11 -07:00

mwworld

Merge remote-tracking branch 'kolek/thirdpersonzoom'

2013-07-20 18:29:59 +02:00

CMakeLists.txt

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

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

update player position on engine start

2013-07-07 15:06:05 +04:00

engine.hpp

Removed the no longer needed --debug switch

2013-06-16 20:39:40 +02:00

main.cpp

Make OpenMW able to initialize SDL in windows builds

2013-06-25 15:05:10 +02:00