gus d587f3c946 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat ...

Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwscript/docs/vmformat.txt

2013-10-31 09:51:17 +01:00

..

mwbase

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

2013-10-31 09:51:17 +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

Removed a workaround from Renderer, some cleanup

2013-10-30 13:05:28 +01:00

mwinput

Removed a workaround from Renderer, some cleanup

2013-10-30 13:05:28 +01:00

mwmechanics

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

2013-10-31 09:51:17 +01:00

mwrender

Merge remote-tracking branch 'scrawl/master'

2013-10-13 18:55:49 +02:00

mwscript

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

2013-10-31 09:51:17 +01:00

mwsound

Slightly randomize time between environment sounds

2013-08-27 16:04:19 -07:00

mwworld

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

2013-10-31 09:51:17 +01:00

CMakeLists.txt

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

2013-10-31 09:51:17 +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

Refactored Ogre initialisation into a component

2013-10-30 14:04:33 +01:00

engine.hpp

Removed the no longer needed --debug switch

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

main.cpp

Some changes suggested by cppcheck

2013-07-31 18:46:32 +02:00