Commit graph

3993 commits

Author SHA1 Message Date
Andrzej Kapolka
e18d9f7ea2 Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-21 14:34:00 -07:00
Andrzej Kapolka
650e659ee8 Fixed includes, pointer warning. 2013-06-21 14:33:01 -07:00
Andrzej Kapolka
0c184b9912 Merge pull request #571 from ey6es/opencv
Quick fix for something I broke in mouse/touch took.
2013-06-21 14:30:59 -07:00
Andrzej Kapolka
94cbb50dfa Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-21 14:30:03 -07:00
birarda
bd0d820fc7 Merge pull request #556 from PhilipRosedale/master
Dynamic jitter buffer for less stuttering, fixes to stereo
2013-06-21 14:29:45 -07:00
Andrzej Kapolka
686fc3607e Fix for mouse/touch look: don't apply rotations if the gyros/webcam aren't
connected.
2013-06-21 14:25:25 -07:00
Philip Rosedale
accafd0418 Merge pull request #569 from ey6es/opencv
Added explicit third person mode, option to cycle through different methods of voxeltar rendering.
2013-06-21 14:23:36 -07:00
Andrzej Kapolka
483407a3f2 Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-21 14:09:38 -07:00
birarda
3644669fe3 Merge pull request #570 from machinelevel/master_central
Re-issue of change which adds two-finger touch look to avatar.
2013-06-21 14:07:31 -07:00
Andrzej Kapolka
0000eac95f Implementation parameter name should match interface parameter name. 2013-06-21 14:02:35 -07:00
Andrzej Kapolka
5194fb2ee6 Don't bother with testing the ignore orientations stuff. 2013-06-21 13:58:49 -07:00
Eric Johnston
6825274b65 Re-issue of change which adds two-finger touch look to avatar.
The option is un-checked by default because of an unsolved problem: We're getting the events into Qt very slowly, so input from several seconds ago is still active when the user has stopped the touch action. This needs to be fixed before this can be turned on full-time.
Corrections were made per feedback, and the change has been merged with the latest.
2013-06-21 13:43:23 -07:00
Andrzej Kapolka
04b72e3e66 Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-21 11:52:22 -07:00
Philip Rosedale
1f6fd31b52 Merge pull request #568 from ey6es/opencv
Head roll, lean from webcam data.
2013-06-21 11:41:21 -07:00
Andrzej Kapolka
0e223b90d9 Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-21 11:35:23 -07:00
Andrzej Kapolka
2566ce88d4 Merge pull request #567 from birarda/graphite
stash the interface startup time, add helper to Logstash class for value stashing
2013-06-21 11:35:08 -07:00
Andrzej Kapolka
00eba63e4e Added various options to test for voxel avatars, manual third person mode
(also, cleaned up the camera switching a little).
2013-06-21 11:33:38 -07:00
Philip Rosedale
13b729d9b4 Fixed problems with ring buffer not handling stereo right, reset audio buffers on spacebar. 2013-06-20 18:49:05 -07:00
Andrzej Kapolka
3de76c9e15 Approach the webcam position rapidly. 2013-06-20 16:28:48 -07:00
Andrzej Kapolka
281aee1f12 Increased smoothing substantially to reduce effect of jittering face rect. 2013-06-20 16:22:46 -07:00
Andrzej Kapolka
8cffaf7cc0 Fixed includes. 2013-06-20 16:09:24 -07:00
Andrzej Kapolka
7e34bef01e Attempt to fuse gyro readings with webcam data. 2013-06-20 16:07:33 -07:00
Stephen Birarda
72f7db2ec7 use the stashValue helper to send the audio-mixer stat 2013-06-20 15:35:39 -07:00
Stephen Birarda
8b7b0d542a send the interface startup time to log stash 2013-06-20 15:34:17 -07:00
Stephen Birarda
a9f7d037d1 add a helper to the logstash class to stash a value 2013-06-20 15:33:54 -07:00
Andrzej Kapolka
02b881aa33 Increased the camera distance in mirror mode to avoid clipping. 2013-06-20 15:08:46 -07:00
Andrzej Kapolka
b0dd5223e1 Avatar head roll/lean based on webcam data. 2013-06-20 14:20:03 -07:00
Andrzej Kapolka
b14a0c1554 Reset webcam along with other sensors on spacebar, added settings config for
non-Apple.
2013-06-20 11:44:47 -07:00
Philip Rosedale
56b8a5880d cleaned up stdout audio reporting 2013-06-20 10:59:50 -07:00
Philip Rosedale
c740400224 Merge fixes plus auto jitter buffer 2013-06-20 10:54:58 -07:00
Andrzej Kapolka
6493f3aa44 Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-20 10:08:58 -07:00
Philip Rosedale
2c8c34f9bd set jitter buffer on application start to 1/2 of a packet 2013-06-20 09:08:37 -07:00
ZappoMan
517ff0f3cf Merge pull request #565 from tschw/19371
Code Review for Job #19371
2013-06-19 21:08:55 -07:00
Philip Rosedale
5dae92d610 Merge pull request #560 from ZappoMan/occlusion_culling
Occlusion culling optimizations
2013-06-19 19:26:56 -07:00
tosh
72a29979d0 Merge branch 'master' of git://github.com/worklist/hifi into 19371
Conflicts:
	interface/CMakeLists.txt
2013-06-20 03:46:25 +02:00
tosh
9c54ef18d3 adds 'Oscilloscope::setColor' and uses it when visualizing echo cancellation 2013-06-20 03:15:01 +02:00
Andrzej Kapolka
0dc0552f50 Basic Haar cascade/CamShift tracking. 2013-06-19 18:02:26 -07:00
ZappoMan
cadd596508 implement partitioned CoverageRegions in CoverageMap to further optimize polygon compares 2013-06-19 17:52:01 -07:00
birarda
4a0707ba19 Merge pull request #564 from birarda/jenkins
fix the broken scm block
2013-06-19 17:20:22 -07:00
Stephen Birarda
33cb30d8bf fix broken scm block in hifiJob 2013-06-19 17:19:39 -07:00
birarda
9f901275ff Merge pull request #563 from birarda/jenkins
make constants in jobs.groovy global
2013-06-19 17:15:19 -07:00
Stephen Birarda
923b12ead8 make constants global, wrap cmake configure block in method 2013-06-19 17:09:00 -07:00
tosh
7588b7f6bb - separates audio system round trip time determination from echo cancellation
- changes speex parameters to more humble values
- resolves build issues by removing the speex dylibs - static ones are fine
- tightens build script
2013-06-20 02:00:12 +02:00
Philip Rosedale
3304f0eb2e Merge branch 'master' of https://github.com/worklist/hifi 2013-06-19 16:03:20 -07:00
Philip Rosedale
bc374d0183 More audio tweaks 2013-06-19 16:02:56 -07:00
ZappoMan
91f6d0fde5 added copyright message 2013-06-19 15:29:50 -07:00
birarda
aec145a23e Merge pull request #562 from birarda/jenkins
remove the dummy test job, add a copyright
2013-06-19 15:00:59 -07:00
Stephen Birarda
4d330a33e6 add copyright to OctalCode header 2013-06-19 14:59:21 -07:00
Stephen Birarda
2c5d6ba747 remove the dummy test job 2013-06-19 14:58:46 -07:00
Leonardo Murillo
e4f1dd3116 Merge pull request #561 from birarda/jenkins
fix broken push triggers for generated jobs
2013-06-19 14:56:26 -07:00