You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
openmw-tes3coop/components/sdlutil
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
10 years ago
..
OISCompat.hpp Readded input & event handling 10 years ago
events.hpp Readded input & event handling 10 years ago
imagetosurface.cpp Readded HW cursor manager (no image rotation yet) 10 years ago
imagetosurface.hpp Readded HW cursor manager (no image rotation yet) 10 years ago
sdlcursormanager.cpp Minor addition to reading display 10 years ago
sdlcursormanager.hpp Readded HW cursor manager (no image rotation yet) 10 years ago
sdlgraphicswindow.cpp Readded HW cursor manager (no image rotation yet) 10 years ago
sdlgraphicswindow.hpp Silence an annoying message 10 years ago
sdlinputwrapper.cpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 10 years ago
sdlinputwrapper.hpp Readded input & event handling 10 years ago
sdlvideowrapper.cpp Apply video mode & gamma setting changes 10 years ago
sdlvideowrapper.hpp Apply video mode & gamma setting changes 10 years ago