Merge branch 'ryzom/ark/features' into yubo

fix_opengl_on_mac
Ulukyn 5 years ago
commit 0ac92bc08b

@ -2339,8 +2339,8 @@ int CLuaIHMRyzom::addShape(CLuaState &ls)
NLMISC::CAABBox bbox;
instance.getShapeAABBox(bbox);
primitive->setReactionType(UMovePrimitive::DoNothing);
primitive->setTriggerType(UMovePrimitive::OverlapStairsTrigger);
primitive->setReactionType(UMovePrimitive::Slide);
primitive->setTriggerType(UMovePrimitive::NotATrigger);
primitive->setAbsorbtion(0);
primitive->setPrimitiveType(UMovePrimitive::_2DOrientedBox);
@ -2349,10 +2349,10 @@ int CLuaIHMRyzom::addShape(CLuaState &ls)
primitive->setCollisionMask(MaskColPlayer | MaskColNpc | MaskColDoor);
primitive->setOcclusionMask(MaskColPlayer | MaskColNpc | MaskColDoor);
primitive->setObstacle(false);
primitive->setObstacle(true);
primitive->setGlobalPosition(instance.getPos()+CVector(0, 0, 0.5f), dynamicWI);
primitive->setGlobalPosition(instance.getPos(), dynamicWI);
primitive->insertInWorldImage(dynamicWI);
}

Loading…
Cancel
Save