Showing the changes to interface/src/Menu.cpp (1 of 158 files). Show all
Unified · Split
| @@ -42,7 +42,7 @@ Menu* Menu::getInstance() { · 41 unmodified lines | ||
| 42 | 42 | menuInstanceMutex.lock(); |
| 43 | 43 | |
| 44 | 44 | if (!_instance) { |
| 45 | − qDebug("First call to Menu::getInstance() - initing menu.\n"); | |
| 45 | + qDebug("First call to Menu::getInstance() - initing menu."); | |
| 46 | 46 | |
| 47 | 47 | _instance = new Menu(); |
| 48 | 48 | } |
| @@ -824,6 +824,10 @@ void Menu::editPreferences() { · 775 unmodified lines | ||
| 824 | 824 | leanScale->setValue(applicationInstance->getAvatar()->getLeanScale()); |
| 825 | 825 | form->addRow("Lean Scale:", leanScale); |
| 826 | 826 | |
| 827 | + QDoubleSpinBox* avatarScale = new QDoubleSpinBox(); | |
| 828 | + avatarScale->setValue(applicationInstance->getAvatar()->getScale()); | |
| 829 | + form->addRow("Avatar Scale:", avatarScale); | |
| 830 | + | |
| 827 | 831 | QSpinBox* audioJitterBufferSamples = new QSpinBox(); |
| 828 | 832 | audioJitterBufferSamples->setMaximum(10000); |
| 829 | 833 | audioJitterBufferSamples->setMinimum(-10000); |
| @@ -887,6 +891,7 @@ void Menu::editPreferences() { · 57 unmodified lines | ||
| 887 | 891 | _maxVoxelPacketsPerSecond = maxVoxelsPPS->value(); |
| 888 | 892 | |
| 889 | 893 | applicationInstance->getAvatar()->setLeanScale(leanScale->value()); |
| 894 | + applicationInstance->getAvatar()->setClampedTargetScale(avatarScale->value()); | |
| 890 | 895 | |
| 891 | 896 | _audioJitterBufferSamples = audioJitterBufferSamples->value(); |
| 892 | 897 | |
| @@ -973,7 +978,7 @@ void Menu::goToLocation() { · 80 unmodified lines | ||
| 973 | 978 | // send a node kill request, indicating to other clients that they should play the "disappeared" effect |
| 974 | 979 | NodeList::getInstance()->sendKillNode(&NODE_TYPE_AVATAR_MIXER, 1); |
| 975 | 980 | |
| 976 | − qDebug("Going To Location: %f, %f, %f...\n", x, y, z); | |
| 981 | + qDebug("Going To Location: %f, %f, %f...", x, y, z); | |
| 977 | 982 | myAvatar->setPosition(newAvatarPos); |
| 978 | 983 | } |
| 979 | 984 | } |
| @@ -994,8 +999,9 @@ void Menu::goToUser() { · 14 unmodified lines | ||
| 994 | 999 | int dialogReturn = userDialog.exec(); |
| 995 | 1000 | if (dialogReturn == QDialog::Accepted && !userDialog.textValue().isEmpty()) { |
| 996 | 1001 | // there's a username entered by the user, make a request to the data-server |
| 997 | − DataServerClient::getValuesForKeysAndUserString((QStringList() << DataServerKey::Domain << DataServerKey::Position), | |
| 998 | − userDialog.textValue()); | |
| 1002 | + DataServerClient::getValuesForKeysAndUserString( | |
| 1003 | + QStringList() << DataServerKey::Domain << DataServerKey::Position << DataServerKey::Orientation, | |
| 1004 | + userDialog.textValue()); | |
| 999 | 1005 | } |
| 1000 | 1006 | |
| 1001 | 1007 | sendFakeEnterEvent(); |
| @@ -1021,7 +1027,7 @@ void Menu::pasteToVoxel() { · 19 unmodified lines | ||
| 1021 | 1027 | if (locationToPaste == octalCodeToHexString(octalCodeDestination)) { |
| 1022 | 1028 | Application::getInstance()->pasteVoxelsToOctalCode(octalCodeDestination); |
| 1023 | 1029 | } else { |
| 1024 | − qDebug() << "problem with octcode...\n"; | |
| 1030 | + qDebug() << "Problem with octcode..."; | |
| 1025 | 1031 | } |
| 1026 | 1032 | } |
| 1027 | 1033 | |