History

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

Atlante45 committed 11 years ago

Commit bcfd4b52 parents bfbc8ff 356dbbe55 files · +478 −3756Browse files

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

Unified · Split

interface/src/Menu.cpp+0−9
@@ -198,7 +198,6 @@ Menu::Menu() { · 197 unmodified lines
198 Qt::CTRL | Qt::SHIFT | Qt::Key_K, true, avatar, SLOT(updateMotionBehavior()));198 Qt::CTRL | Qt::SHIFT | Qt::Key_K, true, avatar, SLOT(updateMotionBehavior()));
199 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::ScriptedMotorControl, 0, true,199 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::ScriptedMotorControl, 0, true,
200 avatar, SLOT(updateMotionBehavior()));200 avatar, SLOT(updateMotionBehavior()));
201 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::ChatCircling, 0, false);
202 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::NamesAboveHeads, 0, true);201 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::NamesAboveHeads, 0, true);
203 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::GlowWhenSpeaking, 0, true);202 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::GlowWhenSpeaking, 0, true);
204 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::BlueSpeechSphere, 0, true);203 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::BlueSpeechSphere, 0, true);
@@ -209,14 +208,6 @@ Menu::Menu() { · 4 unmodified lines
209 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::ShiftHipsForIdleAnimations, 0, false,208 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::ShiftHipsForIdleAnimations, 0, false,
210 avatar, SLOT(updateMotionBehavior()));209 avatar, SLOT(updateMotionBehavior()));
211 210
212 QMenu* collisionsMenu = avatarMenu->addMenu("Collide With");
213 addCheckableActionToQMenuAndActionHash(collisionsMenu, MenuOption::CollideAsRagdoll, 0, false,
214 avatar, SLOT(onToggleRagdoll()));
215 addCheckableActionToQMenuAndActionHash(collisionsMenu, MenuOption::CollideWithAvatars,
216 0, true, avatar, SLOT(updateCollisionGroups()));
217 addCheckableActionToQMenuAndActionHash(collisionsMenu, MenuOption::CollideWithEnvironment,
218 0, false, avatar, SLOT(updateCollisionGroups()));
219
220 QMenu* viewMenu = addMenu("View");211 QMenu* viewMenu = addMenu("View");
221 212
222#ifdef Q_OS_MAC213#ifdef Q_OS_MAC