Marc Zinnschlag 030c733e2d Merge branch 'master' into savedgame ... Conflicts: apps/openmw/mwmechanics/actors.cpp apps/openmw/mwworld/worldimp.cpp files/settings-default.cfg		2013-12-07 12:27:06 +01:00
..
mwbase	Merge branch 'master' into savedgame	2013-12-07 12:27:06 +01:00
mwclass	Cap enchantment casting cost to 1 as displayed in enchanting window. Display current enchantment charge in spell window.	2013-11-23 23:12:54 +01:00
mwdialogue	deal with dialogue/info records that don't exist anymore	2013-12-03 14:39:54 +01:00
mwgui	Merge branch 'master' into savedgame	2013-12-07 12:27:06 +01:00
mwinput	Merge branch 'master' into savedgame	2013-12-07 12:27:06 +01:00
mwmechanics	Merge branch 'master' into savedgame	2013-12-07 12:27:06 +01:00
mwrender	Merge branch 'master' into savedgame	2013-12-07 12:27:06 +01:00
mwscript	Merge branch 'master' into savedgame	2013-12-07 12:27:06 +01:00
mwsound	removed an outdated typedef and some dead code	2013-12-05 13:21:26 +01:00
mwstate	block saving while chargen is in progress	2013-12-05 14:56:30 +01:00
mwworld	Merge branch 'master' into savedgame	2013-12-07 12:27:06 +01:00
CMakeLists.txt	Merge branch 'master' into savedgame	2013-12-07 12:27:06 +01:00
config.hpp.cmake	another minor correction (fixing the previous one)	2011-07-08 16:16:06 +02:00
crashcatcher.cpp	Change is_debugger_attached to a different hack	2013-11-16 18:15:54 +01:00
doc.hpp	first set of additional doxygen comments	2010-09-25 15:03:53 +02:00
engine.cpp	Merge branch 'master' into savedgame	2013-12-07 12:27:06 +01:00
engine.hpp	Merge branch 'master' into savedgame	2013-12-07 12:27:06 +01:00
main.cpp	Merge branch 'master' into savedgame	2013-12-07 12:27:06 +01:00