Commit Graph

25 Commits (a083439139b883b260605fac90d6304ea293effa)

Author SHA1 Message Date
Andrei Kortunov ec9a1b0d05 Handle RootCollisionNode, attached to non-root node (bug #4311) 6 years ago
scrawl 03554b2f4b Fix some style issues flagged by cppcheck 7 years ago
scrawl 8cf57ef6ac Move BulletShapeManager and BulletShape to resource/ 9 years ago
scrawl cdc47fa874 Remove BulletNifLoader dependency on keyframe manager
This will make threaded loading easier.
9 years ago
scrawl fe439e53ff Bullet include cleanup 9 years ago
scrawl 65f0195c71 Readded animated collision shape support 9 years ago
scrawl 47758c11cd Readded collision objects and movement physics 9 years ago
scrawl c843cfc8e2 Physics stub in preparation for rewrite 9 years ago
scrawl 48ffeab191 Remove old BulletShapeManager 9 years ago
scrawl 604580d75d Move toMatrix to Nif::Node 9 years ago
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
9 years ago
scrawl d9d84bd7b2 Remove bullet raycasting shapes, to be replaced with OSG ray casts 9 years ago
Rohit Nirmal 997347b01e Silence -Wreorder warnings. 9 years ago
dteviot 407cd50890 fixed warning C4099:
type name first seen using 'class' now seen using 'struct'
9 years ago
scrawl f11ec653d0 Add setting for showing MRK nodes to NIF loaders
This makes marker objects show up in OpenCS.
9 years ago
scrawl 883f7ec7ce Move workaround for hiding markers from NIF loader to Scene 9 years ago
scrawl 41b3a9dba9 Rewrite animated collision shape support (Fixes #2123) 9 years ago
scrawl 04d6cead3b Autogenerated collision should only be disabled if RootCollisionNode is a child of the root node (Fixes #2133) 9 years ago
scrawl 0b34d8d2fd Add support for animated collision shapes (Fixes #1549) 10 years ago
scrawl e002acdeae Physics: Create actor shapes outside of BulletNifLoader
This will allow to create a specialised shape instead, such as a capsule, which tends to work better for character controllers.
10 years ago
scrawl 7dc30a01cd Some changes suggested by cppcheck 11 years ago
scrawl e30af28860 Markers should still have collision if they have a NiRootCollisionNode 11 years ago
scrawl 84afd87321 Placeable objects should not collide unless they have a NiRootCollisionNode 11 years ago
scrawl d7c4a622cf Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack 11 years ago
Nathan Jeffords 109dff2d29 renamed high level NIF files... 11 years ago