1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-19 20:23:54 +00:00
openmw/components/nif
scrawl e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
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
2015-05-04 02:41:50 +02:00
..
tests Revert "components/nif/base.hpp now uses the templated get() function" 2015-01-06 23:36:15 +01:00
base.hpp NIF reader cleanup: move definitions to cpp file 2015-02-22 19:17:28 +01:00
controlled.cpp Implement gravity decay (previously unknown float) 2015-04-20 00:37:17 +02:00
controlled.hpp Implement gravity decay (previously unknown float) 2015-04-20 00:37:17 +02:00
controller.cpp Implement planar collider for particles (Fixes #2149) 2015-03-25 04:57:01 +01:00
controller.hpp Implement planar collider for particles (Fixes #2149) 2015-03-25 04:57:01 +01:00
data.cpp Change triangle indices to unsigned 2015-04-21 20:56:16 +02:00
data.hpp Change triangle indices to unsigned 2015-04-21 20:56:16 +02:00
effect.cpp Add OSG nifloader, currently supports geometry, materials, basic texturing, skinning, morphing, and most controllers. 2015-02-23 21:06:10 +01:00
effect.hpp NIF reader cleanup: move definitions to cpp file 2015-02-22 19:17:28 +01:00
extra.cpp Add OSG nifloader, currently supports geometry, materials, basic texturing, skinning, morphing, and most controllers. 2015-02-23 21:06:10 +01:00
extra.hpp NIF reader cleanup: move definitions to cpp file 2015-02-22 19:17:28 +01:00
niffile.cpp Add skinning auto-detection in nifosg loader 2015-03-25 15:39:41 +01:00
niffile.hpp Dead code removal 2015-04-25 01:28:01 +02:00
nifkey.hpp silenced a warning (potentially unintialised variable) 2015-04-28 14:06:52 +02:00
nifstream.cpp Change triangle indices to unsigned 2015-04-21 20:56:16 +02:00
nifstream.hpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-04 02:41:50 +02:00
niftypes.hpp Change rotation/scale workaround in preparation for loading .kf controllers 2015-03-22 22:55:35 +01:00
node.cpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-03-27 17:30:48 +01:00
node.hpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-03-27 17:30:48 +01:00
property.cpp Add OSG nifloader, currently supports geometry, materials, basic texturing, skinning, morphing, and most controllers. 2015-02-23 21:06:10 +01:00
property.hpp Fully implement NiStencilProperty (Feature #1057) 2015-03-24 23:05:20 +01:00
record.hpp NIF reader cleanup: move definitions to cpp file 2015-02-22 19:17:28 +01:00
recordptr.hpp fixed warning C4099: 2015-03-06 21:36:42 +13:00