History

Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2

Wayne Chen committed 8 years ago

Commit f66326f2 parents f4ae55d 3fabe55142 files · +3892 −23Browse files

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

Unified · Split

interface/src/Menu.cpp+2−0
@@ -360,6 +360,8 @@ Menu::Menu() { · 359 unmodified lines
360360 qApp->setHmdTabletBecomesToolbarSetting(action->isChecked());
361361 });
362362
363+ addCheckableActionToQMenuAndActionHash(uiOptionsMenu, MenuOption::Use3DKeyboard, 0, true);
364+
363365 // Developer > Render >>>
364366 MenuWrapper* renderOptionsMenu = developerMenu->addMenu("Render");
365367

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