1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-31 21:45:33 +00:00
openmw-tes3mp/components
scrawl 22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
2015-05-23 20:33:44 +02:00
..
bsa Remove strings.h wrapper 2015-05-10 00:36:04 +02:00
compiler Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
config Warning fix 2015-03-03 11:24:23 +01:00
contentselector Multi-select + context menu. (Fixes #2480) 2015-05-04 14:52:47 +12:00
esm Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-23 20:33:44 +02:00
esmterrain Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-03-27 17:30:48 +01:00
files Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-04 02:41:50 +02:00
fontloader GUI cleanup fix 2015-05-03 18:35:29 +02:00
interpreter Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-23 20:33:44 +02:00
loadinglistener Show wallpaper when loading a savegame 2014-06-02 23:26:43 +02:00
misc Add back resource handling workarounds to the gui code 2015-05-01 18:37:24 +02:00
myguiplatform Implement UI scaling factor 2015-05-15 00:41:21 +02:00
nif Move toMatrix to Nif::Node 2015-05-07 21:17:15 +02:00
nifbullet BulletShapeManager kf loading fix 2015-05-12 16:49:53 +02:00
nifosg Move toMatrix to Nif::Node 2015-05-07 21:17:15 +02:00
process OSX build fix 2014-11-20 18:14:49 +01:00
resource Apply texture filter setting changes 2015-05-14 21:42:04 +02:00
sceneutil Fix incorrect rotation for meshes with BoneOffset 2015-05-20 04:09:21 +02:00
sdlutil Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-23 20:33:44 +02:00
settings Rewrite game settings manager 2015-02-05 04:18:42 +01:00
terrain Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-04 02:41:50 +02:00
to_utf8 Remove some outdated todo comments 2015-03-12 00:27:01 +01:00
translation Fix cppcheck issues 2014-09-26 17:48:14 +02:00
version Distinguish between release and development builds 2014-01-23 13:18:05 +01:00
vfs Remove strings.h wrapper 2015-05-10 00:36:04 +02:00
widgets Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-04 02:41:50 +02:00
CMakeLists.txt Apply video mode & gamma setting changes 2015-05-14 20:31:16 +02:00
doc.hpp second set of additional doxygen comments 2010-09-25 20:15:05 +02:00