History

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

interface/src/Application.cpp+0−11
@@ -987,12 +987,6 @@ void Application::keyPressEvent(QKeyEvent* event) { · 986 unmodified lines
987987 resetSensors();
988988 break;
989989
990− case Qt::Key_G:
991− if (isShifted) {
992− Menu::getInstance()->triggerOption(MenuOption::ObeyEnvironmentalGravity);
993− }
994− break;
995−
996990 case Qt::Key_A:
997991 if (isShifted) {
998992 Menu::getInstance()->triggerOption(MenuOption::Atmosphere);
@@ -1165,10 +1159,6 @@ void Application::keyPressEvent(QKeyEvent* event) { · 166 unmodified lines
11651159 break;
11661160 }
11671161
1168− case Qt::Key_Comma: {
1169− _myAvatar->togglePhysicsEnabled();
1170− }
1171−
11721162 default:
11731163 event->ignore();
11741164 break;
@@ -2192,7 +2182,6 @@ void Application::update(float deltaTime) { · 1017 unmodified lines
21922182
21932183 {
21942184 PerformanceTimer perfTimer("physics");
2195− _myAvatar->preSimulation();
21962185 _physicsEngine.stepSimulation();
21972186 }
21982187