Commit graph

15054 commits

Author SHA1 Message Date
Stephen Birarda
7fb1391cc4 Merge pull request #3194 from birarda/master
fix faceshift definition
2014-07-22 14:49:07 -07:00
Stephen Birarda
5c955ca656 fix faceshift definition 2014-07-22 14:48:51 -07:00
Andrzej Kapolka
c085d09835 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-22 14:48:18 -07:00
Leonardo Murillo
82b6e7f784 Merge pull request #3193 from birarda/master
repairs to stubbed faceshft constructor
2014-07-22 15:42:18 -06:00
Stephen Birarda
19618182a3 don't show Faceshift option if not present 2014-07-22 14:40:53 -07:00
Stephen Birarda
f325500d14 repairs to stubbed faceshft constructor 2014-07-22 14:38:41 -07:00
Andrzej Kapolka
7faf64c54a Tab fixes. 2014-07-22 14:24:25 -07:00
wangyix
1b2dc2cbe1 added central audio stats including pipeline latency; old stats still there 2014-07-22 14:21:53 -07:00
Leonardo Murillo
6f0f6488d5 Merge pull request #3182 from birarda/select-library
dynamic selection of debug and release libraries for externals
2014-07-22 15:17:48 -06:00
Andrzej Kapolka
be028c2b01 Fixes for local lights. 2014-07-22 14:13:51 -07:00
barnold1953
f3ae228030 Moved some FaceShift stuff to FacialAnimationData. Made use of
FacialAnimationData
2014-07-22 13:46:29 -07:00
barnold1953
fc9fb11e4f Added FacialAnimationData class 2014-07-22 11:56:19 -07:00
Atlante45
17a6a72bdd ScriptEngine now inherit from QScriptEngine 2014-07-22 11:39:49 -07:00
wangyix
f7381c70bc starvcount and notmixedcount also reset when audiomixer is killed 2014-07-22 11:09:47 -07:00
wangyix
847bc28990 Audio stats now reset when AudioMixer is killed 2014-07-22 10:27:26 -07:00
Philip Rosedale
b7663b93e3 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-22 11:05:01 -04:00
Brad Hefta-Gaub
7f9e39c7b2 Merge pull request #3190 from ZappoMan/audiobuffersize
add useDynamicJitterBuffers to the audio mixer stats page
2014-07-21 22:40:11 -07:00
Brad Hefta-Gaub
50e9646f03 Merge pull request #3188 from palomapalmer97/master
new voxel scripts
2014-07-21 22:18:44 -07:00
ZappoMan
7bbbde8957 add useDynamicJitterBuffers to the audio mixer stats page 2014-07-21 22:18:03 -07:00
Brad Hefta-Gaub
01ebefbffd Merge pull request #3189 from wangyix/master
Made Audio.cpp always push a whole number of frames to the audio output; added audio input buffer stats to interface
2014-07-21 17:46:42 -07:00
wangyix
f6ef61e76a fixed some typos 2014-07-21 17:15:08 -07:00
wangyix
0bcc13aec9 made Audio always push a whole number of frames to the audio output 2014-07-21 17:12:03 -07:00
Philip Rosedale
87659741b5 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-21 16:11:09 -07:00
wangyix
621f0725cc added input ring buffer stats to interface 2014-07-21 15:39:33 -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
wangyix
603974c8a2 separated ringbuffer and outputbuffer avg framesAvailable stats in interface 2014-07-21 14:27:09 -07:00
barnold1953
8a75a4ccd3 Merge branch 'master' of https://github.com/highfidelity/hifi into jsBlendShapes 2014-07-21 14:26:41 -07:00
barnold1953
192fe71ac4 removed faceShiftScriptingInterface 2014-07-21 14:24:05 -07:00
Atlante45
029160a60a Merge branch 'master' of https://github.com/highfidelity/hifi into laser_pointer_js 2014-07-21 14:12:17 -07:00
palomapalmer97
9571098b8b voxel scripts
voxelwall is an 8x8 wall made of voxels that transitions from a bright
red to dark blue

voxelsoundwaves was an array of voxels that was manipulated to resemble
an audio scope that responds to loudness and changes its height
depending on the loudness of the audio that the microphone picks up
2014-07-21 14:10:09 -07:00
Andrzej Kapolka
e2265ff59a Merge pull request #3187 from AndrewMeadows/inertia
bug fix for broken seams in models
2014-07-21 14:09:03 -07:00
AndrewMeadows
854ca4bc66 Merge pull request #3185 from Barnold1953/OculusOverlay
Add hydra lasers for menu picking.
2014-07-21 13:54:07 -07:00
Andrew Meadows
b21bac25a1 bug fix for broken seams in models
don't hijack the "weight" variable because it's used elsewhere
2014-07-21 13:41:41 -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
Mohammed Nafees
17d827b66d Show script instance with script name in Running Scripts Widget 2014-07-22 01:23:05 +05:30
barnold1953
03bc3a9ff8 Added checkable menu option for laser toggle 2014-07-21 12:35:46 -07:00
Philip Rosedale
8460cecf7a Merge branch 'master' of https://github.com/worklist/hifi 2014-07-21 12:28:15 -07:00
barnold1953
98babe1751 Working hydra lazers when not in oculus 2014-07-21 12:17:13 -07:00
Brad Hefta-Gaub
c3bbdbc176 Merge pull request #3184 from ZappoMan/audiobuffersize
revert back the largest capacity of the client ring buffer back to the smaller default value
2014-07-21 10:37:27 -07:00
ZappoMan
7c5a77ddfe revert back the largest capacity of the client ring buffer back to the smaller default value 2014-07-21 10:29:51 -07:00
Stephen Birarda
b9807dcc4c Merge branch 'master' of https://github.com/highfidelity/hifi into select-library 2014-07-21 08:57:24 -07:00
barnold1953
16fd8f224c Imrpoved repeat texture method, its almost finished 2014-07-18 21:42:20 -07:00
Stephen Birarda
f67fd3e48b modify gitignore to wildcard handle interface externals 2014-07-18 17:51:10 -07:00
Stephen Birarda
f581c17c9e note that QXmpp is an optional dependency 2014-07-18 16:09:12 -07:00
Stephen Birarda
944e321944 fix a typo in Qt section 2014-07-18 16:06:34 -07:00
Stephen Birarda
b8bdb25313 move zLib to Linux and Windows specific sections 2014-07-18 16:06:10 -07:00
Stephen Birarda
880331de92 some typo cleanup in BUILD guide 2014-07-18 16:04:34 -07:00
Stephen Birarda
c8cfcaf4ad fix a poorly ordered link in devices section 2014-07-18 16:03:50 -07:00
Stephen Birarda
1cde11d3e5 more build guide clarifications 2014-07-18 16:02:58 -07:00