1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-29 03:45:32 +00:00
openmw-tes3mp/apps/openmw
cc9cii 312b7cd571 Merge branch 'master' into QtOGre
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/pagedworldspacewidget.cpp
	apps/opencs/view/render/pagedworldspacewidget.hpp
	components/nif/niffile.hpp
	libs/openengine/bullet/physic.hpp
2014-09-30 10:52:04 +10:00
..
mwbase Don't trigger OnPcHitMe for friendly hits (Fixes #1950) 2014-09-26 22:08:07 +02:00
mwclass Don't trigger OnPcHitMe for friendly hits (Fixes #1950) 2014-09-26 22:08:07 +02:00
mwdialogue Fix cppcheck issues 2014-09-26 17:48:14 +02:00
mwgui Fix cppcheck issues 2014-09-26 17:48:14 +02:00
mwinput Bind to scancodes instead of keycodes 2014-09-13 20:39:59 +02:00
mwmechanics Merge branch 'master' into QtOGre 2014-09-30 10:52:04 +10:00
mwrender Merge branch 'master' into QtOGre 2014-09-30 10:52:04 +10:00
mwscript Fix cppcheck issues 2014-09-26 17:48:14 +02:00
mwsound Fix cppcheck issues 2014-09-26 17:48:14 +02:00
mwstate Merge branch 'master' into QtOGre 2014-09-30 10:52:04 +10:00
mwworld Merge branch 'master' into QtOGre 2014-09-30 10:52:04 +10:00
android_main.c fixe all code v 2 2014-08-06 00:46:21 +04:00
CMakeLists.txt Add properties for new widget classes to MyGUI plugin 2014-09-25 16:25:08 +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 Add basic framework to retrieve font colors from fallback settings (Feature #704) 2014-09-19 11:53:35 +02: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