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

ZappoMan committed 11 years ago

Commit 80df8ca2 parents 002fba8 80ecbed12 files · +171 −251Browse files

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

Unified · Split

                 resetSensors();
                 break;
-            case Qt::Key_G:
-                if (isShifted) {
-                    Menu::getInstance()->triggerOption(MenuOption::ObeyEnvironmentalGravity);
-                }
-                break;
             case Qt::Key_A:
                 if (isShifted) {
                     Menu::getInstance()->triggerOption(MenuOption::Atmosphere);
                 break;
             }
-            case Qt::Key_Comma: {
-                _myAvatar->togglePhysicsEnabled();
-            }
             default:
                 event->ignore();
                 break;
     {
         PerformanceTimer perfTimer("physics");
-        _myAvatar->preSimulation();
         _physicsEngine.stepSimulation();
     }