cc9cii 809b8c6d5b Conflicts: ... apps/opencs/view/render/pagedworldspacewidget.cpp		2014-10-12 05:54:21 +11:00
..
mwbase	More efficient water walking	2014-10-05 22:27:20 +02:00
mwclass	Merge remote-tracking branch 'jordan-ayers/topic/misc-cleanup'	2014-10-07 18:03:25 +02:00
mwdialogue	Don't allow raising faction rank if the next rank has no name (Fixes #1975)	2014-10-05 16:47:55 +02:00
mwgui	Conflicts:	2014-10-12 05:54:21 +11:00
mwinput	Fix not being able to move with 0/0 encumbrance (Fixes #1979)	2014-10-05 15:52:33 +02:00
mwmechanics	Merge remote-tracking branch 'jordan-ayers/topic/misc-cleanup'	2014-10-07 18:03:25 +02:00
mwrender	Conflicts:	2014-10-12 05:54:21 +11:00
mwscript	Fix HasSoulgem function to return number of soulgems	2014-10-06 14:56:49 +02:00
mwsound	Fix cppcheck issues	2014-09-26 17:48:14 +02:00
mwstate	Store levitation/teleport enabled state in savegames (Fixes #1923)	2014-09-24 12:21:19 +02:00
mwworld	Conflicts:	2014-10-12 05:54:21 +11:00
android_main.c	fixe all code v 2	2014-08-06 00:46:21 +04:00
CMakeLists.txt	Add debug window (F10), displays Bullet's profiler output	2014-09-28 18:02:49 +02:00
crashcatcher.cpp	Fix cppcheck issues	2014-09-26 17:48:14 +02:00
doc.hpp	first set of additional doxygen comments	2010-09-25 15:03:53 +02:00
engine.cpp	Cleanup: Don't call <environment obj>.get().	2014-10-05 18:12:55 -05:00
engine.hpp	Merge branch 'run'	2014-09-14 11:59:54 +02:00
main.cpp	Fix cppcheck issues	2014-09-26 17:48:14 +02:00