Commit graph

69 commits

Author SHA1 Message Date
Brad Hefta-Gaub
7234b9ca4a try to get this to work 2014-01-10 22:58:32 -08:00
Andrew Meadows
d28ed70ca9 merge pull request 1446 2014-01-10 15:55:38 -08:00
Stephen Birarda
133ba3a230 remove Leap integration from CMakeLists 2014-01-06 11:13:19 -08:00
Andrzej Kapolka
0a56f54675 Tiny fix for CMake caching on Linux/LibOVR. 2013-12-11 10:48:17 -08:00
Stephen Birarda
146d5294a0 more PortAudio cleanup in cmake 2013-12-05 16:51:04 -08:00
Stephen Birarda
40a1517108 remove PortAudio entirely 2013-12-03 12:38:26 -08:00
Andrzej Kapolka
0e0685af04 New Oculus software with Linux support. 2013-11-25 17:30:51 -08:00
Andrzej Kapolka
0231ed133c Optional compilation for Sixense. 2013-11-18 12:09:52 -08:00
Andrzej Kapolka
9c401607b1 Missed the actual files. 2013-11-15 18:47:25 -08:00
Stephen Birarda
cb2cb05688 remove the STK library as it is no longer needed 2013-10-21 16:32:32 -07:00
Stephen Birarda
2ec42a2a5d revise linkage of civetweb for both DS and VS 2013-10-15 14:24:54 -07:00
Stephen Birarda
41e1ec180c add a JSON endpoint for current assignments 2013-10-15 13:45:40 -07:00
Stephen Birarda
17fda717fe move audio and avatar classes into assignment-client target 2013-09-17 11:04:46 -07:00
Stephen Birarda
d412e0611d Merge branch 'master' of github.com:worklist/hifi into assignment 2013-09-06 11:04:18 -07:00
Stephen Birarda
8dad031c9a add mongoose for demo webserver for DS 2013-09-05 15:27:34 -07:00
Andrzej Kapolka
213a8fcd63 Working on Faceshift integration. 2013-09-03 11:52:32 -07:00
Stephen Birarda
23152abce7 suppress warnings for glm headers that pop up in Xcode 5 2013-08-14 15:34:57 -07:00
Stephen Birarda
9f2b2d09a9 changes to CMakeLists for Qt5 2013-07-24 11:29:12 -07:00
Stephen Birarda
a8afaea542 switch to new qt5 find module setup 2013-07-23 20:49:08 -07:00
Stephen Birarda
e4169665a9 changes to CMakeLists to up to qt5 2013-07-23 20:28:11 -07:00
Andrzej Kapolka
b5a8c2710c Merge branch 'master' of https://github.com/worklist/hifi into pointy
Conflicts:
	interface/src/Application.h
	interface/src/Audio.h
	interface/src/Webcam.cpp
2013-07-18 18:09:57 -07:00
Andrzej Kapolka
640ecd7f94 Working on integrating LibVPX for VP8 (9?) encoding. 2013-07-17 11:33:36 -07:00
Stephen Birarda
afe49bc756 switch calls to printLog to QDebug 2013-07-16 11:07:22 -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
Andrzej Kapolka
7a65ebbba3 Remove Freenect/LibUSB bits. 2013-07-05 22:17:59 -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
1993601389 don't link a NOTFOUND leap library 2013-07-02 15:27:30 -07: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
Andrzej Kapolka
ea9566596a Build OpenNI/NITE into interface if available. 2013-06-28 16:47:08 -07:00
Andrzej Kapolka
884f14dca1 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-06-28 16:06:58 -07:00
Andrzej Kapolka
f83c16e578 Goodbye, skeltrack. You won't be missed. 2013-06-28 12:27:50 -07:00
Stephen Birarda
73a8882a9e resolve conflicts on merge with upstream master 2013-06-27 15:22:21 -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
59a9fc8eff remove the Speex library 2013-06-26 16:08:03 -07:00
Stephen Birarda
8f0478551b add the quazip library and a find module 2013-06-25 16:44:11 -07:00
Andrzej Kapolka
1d578d5b0e Lots of Kinect bits. 2013-06-25 14:27:13 -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
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
tosh
651dc19427 separates echo cancellation from loopback test (intermediate commit) 2013-06-19 23:55:15 +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
tosh
682a7c9cdf libspeexdsp-based echo cancellation (untested) 2013-06-18 22:18:27 +02:00
Andrzej Kapolka
4421b21124 Working on reintegrating OpenCV (also, removed lodepng). 2013-06-17 13:24:01 -07:00
Stephen Birarda
188abd8d44 add the STK library for future audio magic 2013-05-30 12:25:29 -07:00
Stephen Birarda
a4bf95f93b don't go looking for GLM twice, check the cache 2013-05-21 15:01:41 -07:00
Stephen Birarda
9a163d2a72 conditional repairs for custom modules 2013-05-14 12:02:54 -07:00
Stephen Birarda
c3bbebee58 don't allow CMake to escape UNIX in path for PortAudio 2013-05-14 11:59:17 -07:00
Stephen Birarda
241c170345 refactor find modules so they complain when things are missing 2013-05-14 11:46:19 -07:00
Stephen Birarda
4c9d1c19ff link PortAudio as a static library instead of compiling as dependency 2013-05-14 11:22:34 -07:00