mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-09 03:39:14 +00:00
e1f4a7f647
Conflicts: apps/openmw/engine.cpp apps/openmw/mwgui/mainmenu.cpp apps/openmw/mwgui/windowmanagerimp.cpp apps/openmw/mwinput/inputmanagerimp.cpp apps/openmw/mwrender/animation.cpp apps/openmw/mwrender/debugging.cpp apps/openmw/mwrender/npcanimation.cpp apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwrender/sky.cpp components/nif/nifkey.hpp components/nif/nifstream.hpp components/nifbullet/bulletnifloader.cpp components/nifogre/ogrenifloader.hpp libs/openengine/bullet/physic.cpp libs/openengine/gui/manager.cpp |
||
---|---|---|
.. | ||
buffercache.cpp | ||
buffercache.hpp | ||
chunk.cpp | ||
chunk.hpp | ||
defaultworld.cpp | ||
defaultworld.hpp | ||
defs.hpp | ||
material.cpp | ||
material.hpp | ||
quadtreenode.cpp | ||
quadtreenode.hpp | ||
storage.cpp | ||
storage.hpp | ||
terraingrid.cpp | ||
terraingrid.hpp | ||
world.cpp | ||
world.hpp |