1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-25 06:35:30 +00:00
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
..
2015-04-22 17:58:55 +02:00
2015-04-25 15:19:17 +02:00
2015-02-05 04:18:42 +01:00
2015-04-28 18:48:02 -05:00
2014-10-10 23:31:01 +02:00
2015-03-06 21:36:42 +13:00
2015-03-06 21:36:42 +13:00
2015-04-22 17:58:55 +02:00
2014-10-20 17:45:11 +02:00
2015-03-12 03:08:58 +01:00
2015-04-22 17:58:55 +02:00
2015-04-22 17:58:55 +02:00
2015-04-22 17:58:55 +02:00
2015-02-15 20:10:21 -06:00
2014-02-01 18:16:32 +01:00
2014-01-20 13:11:29 +01:00
2015-05-02 22:45:39 +02:00
2015-03-06 21:36:42 +13:00
2015-04-22 17:58:55 +02:00
2015-04-22 17:58:55 +02:00
2013-03-23 08:16:46 +01:00
2015-04-22 17:58:55 +02:00
2013-05-19 23:19:48 +02:00
2015-04-22 17:58:55 +02:00
2015-03-06 21:36:42 +13:00
2014-04-27 13:49:31 +04:00
2014-04-27 13:49:31 +04:00
2015-04-19 17:55:56 +02:00