Stephen Birarda
491b3d67f9
resolve conflicts on merge with upstream master
2013-06-27 15:17:51 -07:00
ZappoMan
7efe9264c7
Merge pull request #590 from birarda/voxel-noise
...
fix the default quaternion for audio injectors
2013-06-27 14:11:18 -07:00
Eric Johnston
b1d345f0dc
Update .gitignore to exclude the Leap SDK files, but not the stub header
2013-06-27 13:55:16 -07:00
Stephen Birarda
cece4de90e
fix the default orientation for an injector
2013-06-27 11:14:22 -07:00
Philip Rosedale
ae24c6c6b3
Merge pull request #589 from machinelevel/dev
...
(re-commit) Added support for Leap finger-sensing device.
2013-06-27 11:02:10 -07:00
Eric Johnston
b4f5df17ab
(re-commit) Added support for Leap finger-sensing device.
...
Note that the actual Leap SDK can't be in the repo for IP reasons, so there's a stub-version of the header. When the actual SDK is put into the Leap folder, cake will find it automatically and switch over.
2013-06-27 10:54:36 -07:00
Stephen Birarda
89d6fd105c
Merge pull request #588 from birarda/audio-latency
...
remove missing includes
2013-06-26 18:25:55 -07:00
Stephen Birarda
6cf71fb49b
remove speex includes
2013-06-26 18:25:12 -07:00
Philip Rosedale
6cd25294b4
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-26 18:22:16 -07:00
Philip Rosedale
4a241d6220
turned off voxel grabbing
2013-06-26 18:21:40 -07:00
Philip Rosedale
6d1b274f75
Merge pull request #587 from birarda/audio-latency
...
audio latency tuning + getting rid of speex
2013-06-26 18:21:10 -07:00
Stephen Birarda
14718980e5
tighten audio latency by clearing the network stack after starves
2013-06-26 18:17:50 -07:00
Stephen Birarda
6fcff30ed8
ignore warnings from OpenCV headers
2013-06-26 16:30:51 -07:00
Stephen Birarda
1c0b256f92
remove echo cancellation from audio code
2013-06-26 16:22:54 -07:00
Stephen Birarda
59a9fc8eff
remove the Speex library
2013-06-26 16:08:03 -07:00
Stephen Birarda
fd30725222
add a missing set of parenthesis
2013-06-26 15:53:35 -07:00
Stephen Birarda
6c4dd03867
add a missing semicolon
2013-06-26 15:52:26 -07:00
Stephen Birarda
2c7d720e88
add a boolean helper for _owningAvatar NULL comparison
2013-06-26 15:52:01 -07:00
Andrzej Kapolka
5ef400b193
Got the depth information displaying.
2013-06-26 15:35:44 -07:00
Leonardo Murillo
b4dec0cd70
Merge pull request #583 from birarda/jenkins
...
fix replacement in post build task
2013-06-26 14:34:31 -07:00
Stephen Birarda
7443040787
replace just the script command instead of the full block
2013-06-26 14:25:03 -07:00
Stephen Birarda
177ddd889d
differentiate dev grid and live deploy cURLs
2013-06-26 13:33:35 -07:00
Andrzej Kapolka
c0b5bc5922
Merge branch 'master' of https://github.com/worklist/hifi into kinected
2013-06-26 12:59:50 -07:00
Stephen Birarda
f08ad62faf
Merge pull request #581 from birarda/jenkins
...
use double double quotes for correct interpolation:
2013-06-26 12:59:12 -07:00
Andrzej Kapolka
afab7d32ef
Version of freenect patched for Kinect for Windows support.
2013-06-26 12:57:57 -07:00
Stephen Birarda
ac9f4d4c30
double double quotes needed for correct interpolation
2013-06-26 12:56:55 -07:00
Stephen Birarda
928f8acdac
Merge pull request #580 from birarda/jenkins
...
use double quotes to fix env interpolation, fix role
2013-06-26 12:42:25 -07:00
Stephen Birarda
815283d6d5
clean up double quote usage
2013-06-26 12:35:09 -07:00
Stephen Birarda
8e07815322
use double quotes for env interpolation, change role
2013-06-26 12:34:26 -07:00
Andrzej Kapolka
5e989b6ee5
More work on obtaining Kinect data.
2013-06-26 12:19:10 -07:00
Leonardo Murillo
5144c84cda
Merge pull request #579 from birarda/jenkins
...
fix for cURL parameters for branch deploy job
2013-06-26 12:14:21 -07:00
Stephen Birarda
8a7897d326
use deploy-dev, add missing d options
2013-06-26 12:12:04 -07:00
Stephen Birarda
1f1e520ec8
fix cURL parameters for branch deploy job
2013-06-26 12:10:04 -07:00
Stephen Birarda
383b6ecec2
use correct future appcast URL
2013-06-26 11:27:55 -07:00
Stephen Birarda
949395348f
switch to silent update checking
2013-06-26 10:42:07 -07:00
Stephen Birarda
0b243ec881
add fervor updater and run during launch if OS X release
2013-06-26 10:36:32 -07:00
Stephen Birarda
800bfd097b
alphabetize some includes in Application header
2013-06-26 10:35:17 -07:00
Philip Rosedale
0b37ce5375
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-25 21:08:37 -07:00
Philip Rosedale
f8497b3ee7
Merge pull request #577 from ey6es/master
...
Blink less when talking (not at all when brows are raised); force a blink (currently, 250ms) after talking stops.
2013-06-25 20:57:18 -07:00
Andrzej Kapolka
f2f29d2e60
Well, I guess OS X doesn't like || and && without parentheses.
2013-06-25 16:58:31 -07:00
Andrzej Kapolka
6eb421d564
Blink less when talking (and never when brows are raised); force a blink after
...
we stop talking.
2013-06-25 16:51:22 -07:00
Stephen Birarda
5cf89e90d7
fix redundancy in reference to Rect for OpenCV
2013-06-25 16:45:14 -07:00
Stephen Birarda
8f0478551b
add the quazip library and a find module
2013-06-25 16:44:11 -07:00
Andrzej Kapolka
3d214c2655
More work on Kinect integration.
2013-06-25 15:26:07 -07:00
Andrzej Kapolka
c683204df7
More Mac libraries.
2013-06-25 14:58:07 -07:00
Andrzej Kapolka
198d84abce
Mac libraries.
2013-06-25 14:44:21 -07:00
Andrzej Kapolka
1d578d5b0e
Lots of Kinect bits.
2013-06-25 14:27:13 -07:00
Andrzej Kapolka
9f681c0709
Merge pull request #576 from ey6es/master
...
Fix for OS X.
2013-06-24 17:27:22 -07:00
Andrzej Kapolka
7ab1055d47
Derp, need to bind the element array buffer.
2013-06-24 17:25:09 -07:00
Andrzej Kapolka
9356d1a27d
Turns out sincos is a GNU thing.
2013-06-24 17:16:06 -07:00