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
353353 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::RenderSkeletonCollisionShapes);
354354 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::RenderHeadCollisionShapes);
355355 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::RenderBoundingCollisionShapes);
356+ addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::CollideAsRagDoll);
356357
357358 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::LookAtVectors, 0, false);
358359 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t