mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-16 09:49:55 +00:00
6047dc6a0c
Conflicts: apps/openmw/mwrender/animation.cpp apps/openmw/mwrender/animation.hpp apps/openmw/mwrender/creatureanimation.cpp apps/openmw/mwrender/npcanimation.cpp apps/openmw/mwrender/npcanimation.hpp components/nifogre/ogre_nif_loader.hpp |
||
---|---|---|
.. | ||
tests | ||
.gitignore | ||
controlled.hpp | ||
controller.hpp | ||
data.hpp | ||
effect.hpp | ||
extra.hpp | ||
nif_file.cpp | ||
nif_file.hpp | ||
nif_types.hpp | ||
node.hpp | ||
property.hpp | ||
record.hpp | ||
record_ptr.hpp |