History

Merge branch 'master' of https://github.com/worklist/hifi into 19461

Stojce Slavkovski committed 12 years ago

Commit 841d4912 parents 365d1ee 4852aca14 files · +177 −71Browse files

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

Unified · Split

interface/src/Menu.cpp+4−1
@@ -374,7 +374,10 @@ Menu::Menu() : · 373 unmodified lines
374374 addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayLeapHands, 0, true);
375375 addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::LeapDrive, 0, false);
376376 addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayHandTargets, 0, false);
377− addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::BallFromHand, 0, false);
377+ addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::BallFromHand, 0, false);
378+ addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::VoxelDrumming, 0, false);
379+ addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::PlaySlaps, 0, false);
380+
378381
379382
380383 QMenu* trackingOptionsMenu = developerMenu->addMenu("Tracking Options");

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