scrawl
|
236d628884
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/documentmanager.cpp
components/CMakeLists.txt
components/bsa/resources.cpp
components/nif/data.hpp
components/nif/node.cpp
components/nifogre/mesh.hpp
components/nifogre/ogrenifloader.cpp
components/nifogre/particles.cpp
|
2015-03-27 17:30:48 +01:00 |
|
scrawl
|
b7867d6f0a
|
Stop warning about unused nif properties
|
2015-03-25 05:29:00 +01:00 |
|
scrawl
|
8c10d4badb
|
NIF reader compiles without Ogre
|
2015-02-17 17:08:55 +01:00 |
|
scrawl
|
b650338d69
|
Implement drawMode of NiStencilProperty (Feature #1057)
|
2014-12-03 18:28:35 +01:00 |
|
scrawl
|
e6c59f5585
|
Revert "Allow NIF rotation matrices that include scale values"
This reverts commit f57ddec6a2.
Conflicts:
components/nif/nifstream.hpp
(Fixes #2168)
|
2014-12-03 18:28:35 +01:00 |
|
scrawl
|
f57ddec6a2
|
Allow NIF rotation matrices that include scale values (Fixes #2052)
|
2014-10-27 21:53:00 +01:00 |
|
Arthur Moore
|
8be6aefd95
|
Moved functions from niffile.cpp to where they belong.
Also cleaned up some #includes
Removed a few asserts. Vector already throws an out_of_range error.
|
2014-08-24 13:45:36 -04:00 |
|