Marc Zinnschlag db205cf8aa Merge remote branch 'scrawl/next' into test ...

Conflicts:
	libs/openengine

2012-02-20 14:54:08 +01:00

..

mwclass

Merge branch 'master' into next

2012-02-20 14:34:27 +01:00

mwdialogue

accessing topic index didn't work

2011-12-29 17:32:57 +01:00

mwgui

Merge branch 'master' into next

2012-02-20 14:34:27 +01:00

mwinput

minor fix

2012-02-10 21:24:33 +01:00

mwmechanics

Empty npcs

2011-12-09 00:08:30 -05:00

mwrender

Merge remote branch 'scrawl/next' into test

2012-02-20 14:54:08 +01:00

mwscript

updated vmformat.txt

2012-02-18 18:30:01 +01:00

mwsound

Issue #19: Finished cleaning out the Engine framelistener

2011-10-09 09:28:36 +02:00

mwworld

Merge remote branch 'scrawl/next' into test

2012-02-20 14:54:08 +01:00

CMakeLists.txt

Merge branch 'master' into next

2012-02-20 14:34:27 +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

Merge branch 'master' into next

2012-02-20 14:34:27 +01:00

engine.hpp

Merge branch 'master' into next

2012-02-20 14:34:27 +01:00

main.cpp

Merge branch 'animation2'

2012-01-17 15:37:51 +01:00