History

Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers

Anthony J. Thibault committed 11 years ago

Commit aa666912 parents dbc18ce 9209e078 files · +35 −79Browse files

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

Unified · Split

interface/src/Menu.cpp+7−4
@@ -244,16 +244,16 @@ Menu::Menu() { · 243 unmodified lines
244244 SLOT(resetSize()));
245245
246246 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::KeyboardMotorControl,
247− Qt::CTRL | Qt::SHIFT | Qt::Key_K, true, avatar, SLOT(updateMotionBehavior()));
247+ Qt::CTRL | Qt::SHIFT | Qt::Key_K, true, avatar, SLOT(updateMotionBehaviorFromMenu()));
248248 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::ScriptedMotorControl, 0, true,
249− avatar, SLOT(updateMotionBehavior()));
249+ avatar, SLOT(updateMotionBehaviorFromMenu()));
250250 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::NamesAboveHeads, 0, true);
251251 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::GlowWhenSpeaking, 0, true);
252252 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::BlueSpeechSphere, 0, true);
253253 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::EnableCharacterController, 0, true,
254− avatar, SLOT(updateMotionBehavior()));
254+ avatar, SLOT(updateMotionBehaviorFromMenu()));
255255 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::ShiftHipsForIdleAnimations, 0, false,
256− avatar, SLOT(updateMotionBehavior()));
256+ avatar, SLOT(updateMotionBehaviorFromMenu()));
257257
258258 MenuWrapper* viewMenu = addMenu("View");
259259 {
@@ -325,6 +325,9 @@ Menu::Menu() { · 65 unmodified lines
325325
326326 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::TurnWithHead, 0, false);
327327
328+ addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::StandingHMDSensorMode, 0, false,
329+ avatar, SLOT(updateStandingHMDModeFromMenu()));
330+
328331 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Stats);
329332 addActionToQMenuAndActionHash(viewMenu, MenuOption::Log,
330333 Qt::CTRL | Qt::SHIFT | Qt::Key_L,

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