History

Merge pull request #2994 from AndrewMeadows/ragdoll

Ragdoll Part 2: make MyAvatar's skeleton's collision shapes follow ragdoll

Andrzej Kapolka committed 12 years ago

Commit 28490f92 parents e936697 4f9da0c9 files · +101 −26Browse files

Showing the changes to interface/src/Menu.cpp (1 of 9 files). Show all

Unified · Split

interface/src/Menu.cpp+1−0
@@ -353,6 +353,7 @@ Menu::Menu() : · 352 unmodified lines
353 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::RenderSkeletonCollisionShapes);353 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::RenderSkeletonCollisionShapes);
354 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::RenderHeadCollisionShapes);354 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::RenderHeadCollisionShapes);
355 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::RenderBoundingCollisionShapes);355 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::RenderBoundingCollisionShapes);
356 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::CollideAsRagDoll);
356 357
357 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::LookAtVectors, 0, false);358 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::LookAtVectors, 0, false);
358 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu,359 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu,