Philip Rosedale
143411ab32
Merge branch 'master' of https://github.com/worklist/hifi
2014-07-22 21:15:00 -04:00
Philip Rosedale
0b1c16d453
Merge pull request #3197 from ey6es/master
...
Not sure if everyone sees this or it's just my machine, but the frame rate slowed dramatically using the fixed function state for lights. This switches back to using uniforms.
2014-07-22 21:13:57 -04:00
Andrzej Kapolka
4f87524821
Switched back to using uniforms for light parameters, as using the fixed
...
function state killed my frame rate. Also cleaned up some of the location
tracking.
2014-07-22 18:03:13 -07:00
wangyix
d9692e4af4
changed a > to >= in handleAudioInput; added audio input buffer latency to stats;
2014-07-22 17:34:35 -07:00
Philip Rosedale
4f52098da1
tuning tweaks to world and avatar lights
2014-07-22 20:23:23 -04:00
Philip Rosedale
176473b5ba
Merge branch 'master' of https://github.com/worklist/hifi
2014-07-22 19:29:42 -04:00
AndrewMeadows
07ce6c9a64
Merge pull request #3192 from ey6es/master
...
Fixes for local lights.
2014-07-22 16:24:17 -07:00
Stephen Birarda
4b690f9394
Merge pull request #3195 from birarda/master
...
repair for Visage find module base includes
2014-07-22 15:57:33 -07:00
Stephen Birarda
56efa46812
repair for Visage find module base includes
2014-07-22 15:56:22 -07:00
Andrzej Kapolka
d4904f976a
Missed the local light stats.
2014-07-22 15:50:08 -07:00
Andrzej Kapolka
aa145c8d20
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-22 15:40:42 -07:00
Andrzej Kapolka
cfc77cd99a
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-22 15:24:01 -07:00
wangyix
c8ac1732ec
removed audio stats from old location
2014-07-22 14:53:45 -07:00
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
Andrzej Kapolka
c31dd4df5f
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-22 14:46:43 -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
Andrzej Kapolka
3ea7e79622
Working on distributing metavoxel session handling over multiple threads.
2014-07-21 20:03:50 -07:00
Andrzej Kapolka
0ddd3e650c
More point bits (trying a different tack).
2014-07-21 19:00:13 -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
Stephen Birarda
8082e2f88b
allow a user to be let into domain-server based on role
2014-07-21 17:41:22 -07:00
Stephen Birarda
f78a1f7033
hook domain-server to user DomainServerWebSessionData class
2014-07-21 17:32:38 -07:00
Stephen Birarda
e75ed2c4fa
add a class to hold web session data
2014-07-21 17:23:57 -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
Stephen Birarda
1903fff45c
hide remote socket closed error message in HTTPConnection
2014-07-21 17:03:09 -07:00
Stephen Birarda
f45a509508
initial hook-in of OAuth authentication for DS web pages
2014-07-21 16:54:27 -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
Andrzej Kapolka
dd7f3703e1
More work on point rendering.
2014-07-21 14:48:54 -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
