Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 12:53:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #383 from PhilipRosedale/master

Browse source 
Fix linux build, pair to own menu
This commit is contained in:
Philip Rosedale 2013-05-22 12:57:21 -07:00
commit a55def02f3
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -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);

2
interface/src/Avatar.cpp
View file

@ -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;

1
interface/src/Transmitter.cpp
View file

@ -12,6 +12,7 @@
#include <cstring>
#include <glm/glm.hpp>
#include "Log.h"
#include <stdint.h>
const float DELTA_TIME = 1.f / 60.f;
const float DECAY_RATE = 0.15f;