Commit graph

425 commits

Author SHA1 Message Date
Philip Rosedale
8e024982d5 Merge pull request #3301 from huffman/19864
Code Review for Job #19864
2014-08-19 20:48:30 -07:00
Andrew Meadows
1a8a2d9156 Add Avatar submenu to main menu for non-debug stuff 2014-08-19 17:26:01 -07:00
Ryan Huffman
284c4d8ac0 Merge branch 'master' of github.com:highfidelity/hifi into 19864
Conflicts:
	interface/CMakeLists.txt
2014-08-19 11:59:53 -07:00
Ryan Huffman
a2e7c9b75c Update build for speechRecognizer 2014-08-13 14:53:26 -07:00
Craig Hansen-Sturm
481108ecd1 added support for biquad, parametric, and multi-band filter eq 2014-08-10 22:47:27 -07:00
Ryan Huffman
9127ac24a0 Move speechRecognizer to Menu 2014-08-07 17:45:27 -07:00
wangyix
1eaf175a92 removed disable audio output overflow check menu option 2014-08-05 10:21:53 -07:00
Ryan Huffman
ffb178cb43 Add SpeechRecognizer 2014-08-01 13:44:06 -07:00
wangyix
a2945eaa96 qaudiooutput overflow check enabled by default 2014-07-30 12:52:35 -07:00
wangyix
efd4b7ad67 switched upstream/downstream stats; added menu item to disable injected stats 2014-07-30 12:04:03 -07:00
wangyix
ecfd5c2757 default max frames over desired changed to 10 2014-07-29 17:37:59 -07:00
wangyix
bcf9a3c20c changed default max frames over desired in client to 20 2014-07-29 17:17:10 -07:00
wangyix
d49970d010 maxFramesOverDesired added; settable from domain page and preferences 2014-07-29 15:57:32 -07:00
wangyix
145b7f8a0e got Preferences jitter buffer frames override working 2014-07-28 14:05:17 -07:00
wangyix
a36c9e872e merged with upstream 2014-07-23 15:36:37 -07:00
wangyix
1b2dc2cbe1 added central audio stats including pipeline latency; old stats still there 2014-07-22 14:21:53 -07:00
Brad Hefta-Gaub
fb097c77b5 Merge pull request #3186 from wangyix/master
made Audio::_ringBuffer size 10 frames for non-Windows builds; improved interface downstream audio framesAvailable stat; disable QAudioOutput overflow check by default
2014-07-21 14:50:15 -07:00
wangyix
05ea5f8d21 changed menu item name for QAudioOutput overflow check 2014-07-21 14:32:44 -07:00
barnold1953
03bc3a9ff8 Added checkable menu option for laser toggle 2014-07-21 12:35:46 -07:00
Philip Rosedale
e8539d0006 Merge pull request #3181 from birarda/master
foundation of support for signed transactions from interface
2014-07-17 16:03:28 -07:00
Stephen Birarda
45ae9f614d add dialog to Menu to insert wallet private key 2014-07-17 11:43:30 -07:00
Andrew Meadows
b22652f441 merge upstream/master into andrew/ragdoll 2014-07-17 10:52:27 -07:00
Atlante45
5dca794322 On/Off for activity logger 2014-07-16 12:22:27 -07:00
Andrew Meadows
922912b784 merge upstream/master into andrew/ragdoll
Conflicts:
	interface/src/Menu.h
2014-07-16 09:00:36 -07:00
Andrew Meadows
d832f5bec8 fix menu config of visible stats 2014-07-11 16:08:37 -07:00
Andrew Meadows
2046608fa8 enforce alphabetical sort of Menu option strings 2014-07-10 16:16:54 -07:00
Brad Hefta-Gaub
635cb380f2 Merge pull request #3151 from ctrlaltdavid/19860
Code Review for Job #19860
2014-07-09 18:35:01 -07:00
David Rowe
f2d49fa6a1 Rename focus indicators menu item and default to off 2014-07-09 15:12:29 -07:00
David Rowe
527f6b2a3f Fix User Interface menu item string 2014-07-09 11:32:38 -07:00
Clément Brisset
3f24feeb1d Merge pull request #3143 from PhilipRosedale/master
Add Low Velocity Filter for hand movement as menu option
2014-07-08 23:22:46 -07:00
Clément Brisset
2003dc41df Merge pull request #3138 from ctrlaltdavid/19836
Code Review for Job #19836
2014-07-08 23:16:32 -07:00
Philip Rosedale
c50d9ae3e4 Hand low velocity filter as a menu option 2014-07-08 22:22:27 -07:00
David Rowe
305623d8a7 Add option to hide focus indicators 2014-07-08 21:37:08 -07:00
wangyix
6ee52e97c8 added dev menu option to disable _audioOutput overflow check 2014-07-08 12:23:43 -07:00
David Rowe
8b04a9c8b6 Add toggle for user interface display
- "/" toggles UI (incl. stats if displayed); menu View > User Interface
- "%" = toggle status; menu View > Stats
- Acts on normal, 3DTV, and Oculus display.
2014-07-03 16:19:05 -07:00
Ryan Huffman
ccc638d8c1 Merge branch 'master' of git://github.com/highfidelity/hifi into 19800 2014-07-01 20:03:54 -07:00
Ryan Huffman
83349e0e53 Rename UserLocationsWindow to UserLocationsDialog 2014-07-01 20:03:05 -07:00
Ryan Huffman
51e42221be Update menu to toggle User Locations Menu 2014-06-30 22:24:27 -07:00
barnold1953
1cd2066e79 Added option to disable glow effect for 10fps boost for oculus 2014-06-30 17:13:47 -07:00
barnold1953
2727328729 Removed unneeded menu option 2014-06-30 16:46:25 -07:00
Ryan Huffman
33e11be3e0 Add user locations to menu 2014-06-26 16:06:49 -07:00
Clément Brisset
463ac9cc74 Merge pull request #3078 from PhilipRosedale/master
Improved toy ball, JS calls for palm position, concertCamera.js
2014-06-26 11:03:48 -07:00
Philip Rosedale
58d460da09 option to turn on/off string hair 2014-06-25 15:14:17 -07:00
Ryan Huffman
5ece424a45 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644
Conflicts:
	interface/ui/runningScriptsWidget.ui
2014-06-24 20:27:44 -07:00
Ryan Huffman
7a08ac76d2 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644
Conflicts:
	interface/src/Menu.cpp
	interface/ui/preferencesDialog.ui
2014-06-17 20:27:16 -07:00
Andrew Meadows
b9d4545aef merge upstream/master into andrew/ragdoll
Conflicts:
	libraries/shared/src/Shape.h
	libraries/shared/src/ShapeCollider.h
2014-06-17 17:03:16 -07:00
Andrew Meadows
5bd37acdb8 Changed RagDoll to Ragdoll 2014-06-13 11:55:39 -07:00
barnold1953
e4a0275f57 Exposed sixense and mouse options and oculus UI angle to preferences 2014-06-13 10:53:11 -07:00
Brad Hefta-Gaub
e8ba3c8bb1 Merge pull request #3019 from ctrlaltdavid/19769
Code Review for Job #19769
2014-06-12 17:31:53 -07:00
barnold1953
bc293071d6 Removed left handed menu option 2014-06-12 12:25:22 -07:00