diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index e6119a71e7..d56163e170 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1192,8 +1192,10 @@ void Application::initMenu() { _window->setMenuBar(menuBar); QMenu* fileMenu = menuBar->addMenu("File"); - fileMenu->addAction("Pair", this, SLOT(pair())); fileMenu->addAction("Quit", this, SLOT(quit()), Qt::Key_Q); + + QMenu* pairMenu = menuBar->addMenu("Pair"); + pairMenu->addAction("Pair", this, SLOT(pair())); QMenu* optionsMenu = menuBar->addMenu("Options"); (_lookingInMirror = optionsMenu->addAction("Mirror", this, SLOT(setHead(bool)), Qt::Key_H))->setCheckable(true); diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp index 12d14aafdf..9bf307d9b6 100644 --- a/interface/src/Avatar.cpp +++ b/interface/src/Avatar.cpp @@ -280,7 +280,7 @@ void Avatar::simulate(float deltaTime, Transmitter* transmitter) { const float TRANSMITTER_MIN_RATE = 1.f; const float TRANSMITTER_MIN_YAW_RATE = 4.f; const float TRANSMITTER_LATERAL_FORCE_SCALE = 25.f; - const float TRANSMITTER_FWD_FORCE_SCALE = 25.f; + const float TRANSMITTER_FWD_FORCE_SCALE = 100.f; const float TRANSMITTER_YAW_SCALE = 10.0f; const float TRANSMITTER_LIFT_SCALE = 3.f; const float TOUCH_POSITION_RANGE_HALF = 32767.f; diff --git a/interface/src/Transmitter.cpp b/interface/src/Transmitter.cpp index 5f6def92f7..d489e84d49 100644 --- a/interface/src/Transmitter.cpp +++ b/interface/src/Transmitter.cpp @@ -12,6 +12,7 @@ #include #include #include "Log.h" +#include const float DELTA_TIME = 1.f / 60.f; const float DECAY_RATE = 0.15f;