Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-31 14:40:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
4179 commits 76 branches 59 tags 1.2 GiB
Commit graph

113 commits

Author SHA1 Message Date
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
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
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
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
Stephen Birarda
241c170345 refactor find modules so they complain when things are missing 2013-05-14 11:46:19 -07:00
Andrzej Kapolka
174fdb8109 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-05-14 11:32:43 -07:00
Stephen Birarda
4c9d1c19ff link PortAudio as a static library instead of compiling as dependency 2013-05-14 11:22:34 -07:00
Andrzej Kapolka
e0388515a4 Massive migration from GLUT/globals to Qt/class members. Mostly there. 2013-05-13 21:11:54 -07:00
Stephen Birarda
4c2b729047 assume that oculus will only be from APPLE machines 2013-05-10 15:27:02 -07:00
Stephen Birarda
e15cf93443 Revert "link to LIBOVR_LIBRARY before calling add_executable" 
This reverts commit b2776f25ac.
 2013-05-10 15:05:36 -07:00
Stephen Birarda
b2776f25ac link to LIBOVR_LIBRARY before calling add_executable 2013-05-10 15:03:46 -07:00
Stephen Birarda
7edb7590a7 link the OVR library seperately from the QT_LIBRARIES 2013-05-10 14:54:44 -07:00
Stephen Birarda
a059e44011 resolve conflicts on merge with upstream master 2013-05-10 14:01:52 -07:00
Stephen Birarda
9ee3f889ab Merge remote-tracking branch 'upstream/master' into oculus 2013-05-10 14:00:10 -07:00
Andrzej Kapolka
5a113fd546 Added a stub for a Qt application class that creates a menu (which, since it's 
unparented, will only appear on OS X) with a test item connected to a slot.
 2013-05-10 12:07:47 -07:00
Stephen Birarda
999ab5cb20 initial setup to connect to oculus and grab sensors 2013-05-09 15:45:09 -07:00
Stephen Birarda
613066f786 add linking of LibOVR to interface CMakeLists.txt 2013-05-09 15:03:14 -07:00
Andrzej Kapolka
7c8a06ed4d Added wrapper classes for shaders/shader programs to ease the process of 
compiling, linking, assigning uniforms, etc.  They're modeled after the ones
included in QtOpenGL, which we can't use at the moment because they require
a Qt OpenGL context.
 2013-05-07 17:40:55 -07:00