wangyix
3ac4dfa333
gg
2014-07-23 14:28:32 -07: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
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
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
c085d09835
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-22 14:48:18 -07: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
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
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
AndrewMeadows
854ca4bc66
Merge pull request #3185 from Barnold1953/OculusOverlay
...
Add hydra lasers for menu picking.
2014-07-21 13:54:07 -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
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
barnold1953
c6bda4bf16
Moved sixense laser stuff to MyAvatar
2014-07-18 15:26:18 -07:00
Stephen Birarda
10ed33cb38
further patching to conditionally build without Faceshift
2014-07-18 14:34:15 -07:00
Stephen Birarda
b2a99edb2e
fix conditional builds without Faceshift
2014-07-18 14:27:20 -07:00
Philip Rosedale
c1832bed9c
Merge branch 'master' of https://github.com/worklist/hifi
2014-07-17 18:31:52 -07:00
Philip Rosedale
2cee5992a0
Merge pull request #3183 from Atlante45/js_s3_browse
...
Js s3 browse
2014-07-17 18:31:30 -07:00
Atlante45
c07ba9fec5
Added browser as a tool
2014-07-17 17:50:56 -07:00
Atlante45
7ab8b5a843
Added S3 browser
2014-07-17 17:12:54 -07:00
Stephen Birarda
ffb0ea30f8
Merge branch 'master' of https://github.com/highfidelity/hifi into select-library
2014-07-17 16:12:24 -07:00
Philip Rosedale
2972bc7b45
Merge branch 'master' of https://github.com/worklist/hifi
2014-07-17 16:04:21 -07:00
Philip Rosedale
e8539d0006
Merge pull request #3181 from birarda/master
...
foundation of support for signed transactions from interface
2014-07-17 16:03:28 -07:00
Philip Rosedale
1b265f3adb
Merge pull request #3180 from AndrewMeadows/ragdoll
...
Ragdoll Part4: ragdoll shapes follow target joints, visible joints follow ragdoll shapes
2014-07-17 16:00:02 -07:00
Stephen Birarda
45f4e033f3
fix the LibOVR find module to grab a util header
2014-07-17 15:55:10 -07:00
Stephen Birarda
5cad6edb38
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-17 14:06:11 -07:00
Brad Hefta-Gaub
437e3efbc2
Merge pull request #3179 from wangyix/quick_audio_PR
...
Lost audio packets are replaced with silent frames in AudioMixer; AudioMixer silent-packet-dropping now enabled no matter what; Moving avg of audio frames available replaces _currentJitterBufferFrames
2014-07-17 11:44:05 -07:00
Stephen Birarda
45ae9f614d
add dialog to Menu to insert wallet private key
2014-07-17 11:43:30 -07:00
Stephen Birarda
0c8c4a2cf9
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-17 11:08:35 -07:00
Andrew Meadows
b22652f441
merge upstream/master into andrew/ragdoll
2014-07-17 10:52:27 -07:00
Andrew Meadows
783cde7376
minor tweak to rate at which ragdoll shapes follow joints
2014-07-17 10:51:17 -07:00
Andrew Meadows
25840cad49
fix bug in mixVisibleRotationDelta()
...
was using a non-visible rotation
2014-07-17 10:33:11 -07:00
