Commit graph

166 commits

Author SHA1 Message Date
ZappoMan
cc19c15c17 remove more references to voxels 2015-01-07 16:09:56 -08:00
Ryan Huffman
a07d92b6ea Merge branch 'master' of github.com:highfidelity/hifi into audio-buffer-starvation-detection
Conflicts:
	interface/src/Audio.cpp
	interface/src/Audio.h
	interface/src/Menu.cpp
	interface/src/ui/PreferencesDialog.cpp
2015-01-07 09:46:07 -08:00
Ryan Huffman
08776aec9d Add output starve settings to preferences 2015-01-07 09:37:17 -08:00
ZappoMan
b605fe387e fix ui file 2015-01-06 09:55:49 -08:00
ZappoMan
b940dcfdb3 more voxel-ectomy cleaning up some remaining references to voxels 2015-01-06 09:27:48 -08:00
Ryan Huffman
4c5bb66bd7 Add audio output buffer size to preferences 2015-01-02 16:01:04 -08:00
Brad Hefta-Gaub
1c4e71ebc1 Revert "Worklist #20074" 2014-10-30 14:33:10 -07:00
Pete
8d97a20bd9 Worklist #20074
- Add new Preferences item for Oculus Max FPS, defaults to 75, range is
[30, 95]
- Load and save this value appropriately
- When VR mode is enabled/disabled, set the Render Target Framerate to
this value/unlimited
2014-10-26 21:14:20 -07:00
AndrewMeadows
2a35c4af4d Merge pull request #3593 from huffman/20024
CR for Job #20024 - UI edits to Running Scripts dialog
2014-10-14 09:52:13 -07:00
stojce
54ad9477e7 Add style to chat entry 2014-10-08 03:12:53 +02:00
stojce
fa58f53bff remove font settings for chat entry 2014-10-08 01:28:24 +02:00
stojce
f2095dacbd more dialog fixes 2014-10-03 13:45:26 +02:00
stojce
e158185296 layout changes on update dialog 2014-10-03 13:20:02 +02:00
Ryan Huffman
1976d1f1e2 Update runningScripts layout and add tip message 2014-10-02 16:27:02 -07:00
stojce
0634d15abb Fix update dialog layout on WIn 2014-10-02 00:49:20 +02:00
Ryan Huffman
1ee01fdab3 Merge branch 'master' of github.com:highfidelity/hifi into 20024 2014-09-23 14:10:00 -07:00
Ryan Huffman
145425276d Fix script list not being hidden 2014-09-19 14:17:08 -07:00
Ryan Huffman
b55a5acdd3 Update style of running scripts widget 2014-09-17 14:27:11 -07:00
Andrzej Kapolka
7b3d06a783 Add option to change Faceshift hostname. 2014-09-10 19:34:21 -07:00
Brad Hefta-Gaub
fe3f0cd358 Merge pull request #3355 from stojce/19964
Code Review for Job #19964
2014-09-06 15:43:27 -07:00
stojce
9820e73c8e layout tweaks 2014-09-04 20:15:54 +02:00
stojce
6d38904adb Merge branch 'master' of https://github.com/highfidelity/hifi into 19964 2014-09-04 20:06:55 +02:00
Ryan Huffman
bbc1bbdf47 Merge branch 'master' of github.com:highfidelity/hifi into 19968 2014-09-04 06:56:37 -07:00
AndrewMeadows
8223481ecb Merge pull request #3341 from huffman/19967
Code Review for Job #19967
2014-09-03 16:51:19 -07:00
stojce
f07f270dee restore default buttons events 2014-09-04 01:22:17 +02:00
stojce
f12f45adec Layout fixes 2014-09-04 00:55:36 +02:00
Ryan Huffman
e6def6e35b Fix spacing on RunningScripts 2014-09-02 14:01:24 -07:00
Ryan Huffman
a95b670716 Update RunningScripts style: font, spacing, title 2014-09-02 12:37:51 -07:00
Ryan Huffman
9e510632b9 Remove box styling from RunningScripts 2014-08-31 12:29:54 -07:00
Ryan Huffman
2283b68dba Remove 'recently loaded' widgets from RunningScripts 2014-08-31 11:31:45 -07:00
Ryan Huffman
ce0e0a9c59 Remove custom background, font, and button styles on RunningScripts 2014-08-31 11:30:26 -07:00
stojce
ce6a312813 Fix preferences dialog layout 2014-08-29 19:50:39 +02:00
stojce
b527966db8 Merge branch 'master' of https://github.com/highfidelity/hifi into 19964
Conflicts:
	interface/ui/preferencesDialog.ui
2014-08-29 08:46:02 +02:00
stojce
7e250bc899 Remove custom styling 2014-08-23 00:16:25 +02:00
Ryan Huffman
31d198a7a9 Remove custom behavior from chat window 2014-08-21 15:37:12 -07:00
Ryan Huffman
b3bdfc45ce Remove close button from running scripts widget 2014-08-21 15:13:08 -07:00
Ryan Huffman
b0361025b0 Remove custom behavior from running scripts widget 2014-08-21 14:32:38 -07:00
wangyix
1f011bfe9d repetition-with-fade option added, not implemented 2014-08-11 11:22:37 -07:00
wangyix
1153a76ab1 new option knobs added, no new behavior yet 2014-08-07 16:37:36 -07:00
wangyix
d49970d010 maxFramesOverDesired added; settable from domain page and preferences 2014-07-29 15:57:32 -07:00
wangyix
d0a1d732c9 updated preferences UI "samples" to "frames" 2014-07-28 14:18:22 -07:00
Atlante45
6cb5483c21 Added send data option to prefs 2014-07-16 17:56:29 -07:00
Clément Brisset
ae6b4def32 Merge pull request #3108 from huffman/19800
Code Review for Job #19800
2014-07-02 15:46:56 -07:00
Brad Hefta-Gaub
2df851dcfc Merge pull request #3106 from ctrlaltdavid/19823
Code Review for Job #19823
2014-07-02 09:06:01 -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
David Rowe
e8e9d6464b Fix running scripts scrollbar and add scrollbar to list of all scripts 2014-06-30 12:41:01 -07:00
David Rowe
ce874305be Add checkbox that automatically reloads externally changed files 2014-06-29 21:50:16 -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
cde36dc70d Add user locations 2014-06-26 16:06:28 -07:00