1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 15:19:55 +00:00
openmw-tes3mp/files
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
..
launcher Merge branch 'master' into HEAD 2014-11-18 17:43:51 +01:00
mac renamed opencs into openmw-cs 2015-02-03 13:18:03 +01:00
mygui Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-23 20:33:44 +02:00
opencs renamed opencs into openmw-cs 2015-02-03 13:18:03 +01:00
ui Multi-select + context menu. (Fixes #2480) 2015-05-04 14:52:47 +12:00
windows renamed opencs into openmw-cs 2015-02-03 13:18:03 +01:00
wizard Added some eye-candy to the wizard: a watermark and a placeholder icon 2014-03-17 17:50:51 +01:00
CMakeLists.txt Remove unused mygui files 2015-05-03 17:26:12 +02:00
gamecontrollerdb.txt gamecontrollerdb.txt updated from upstream, added link and license 2015-02-27 22:37:29 +01:00
opencs.ini Removed all content from opencs.ini 2014-10-16 14:50:25 +02:00
openmw-cs.desktop renamed opencs into openmw-cs 2015-02-03 13:18:03 +01:00
openmw.bmp Some improvments for windows builds and installer 2012-04-19 14:58:27 +02:00
openmw.cfg label local/global openmw.cfg files (Fixes #2196) 2014-12-08 20:08:59 +01:00
openmw.cfg.local label local/global openmw.cfg files (Fixes #2196) 2014-12-08 20:08:59 +01:00
openmw.desktop Revert "Add freedesktop.org mimeinfo for OpenMW save game files" 2015-02-07 23:24:27 +01:00
settings-default.cfg Settings file cleanup 2015-05-22 20:15:50 +02:00