Chris Robinson 0148db8ccf Merge remote-tracking branch 'zini/master' into animation2 ...

Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/npcanimation.hpp

2013-02-23 05:59:35 -08:00

..

mwbase

Add and use an MWWorld::isFlying method

2013-02-18 22:39:43 -08:00

mwclass

Fix lights without a mesh

2013-02-23 09:17:12 +01:00

mwdialogue

Dialogue: do not filter on disposition for creatures

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

mwgui

TradeWindow: fixed coding style

2013-02-23 13:51:21 +01:00

mwinput

Merge remote-tracking branch 'zini/next' into animation2

2013-02-17 16:03:39 -08:00

mwmechanics

Specify the animation key to stop playing at

2013-02-23 05:15:10 -08:00

mwrender

Merge remote-tracking branch 'zini/master' into animation2

2013-02-23 05:59:35 -08:00

mwscript

Merge remote-tracking branch 'zini/next' into animation2

2013-02-17 16:03:39 -08:00

mwsound

Trying to resolve sound issues on OS X with ffmpeg backend

2013-02-07 23:40:20 +04:00

mwworld

Merge remote-tracking branch 'zini/master' into animation2

2013-02-23 05:59:35 -08:00

CMakeLists.txt

Merge remote-tracking branch 'zini/master' into animation2

2013-02-20 08:27:40 -08: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-tracking branch 'zini/master' into animation2

2013-02-22 01:34:22 -08:00

engine.hpp

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

2013-01-25 18:22:01 +01:00

main.cpp

- For pull request: remove all instances of maps used to track refnumbers.

2013-02-09 13:00:57 +01:00