Showing the changes to interface/src/Menu.cpp (1 of 3 files). Show all
Unified · Split
| @@ -161,7 +161,7 @@ Menu::Menu() : · 160 unmodified lines | |||
| 161 | #endif | 161 | #endif |
| 162 | 162 | ||
| 163 | addDisabledActionAndSeparator(editMenu, "Physics"); | 163 | addDisabledActionAndSeparator(editMenu, "Physics"); |
| 164 | addCheckableActionToQMenuAndActionHash(editMenu, MenuOption::Gravity, Qt::SHIFT | Qt::Key_G, true); | 164 | addCheckableActionToQMenuAndActionHash(editMenu, MenuOption::Gravity, Qt::SHIFT | Qt::Key_G, false); |
| 165 | 165 | ||
| 166 | 166 | ||
| 167 | addCheckableActionToQMenuAndActionHash(editMenu, MenuOption::ClickToFly); | 167 | addCheckableActionToQMenuAndActionHash(editMenu, MenuOption::ClickToFly); |
| @@ -339,14 +339,14 @@ Menu::Menu() : · 171 unmodified lines | |||
| 339 | addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::Avatars, 0, true); | 339 | addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::Avatars, 0, true); |
| 340 | addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::CollisionProxies); | 340 | addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::CollisionProxies); |
| 341 | 341 | ||
| 342 | addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::LookAtVectors, 0, true); | 342 | addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::LookAtVectors, 0, false); |
| 343 | addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, | 343 | addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, |
| 344 | MenuOption::FaceshiftTCP, | 344 | MenuOption::FaceshiftTCP, |
| 345 | 0, | 345 | 0, |
| 346 | false, | 346 | false, |
| 347 | appInstance->getFaceshift(), | 347 | appInstance->getFaceshift(), |
| 348 | SLOT(setTCPEnabled(bool))); | 348 | SLOT(setTCPEnabled(bool))); |
| 349 | addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::ChatCircling, 0, true); | 349 | addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::ChatCircling, 0, false); |
| 350 | 350 | ||
| 351 | QMenu* handOptionsMenu = developerMenu->addMenu("Hand Options"); | 351 | QMenu* handOptionsMenu = developerMenu->addMenu("Hand Options"); |
| 352 | 352 | ||
| @@ -356,7 +356,7 @@ Menu::Menu() : · 3 unmodified lines | |||
| 356 | true, | 356 | true, |
| 357 | appInstance->getSixenseManager(), | 357 | appInstance->getSixenseManager(), |
| 358 | SLOT(setFilter(bool))); | 358 | SLOT(setFilter(bool))); |
| 359 | addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayLeapHands, 0, true); | 359 | addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayHands, 0, true); |
| 360 | addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayHandTargets, 0, false); | 360 | addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayHandTargets, 0, false); |
| 361 | addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::VoxelDrumming, 0, false); | 361 | addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::VoxelDrumming, 0, false); |
| 362 | addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::PlaySlaps, 0, false); | 362 | addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::PlaySlaps, 0, false); |