mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-09 21:42:13 +00:00
22f01b1232
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 |
||
---|---|---|
.. | ||
settings | ||
utils | ||
CMakeLists.txt | ||
datafilespage.cpp | ||
datafilespage.hpp | ||
graphicspage.cpp | ||
graphicspage.hpp | ||
main.cpp | ||
maindialog.cpp | ||
maindialog.hpp | ||
playpage.cpp | ||
playpage.hpp | ||
settingspage.cpp | ||
settingspage.hpp | ||
textslotmsgbox.cpp | ||
textslotmsgbox.hpp |