Marc Zinnschlag 52a6605f10 Merge remote branch 'mirc/refactor_wm' into refactor_wm ...

- changed the way dynamics stats are passed to the character creation object
- some more clean up

Conflicts:
	.gitignore
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp

2012-02-03 11:24:28 +01:00

..

mwclass

general cleanup

2012-01-27 15:11:02 +01:00

mwdialogue

accessing topic index didn't work

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

mwgui

Merge remote branch 'mirc/refactor_wm' into refactor_wm

2012-02-03 11:24:28 +01:00

mwinput

Add the journal window (J key). It's still not in the right position.

2011-11-28 16:51:11 +01:00

mwmechanics

Empty npcs

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

mwrender

Removed all physics-related code from Engine

2012-01-29 20:51:20 +02:00

mwscript

replaced NPC stats in ref data with new custom data implementation

2012-01-25 16:56:49 +01:00

mwsound

Issue #19: Finished cleaning out the Engine framelistener

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

mwworld

Merge branch 'refdata' into next

2012-01-30 12:38:35 +01:00

CMakeLists.txt

Merge remote branch 'mirc/refactor_wm' into refactor_wm

2012-02-03 11:24:28 +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

Removed all physics-related code from Engine

2012-01-29 20:51:20 +02:00

engine.hpp

Removed all physics-related code from Engine

2012-01-29 20:51:20 +02:00

main.cpp

Merge branch 'animation2'

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