Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Revert "Merge remote-tracking branch 'origin/ryzom/ark/features' into ryzom/ark/features"

Browse Source 
This reverts commit a6ee9fec63.
ryzom/ark/features
Ulukyn 5 years ago
parent a6ee9fec63
commit 34c1265bce
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
Unescape Escape View File

@ -2339,8 +2339,8 @@ int CLuaIHMRyzom::addShape(CLuaState &ls)
NLMISC::CAABBox bbox; NLMISC::CAABBox bbox;
instance.getShapeAABBox(bbox); instance.getShapeAABBox(bbox);
primitive->setReactionType(UMovePrimitive::DoNothing); primitive->setReactionType(UMovePrimitive::Slide);
primitive->setTriggerType(UMovePrimitive::OverlapStairsTrigger); primitive->setTriggerType(UMovePrimitive::NotATrigger);
primitive->setAbsorbtion(0); primitive->setAbsorbtion(0);
primitive->setPrimitiveType(UMovePrimitive::_2DOrientedBox); primitive->setPrimitiveType(UMovePrimitive::_2DOrientedBox);
@ -2349,10 +2349,10 @@ int CLuaIHMRyzom::addShape(CLuaState &ls)
primitive->setCollisionMask(MaskColPlayer | MaskColNpc | MaskColDoor); primitive->setCollisionMask(MaskColPlayer | MaskColNpc | MaskColDoor);
primitive->setOcclusionMask(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); primitive->insertInWorldImage(dynamicWI);
} }

Write Preview
Loading…
Cancel
Save