Commit graph

8028 commits

Author SHA1 Message Date
Zu
1bc6d4bf0f fix: tuned the roll and pitch jitter, round to nearest 1 dp instead of whole number 2014-07-25 18:05:17 +08:00
Zu
98bb995aba added: noise filtering to reduce rotation jitter 2014-07-25 17:32:04 +08:00
Zu
2d921924bf added: Cara Face Tracker
added: decode cara udp packets
added: head rotation
added: hook into hifi interface
2014-07-25 16:52:29 +08:00
Philip Rosedale
e272d0be75 Merge pull request #3203 from Atlante45/laser_pointer_js
Laser pointer js
2014-07-24 17:28:08 -07:00
Atlante45
9ca00b55a5 Spelling 2014-07-24 17:19:49 -07:00
AndrewMeadows
509b86f092 Merge pull request #3205 from birarda/select-library
lowercase the SIXENSE_ROOT_DIR
2014-07-23 18:01:23 -07:00
Philip Rosedale
f05855dcc2 Merge pull request #3199 from ey6es/master
Fix for shadows in close-up inset mirror.
2014-07-23 17:49:55 -07:00
Clément Brisset
279a107272 Merge pull request #3200 from thoys/feature-multiple-JS-cursors
Feature multiple js cursors
2014-07-23 17:46:56 -07:00
Stephen Birarda
4cf27a0099 check in sixense not Sixense 2014-07-23 17:44:38 -07:00
wangyix
3ac4dfa333 gg 2014-07-23 14:28:32 -07:00
Thijs Wenker
9d5c81bd67 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-23 16:59:23 +02:00
Thijs Wenker
b6cb19c2f6 FEATURE: Allows detecting simulated cursors in JS, this allows JS-developers to track all cursors separately. By using the deviceID. (deviceID 0 = default mouse-cursor , 1500 and 1501 hydra cursors) 2014-07-23 16:55:59 +02:00
Andrzej Kapolka
9cf0d6c851 Fix for shadows in close-up inset mirror. 2014-07-22 19:19:13 -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
aa145c8d20 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-22 15:40:42 -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
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
Atlante45
029160a60a Merge branch 'master' of https://github.com/highfidelity/hifi into laser_pointer_js 2014-07-21 14:12:17 -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
Stephen Birarda
a370156720 add a note for OS X users to use homebrew 2014-07-18 15:39:21 -07:00
Atlante45
35caef1882 Added pointing behaviour 2014-07-18 15:39:12 -07:00
Atlante45
f8772e10a1 Changed enum names 2014-07-18 15:38:36 -07:00
barnold1953
c6bda4bf16 Moved sixense laser stuff to MyAvatar 2014-07-18 15:26:18 -07:00