Commit graph

127 commits

Author SHA1 Message Date
Stephen Birarda
9834c10610 movement to use AudioInjector classes in Operative code 2013-07-11 17:47:35 -07:00
Andrzej Kapolka
0aa1b396db Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-10 14:08:03 -07:00
Andrzej Kapolka
a116f5a636 Use InvenSense code to handle the rather complicated business of talking the
sensor into giving us the compass reading.  We're getting it now, but I still
have to figure out how to incorporate it.
2013-07-09 17:28:23 -07:00
atlante45
5703a60797 Merge branch 'master' of git://github.com/worklist/hifi into 19368 2013-07-09 10:25:58 +02:00
Andrzej Kapolka
b1050c633b Suppress warnings for OpenNI. 2013-07-08 14:17:03 -07:00
Andrzej Kapolka
e866c22518 Merge branch 'master' of https://github.com/worklist/hifi into kinected
Conflicts:
	interface/src/Avatar.cpp
2013-07-03 10:15:11 -07:00
Stephen Birarda
f2dbad4e57 resolve conflicts on merge with upstream master 2013-07-02 15:42:36 -07:00
Stephen Birarda
1993601389 don't link a NOTFOUND leap library 2013-07-02 15:27:30 -07:00
Andrzej Kapolka
2a0d3310de Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-02 09:46:07 -07:00
atlante45
b062295ecb Merge with master 2013-07-02 16:22:39 +02:00
Andrzej Kapolka
182f4e70af More work on skeleton tracking. 2013-07-01 15:01:36 -07:00
Andrzej Kapolka
4e9595f794 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-01 09:49:01 -07:00
atlante45
8cc3f202ab Merge with upstream master 2013-07-01 17:12:05 +02:00
tosh
639858dfc9 Merge branch 'master' of git://github.com/worklist/hifi into 19377 2013-07-01 10:29:56 +02:00
tosh
c18400f8b7 Merge branch 'master' of git://github.com/worklist/hifi into 19377 2013-06-29 15:41:56 +02:00
Andrzej Kapolka
b4b09b0070 Back up and running, now with OpenNI rather than libfreenect. 2013-06-28 17:31:49 -07:00
Andrzej Kapolka
ea9566596a Build OpenNI/NITE into interface if available. 2013-06-28 16:47:08 -07:00
Stephen Birarda
73a8882a9e resolve conflicts on merge with upstream master 2013-06-27 15:22:21 -07:00
Stephen Birarda
491b3d67f9 resolve conflicts on merge with upstream master 2013-06-27 15:17:51 -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
6fcff30ed8 ignore warnings from OpenCV headers 2013-06-26 16:30:51 -07:00
Stephen Birarda
59a9fc8eff remove the Speex library 2013-06-26 16:08:03 -07:00
Stephen Birarda
0b243ec881 add fervor updater and run during launch if OS X release 2013-06-26 10:36:32 -07:00
atlante45
d6c70ea6ca #19368 - Improve editing/building workflow in Interface 2013-06-25 00:24:21 +02:00
tosh
290c20bfc7 introduces bandwidth meter / dialog 2013-06-22 04:22:10 +02: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
Andrzej Kapolka
776145b74c Use a CMake module for UVCCameraControl. 2013-06-19 11:14:32 -07:00
tosh
97fc38313b implements audio echo cancellation based on speex 2013-06-19 16:12:25 +02:00
Andrzej Kapolka
556a64eab9 Adding UVCCameraControl. 2013-06-18 16:47:11 -07:00
tosh
682a7c9cdf libspeexdsp-based echo cancellation (untested) 2013-06-18 22:18:27 +02:00
Andrzej Kapolka
a771f53df3 Read the webcam frames in a separate thread, since the call blocks. 2013-06-17 18:07:53 -07:00
Andrzej Kapolka
0d4efad490 Missed QuartzCore. 2013-06-17 13:58:19 -07:00
Andrzej Kapolka
6b065ab856 Find Zlib the right way. 2013-06-17 13:57:01 -07:00
Andrzej Kapolka
2c0bea3f33 More required libraries for OS X. 2013-06-17 13:53:48 -07:00
Andrzej Kapolka
ec495e14d3 Missed these guys. 2013-06-17 13:29:24 -07:00
Stephen Birarda
c3915ed078 use system flag for external library includes 2013-06-07 11:34:01 -07:00
Stephen Birarda
233ce67379 don't link STK library while not being used 2013-06-06 11:57:38 -07:00
Stephen Birarda
6c2dcb86c8 Merge remote-tracking branch 'upstream/master' into synthesis 2013-06-05 09:55:16 -07:00
Andrzej Kapolka
bc8eadd526 More work on voxeltars; separated default pose from bind pose. 2013-06-04 10:22:58 -07:00
Stephen Birarda
2d7c397138 create a FreeVerb object for each other agent per agent 2013-05-31 15:47:57 -07:00
Stephen Birarda
200d81e0eb DRY up resource subdir copying for OS X bundle 2013-05-22 14:40:01 -07:00
Stephen Birarda
62cf452e3d non-DRY fix for correct copy of resources for OS X bundle 2013-05-22 13:16:55 -07:00
Stephen Birarda
910683c047 remove an extra space 2013-05-21 15:43:29 -07:00
Stephen Birarda
d2c2150b8f include QtGui dir with isystem flag to remove warning 2013-05-21 15:39:57 -07:00
Stephen Birarda
a2f8d8ae25 break audio out of shared into its own library 2013-05-16 13:00:40 -07:00
birarda
ff6ce63a31 Merge pull request #311 from birarda/master
fix casing of PORTAUDIO_ROOT_DIR
2013-05-14 12:13:23 -07:00
Stephen Birarda
306d2a4b98 casing is important for UNIX 2013-05-14 12:12:36 -07:00
Andrzej Kapolka
c9b688b876 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-14 11:56:36 -07:00
Stephen Birarda
c117d62532 fix old reference to LODEPNG_LIBRARY 2013-05-14 11:54:35 -07:00
Andrzej Kapolka
c6ce992332 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-14 11:49:27 -07:00