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 |
|
scrawl
|
d9d84bd7b2
|
Remove bullet raycasting shapes, to be replaced with OSG ray casts
|
2015-05-01 21:43:21 +02:00 |
|
Rohit Nirmal
|
997347b01e
|
Silence -Wreorder warnings.
|
2015-04-28 18:48:02 -05:00 |
|
dteviot
|
407cd50890
|
fixed warning C4099:
type name first seen using 'class' now seen using 'struct'
|
2015-03-06 21:36:42 +13:00 |
|
scrawl
|
f11ec653d0
|
Add setting for showing MRK nodes to NIF loaders
This makes marker objects show up in OpenCS.
|
2015-01-13 17:29:25 +01:00 |
|
scrawl
|
883f7ec7ce
|
Move workaround for hiding markers from NIF loader to Scene
|
2015-01-13 17:19:39 +01:00 |
|
scrawl
|
41b3a9dba9
|
Rewrite animated collision shape support (Fixes #2123)
|
2015-01-13 05:37:37 +01:00 |
|
scrawl
|
04d6cead3b
|
Autogenerated collision should only be disabled if RootCollisionNode is a child of the root node (Fixes #2133)
|
2015-01-12 23:29:57 +01:00 |
|
scrawl
|
0b34d8d2fd
|
Add support for animated collision shapes (Fixes #1549)
|
2014-06-23 20:43:24 +02:00 |
|
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.
|
2014-06-21 23:37:16 +02:00 |
|
scrawl
|
7dc30a01cd
|
Some changes suggested by cppcheck
|
2013-07-31 18:46:32 +02:00 |
|
scrawl
|
e30af28860
|
Markers should still have collision if they have a NiRootCollisionNode
|
2013-03-14 19:03:42 +01:00 |
|
scrawl
|
84afd87321
|
Placeable objects should not collide unless they have a NiRootCollisionNode
|
2013-03-14 03:04:02 +01:00 |
|
scrawl
|
d7c4a622cf
|
Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack
|
2013-03-08 23:46:25 +01:00 |
|
Nathan Jeffords
|
109dff2d29
|
renamed high level NIF files...
|
2013-03-02 13:23:09 -08:00 |
|