Atlante45
cde025c8ad
Remove unnecessary arguments
2014-07-24 13:47:56 -07:00
Atlante45
5a664fd778
Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar
2014-07-23 14:42:42 -07:00
Stephen Birarda
7afc62db15
Merge pull request #3202 from wangyix/7_23_seq_fix
...
fixes seq num errors when spacebar
2014-07-23 14:30:56 -07:00
wangyix
3ac4dfa333
gg
2014-07-23 14:28:32 -07:00
Atlante45
63f0210f1e
Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar
2014-07-23 14:01:03 -07:00
Atlante45
95c98203a9
Replaced the Avatar in Agent by a scriptable avatar.
2014-07-23 14:00:49 -07:00
Atlante45
4b867de864
Created ScriptableAvatar class
2014-07-23 14:00:13 -07:00
Atlante45
d4199e6092
Edit properties tweaks
2014-07-23 13:59:21 -07:00
Philip Rosedale
9cee549bf0
Merge pull request #3198 from ey6es/master
...
Multiply local light colors by material diffuse reflectance.
2014-07-22 21:54:22 -04:00
Andrzej Kapolka
02bf76240a
Multiply local light colors by material diffuse reflectance.
2014-07-22 18:30:28 -07:00
Andrzej Kapolka
34dfbbedde
Merge pull request #3196 from PhilipRosedale/master
...
Tweaks to world and avatar lights, add angular acceleration to hair
2014-07-22 18:16:20 -07: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
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
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
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
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
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
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
