Marc Zinnschlag 7653caea27 Merge branch 'master' into collision ...

Conflicts:
	apps/openmw/mwclass/npc.cpp

2011-03-22 20:02:03 +01:00

..

mwclass

Merge branch 'master' into collision

2011-03-22 20:02:03 +01:00

mwdialogue

moved PlayerPos class from MWRender to MWWorld and renamed it to Player

2011-01-04 15:58:22 +01:00

mwgui

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

2011-03-15 13:36:25 +01:00

mwinput

replaced old movement input system

2011-02-03 12:16:59 +01:00

mwmechanics

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

2011-03-15 13:36:25 +01:00

mwrender

fixed a bug in phyiscs update code

2011-03-22 13:48:31 +01:00

mwscript

fixed collision mode interface and redirected collision mode script instruction from Player class to MWScene class

2011-03-13 22:33:55 +01:00

mwsound

Merge remote branch 'pvdk/master'

2011-01-06 09:45:14 +01:00

mwworld

fixed a bug in phyiscs update code

2011-03-22 13:48:31 +01:00

CMakeLists.txt

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

2011-03-15 13:36:25 +01:00

doc.hpp

first set of additional doxygen comments

2010-09-25 15:03:53 +02:00

engine.cpp

Not sure about this commit: the PhysicEngine was initialized twice...

2011-03-18 13:22:51 +01:00

engine.hpp

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

2011-03-15 13:36:25 +01:00

main.cpp

Oops. Used tabs instead of 4 spaces. Fixed.

2011-03-12 03:00:42 +03:00

path.cpp

Builds on OS X now

2011-03-07 05:09:29 +03:00

path.hpp

Builds on OS X now

2011-03-07 05:09:29 +03:00