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
|
c10c146ad1
|
Skeleton based bounding box callback for RigGeometry (Bug #455)
|
2015-03-26 23:15:46 +01:00 |
|
scrawl
|
9242e6d256
|
Avoid copying keyframes in controller instances
|
2015-03-22 23:47:49 +01:00 |
|
scrawl
|
6b36e55a4e
|
NIF reader cleanup: move definitions to cpp file
|
2015-02-22 19:17:28 +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 |
|