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-tes3mp/apps/launcher
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
..
settings the same for data-local entry 11 years ago
utils Fix some memory leaks 10 years ago
CMakeLists.txt Register Player in the PhysicsSystem 10 years ago
datafilespage.cpp Silence -Wreorder warnings. 10 years ago
datafilespage.hpp Fixed typo in comment. 10 years ago
graphicspage.cpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 10 years ago
graphicspage.hpp Remove OgreInit 10 years ago
main.cpp Fix #2557 10 years ago
maindialog.cpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 10 years ago
maindialog.hpp removed a redundant typedef 10 years ago
playpage.cpp Implemented Launcher namespace 11 years ago
playpage.hpp Implemented Launcher namespace 11 years ago
settingspage.cpp Silence -Wreorder warnings, and remove -Wno-reorder. 10 years ago
settingspage.hpp Morrowind.ini import progress bar. (Fixes #2344) 10 years ago
textslotmsgbox.cpp Implemented Launcher namespace 11 years ago
textslotmsgbox.hpp Implemented Launcher namespace 11 years ago