Commit graph

124 commits

Author SHA1 Message Date
Stephen Birarda
a364655f63 Merge branch 'master' of https://github.com/highfidelity/hifi into cleanup-externals 2014-03-07 09:40:50 -08:00
Stephen Birarda
0f5fbb5fab pull out glew and freeglut so they can be external dependencies 2014-03-06 17:09:59 -08:00
Stephen Birarda
816a631b05 tweak the oculus find module to take copied-in folders 2014-03-06 14:16:38 -08:00
Stephen Birarda
628f91cd73 complete quoting of varous Cmake commands, closes #1999 2014-03-03 12:15:05 -08:00
Andrzej Kapolka
b3fba320fc We need the dependencies, too. 2014-02-11 17:03:24 -08:00
Andrzej Kapolka
25066f8b4f Starting on Visage integration. 2014-02-11 16:44:25 -08:00
Andrzej Kapolka
78e15e0212 Starting on Visage support. 2014-02-11 16:03:23 -08:00
Brad Hefta-Gaub
ef98a74ec8 Merge branch 'windows_build' of https://github.com/ZappoMan/hifi into windows_build 2014-01-16 14:33:44 -08:00
Brad Hefta-Gaub
87bb4e691c remove glut and clean up windows build cmake 2014-01-16 14:27:08 -08:00
Stephen Birarda
e8b6f8a7e4 remove docs from glew and freeglut 2014-01-16 14:24:04 -08:00
Stephen Birarda
323aa18c0e remove MotionDriver and pthread libraries 2014-01-16 14:16:38 -08:00
Andrzej Kapolka
865b495e6c Merge branch 'master' of https://github.com/worklist/hifi into debone
Conflicts:
	interface/src/Audio.cpp
	interface/src/Menu.cpp
	interface/src/avatar/Avatar.h
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Webcam.cpp
	interface/src/devices/Webcam.h
	interface/src/renderer/FBXReader.cpp
2014-01-16 13:35:03 -08:00
Brad Hefta-Gaub
25af277f65 adding glew external for windows build 2014-01-14 19:16:15 -08:00
Brad Hefta-Gaub
35016c7d69 make faceshift compile sources on windows to address linker error 2014-01-14 10:20:27 -08:00
Brad Hefta-Gaub
73aae6ef02 adding more opencv libraries and fix cmake for opencv and faceshift for windows 2014-01-13 20:12:11 -08:00
Brad Hefta-Gaub
a24dbfce0b opencv windows libs 2014-01-13 17:04:20 -08:00
Brad Hefta-Gaub
e60446a632 more windows build work 2014-01-13 15:57:31 -08:00
Brad Hefta-Gaub
8e8e6fcb30 added latest version of freeglut for windows 2014-01-13 14:46:03 -08:00
Brad Hefta-Gaub
32792a8e66 move windowshacks 2014-01-12 21:46:55 -08:00
Brad Hefta-Gaub
57f400f2d2 add windowshacks.h 2014-01-12 21:45:41 -08:00
Stephen Birarda
9eb31b48cc remove the Leap integration 2014-01-06 11:09:59 -08:00
Stephen Birarda
40a1517108 remove PortAudio entirely 2013-12-03 12:38:26 -08:00
Andrzej Kapolka
1aaf6f2620 Mac library with RTTI enabled, prevent crash on startup when there's no
Oculus.
2013-11-25 18:36:23 -08:00
Andrzej Kapolka
0e0685af04 New Oculus software with Linux support. 2013-11-25 17:30:51 -08:00
Andrzej Kapolka
83d89cdc30 Path fix for readme. 2013-11-18 12:34:38 -08:00
Andrzej Kapolka
0231ed133c Optional compilation for Sixense. 2013-11-18 12:09:52 -08:00
Stephen Birarda
b5b43f86d1 begin to remove fervor + quazip 2013-09-26 17:39:33 -07:00
Andrzej Kapolka
cb3b7ca746 OS X build of Faceshift library. 2013-08-30 17:30:12 -07:00
Andrzej Kapolka
1f468a77f2 Added Faceshift-network library. 2013-08-30 17:19:41 -07:00
Stephen Birarda
54d637119f updates required for fervor updater with Qt5 2013-08-19 16:05:37 -07:00
Stephen Birarda
c6baa56022 update Q_OS_MAC ifdefs for Qt 5 2013-08-15 11:12:17 -07:00
Andrzej Kapolka
9d7b22e065 Recompiled OS X driver. 2013-08-07 18:40:52 -07:00
Andrzej Kapolka
f171b76f69 Fix for gyros' freaking out when disconnected. 2013-08-07 17:54:02 -07:00
Stephen Birarda
2c5b8d3121 cmake source is root, make specific target 2013-07-31 12:21:49 -07:00
Stephen Birarda
43fad3037f fix link to QtWebKit lib to be fervor specific 2013-07-31 12:04:47 -07:00
Stephen Birarda
f27eb5e1d8 small code changes for qt5 compatibility 2013-07-24 12:06:55 -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
e6a2aec1c1 Added libvpx library for OS X. 2013-07-18 17:56:15 -07:00
Andrzej Kapolka
8863645dc9 Working on transmitting and receiving the face video. 2013-07-17 18:02:27 -07:00
Andrzej Kapolka
640ecd7f94 Working on integrating LibVPX for VP8 (9?) encoding. 2013-07-17 11:33:36 -07:00
ZappoMan
9e83de7fbf Merge pull request #634 from machinelevel/dev4
Added a readme with instructions on installing the Leap libraries.
2013-07-10 18:05:03 -07:00
Eric Johnston
38fe6201a8 Added content to read me 2013-07-10 15:33:28 -07:00
Andrzej Kapolka
6a5fb4f535 Removed unused variables, added motion driver library for OS X. 2013-07-10 14:28:06 -07:00
Andrzej Kapolka
53eb5ed0bb No clock_gettime on OS X; must use gettimeofday. 2013-07-10 14:21:23 -07:00
Eric Johnston
c1080bca1a Added a read me with instructions on installing the Leap libraries. 2013-07-10 11:32:18 -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
Stephen Birarda
331351765e remove fvversioncomparator from headers passed to qt4 2013-07-03 12:51:26 -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
0b243ec881 add fervor updater and run during launch if OS X release 2013-06-26 10:36:32 -07:00
Stephen Birarda
8f0478551b add the quazip library and a find module 2013-06-25 16:44:11 -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
Andrzej Kapolka
85dfd57547 If we're going to take the parameters, we should probably apply them. 2013-06-19 11:32:52 -07:00
Andrzej Kapolka
ee783be628 Wrap at 128 characters. 2013-06-19 11:29:50 -07:00
Andrzej Kapolka
f14108c9e1 Added code attribution/disclaimer. 2013-06-19 10:25:59 -07:00
Andrzej Kapolka
344b8a31c8 Updated header. 2013-06-19 10:20:01 -07:00
Andrzej Kapolka
1757f32fd0 Added source files for UVCCameraControl. 2013-06-19 10:18:48 -07:00
tosh
97fc38313b implements audio echo cancellation based on speex 2013-06-19 16:12:25 +02:00
Andrzej Kapolka
cc9f8bc717 Adjustments to UVCCameraControl invocation. 2013-06-18 18:15:52 -07:00
Andrzej Kapolka
8ec8e0b9d8 Avoid name mangling on the symbol. 2013-06-18 17:04:02 -07:00
Andrzej Kapolka
556a64eab9 Adding UVCCameraControl. 2013-06-18 16:47:11 -07:00
Andrzej Kapolka
4421b21124 Working on reintegrating OpenCV (also, removed lodepng). 2013-06-17 13:24:01 -07:00
Stephen Birarda
4c9d1c19ff link PortAudio as a static library instead of compiling as dependency 2013-05-14 11:22:34 -07:00
Stephen Birarda
535e890710 remove the source files from the LibOVR dir 2013-05-10 14:29:33 -07:00
Stephen Birarda
613066f786 add linking of LibOVR to interface CMakeLists.txt 2013-05-09 15:03:14 -07:00
ZappoMan
b34d1b5c05 more moving around of things 2013-04-11 18:56:46 -07:00
vincent
d769699cbe #19197 Create basic visual studio 2013-03-28 17:52:36 +01:00
Kees van Prooijen
9ae11ffe77 more windows port 2013-03-20 12:13:14 -07:00
Kees van Prooijen
cd27c74a2d prelimanary changes for windows port 2013-03-19 11:01:08 -07:00
Stephen Birarda
a33a2afcb6 move interface externals to its directory 2013-02-14 15:26:05 -08:00