krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
openmw-tes3coop/apps/opencs/view
History
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
..
doc Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
filter fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
render Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-23 20:33:44 +02:00
settings Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
tools focus search input field when opening search subview (Fixes #2534) 2015-05-14 14:48:29 +02:00
widget fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
world Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-23 20:33:44 +02:00