Commit graph

717 commits

Author SHA1 Message Date
wangyix
db0fbcab97 merge with upstream 2014-08-13 11:09:55 -07:00
wangyix
1f011bfe9d repetition-with-fade option added, not implemented 2014-08-11 11:22:37 -07:00
Craig Hansen-Sturm
481108ecd1 added support for biquad, parametric, and multi-band filter eq 2014-08-10 22:47:27 -07:00
wangyix
1153a76ab1 new option knobs added, no new behavior yet 2014-08-07 16:37:36 -07:00
wangyix
1eaf175a92 removed disable audio output overflow check menu option 2014-08-05 10:21:53 -07:00
Brad Hefta-Gaub
d6e6cfd585 Merge pull request #3216 from wangyix/inbound_audio_stream
Audio ringbuffer classes refactored into subclasses of InboundAudioStream
2014-07-30 18:00:17 -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
81e5419287 added CTRL+A shortcut to display audio stats 2014-07-30 11:43:33 -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
Brad Hefta-Gaub
8b43ddc426 Merge pull request #3212 from birarda/select-library
standardization of hints used to find external libraries
2014-07-28 08:51:15 -07:00
Stephen Birarda
6fdd64c9fc change to new style of signal slot connection for XmppClient 2014-07-24 16:52:18 -07:00
wangyix
a36c9e872e merged with upstream 2014-07-23 15:36:37 -07:00
Stephen Birarda
19618182a3 don't show Faceshift option if not present 2014-07-22 14:40:53 -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
a70eb12245 made Audio::_ringbuffer 10 frames for nonWindows;
fixed/separated framesAvailable stats for _ringBuffer and _audioOutput;
made QAudioOutput overflow check disabled by default
2014-07-21 13:21:31 -07:00
barnold1953
03bc3a9ff8 Added checkable menu option for laser toggle 2014-07-21 12:35:46 -07:00
Stephen Birarda
45ae9f614d add dialog to Menu to insert wallet private key 2014-07-17 11:43:30 -07:00
Atlante45
5dca794322 On/Off for activity logger 2014-07-16 12:22:27 -07:00
Andrew Meadows
d832f5bec8 fix menu config of visible stats 2014-07-11 16:08:37 -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
603ca02ef9 Default UI to "on" 2014-07-09 11:21:16 -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
df1b4107fd moved qAudioOutput buffer overflow debug option to existing audio menu 2014-07-08 13:01:05 -07:00
wangyix
6ee52e97c8 added dev menu option to disable _audioOutput overflow check 2014-07-08 12:23:43 -07:00
Ryan Huffman
c509ae9ffd Merge branch 'master' of git://github.com/highfidelity/hifi into 19828 2014-07-07 13:49:26 -07:00
Ryan Huffman
df6bbd2944 Fix goTo* dialog bug with chat on Mac OSX
If chat was open, when pressing enter on Mac OSX the operation would not go through and
would focus on the chat window.  There seems to be a  deeper issue, but
it was decided to go with the simple solution of making these dialog
windows not of `Sheet` type.
2014-07-07 13:47:31 -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
a9e352981a Fix cleanup of resources for UserLocations* 2014-07-01 17:59:49 -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
Aleric Inglewood
1bc2f214a5 Compiler warning fixes.
This fixes all warnings that I got while compiling with g++ 4.7.2:

 In file included from interface/src/Application.h:53:0,
                  from interface/src/Menu.cpp:36:
 interface/src/Menu.h: In constructor ‘Menu::Menu()’:
 interface/src/Menu.h:292:13: warning: ‘Menu::_scriptsLocation’ will be initialized after [-Wreorder]
 interface/src/Menu.h:289:27: warning:   ‘QPointer<LoginDialog> Menu::_loginDialog’ [-Wreorder]
 interface/src/Menu.cpp:82:1: warning:   when initialized here [-Wreorder]

 libraries/audio/src/AudioRingBuffer.cpp: In member function ‘qint64 AudioRingBuffer::writeData(const char*, qint64)’:
 libraries/audio/src/AudioRingBuffer.cpp:126:75: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 libraries/audio/src/PositionalAudioRingBuffer.cpp: In member function ‘bool PositionalAudioRingBuffer::shouldBeAddedToMix()’:
 libraries/audio/src/PositionalAudioRingBuffer.cpp:212:37: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 interface/ui/preferencesDialog.ui: Warning: The name 'horizontalLayout_11' (QHBoxLayout) is already in use, defaulting to 'horizontalLayout_111'.
 interface/ui/preferencesDialog.ui: Warning: The name 'horizontalSpacer_11' (QSpacerItem) is already in use, defaulting to 'horizontalSpacer_111'.

 interface/src/avatar/Avatar.cpp: In member function ‘void Avatar::initializeHair()’:
 interface/src/avatar/Avatar.cpp:587:21: warning: name lookup of ‘link’ changed [enabled by default]
 interface/src/avatar/Avatar.cpp:574:18: warning:   matches this ‘link’ under ISO standard rules [enabled by default]
 interface/src/avatar/Avatar.cpp:577:22: warning:   matches this ‘link’ under old rules [enabled by default]

 interface/src/ui/ApplicationOverlay.cpp: In member function ‘void ApplicationOverlay::renderControllerPointers()’:
 interface/src/ui/ApplicationOverlay.cpp:379:59: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 In file included from interface/src/ui/RunningScriptsWidget.cpp:14:0:
 interface/src/ui/RunningScriptsWidget.h: In constructor ‘RunningScriptsWidget::RunningScriptsWidget(QWidget*)’:
 interface/src/ui/RunningScriptsWidget.h:61:18: warning: ‘RunningScriptsWidget::_scriptsModel’ will be initialized after [-Wreorder]
 interface/src/ui/RunningScriptsWidget.h:60:27: warning:   ‘QSortFilterProxyModel RunningScriptsWidget::_proxyModel’ [-Wreorder]
 interface/src/ui/RunningScriptsWidget.cpp:27:1: warning:   when initialized here [-Wreorder]
2014-06-27 22:18:38 +02: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
173be2c89d Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 2014-06-24 12:01:04 -07:00
Andrew Meadows
7f4ffb363b merge upstream/master into andrew/ragdoll 2014-06-23 12:33:21 -07:00
Brad Hefta-Gaub
29a8307825 Merge pull request #3050 from ctrlaltdavid/fix_fullscreen_shortcut
Fix fullscreen toggle shortcut
2014-06-23 11:42:20 -07:00
Andrew Meadows
5e4d757e4e merge upstream/master into andrew/ragdoll 2014-06-23 10:43:40 -07:00