Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 12:07:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
6227 commits 25 branches 0 tags 1.1 GiB
Commit graph

150 commits

Author SHA1 Message Date
stojce
fef70098a3 #19418 Load a local HTML file in a web view within Interface 2013-09-08 21:28:30 +02:00
Andrzej Kapolka
70a21fc9ad Merge branch 'master' of https://github.com/worklist/hifi into shifty 2013-09-05 10:20:56 -07:00
Stephen Birarda
9ede6b75c6 force the OS X bundle name to be capitalized 2013-09-04 17:09:43 -07:00
Andrzej Kapolka
213a8fcd63 Working on Faceshift integration. 2013-09-03 11:52:32 -07:00
Andrzej Kapolka
6f08df9e83 Link in Faceshift. 2013-09-03 10:03:15 -07:00
Andrzej Kapolka
28431b4c57 Testing transformation with video from FreeTrack project. 2013-08-28 15:02:33 -07:00
Stephen Birarda
ed48f8d982 add a DISABLE_OPENNI option for release builds without OpenNI 2013-08-16 14:28:22 -07:00
Stephen Birarda
4d9075f21c optionally check /usr/local/lib for plugins 2013-08-16 13:58:22 -07:00
Jeffrey Ventrella
5c040ad84d test 2013-07-31 16:08:46 -07:00
Stephen Birarda
c34bc4173b call use modules after OpenNI is linked 2013-07-31 15:45:22 -07:00
Stephen Birarda
10b57bca80 remove useless link to QT_LIBRARIES 2013-07-31 14:24:30 -07:00
Stephen Birarda
43fad3037f fix link to QtWebKit lib to be fervor specific 2013-07-31 12:04:47 -07:00
Stephen Birarda
0086dfdb26 redundant setting of CMAKE_PREFIX_PATH in interface CMakeLists 2013-07-31 11:53:48 -07:00
Stephen Birarda
4abb80b4f9 remove no longer required qt cpp wrap 2013-07-24 12:14:52 -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
ZappoMan
86ad0da09f Merge branch 'master' of https://github.com/worklist/hifi into voxel_stats 2013-07-20 11:35:10 -07:00
ZappoMan
83290bc8b7 first cut at real voxel stats dialog box 2013-07-19 17:28:37 -07:00
Andrzej Kapolka
640ecd7f94 Working on integrating LibVPX for VP8 (9?) encoding. 2013-07-17 11:33:36 -07:00
Andrzej Kapolka
5c590638f3 Working on mesh rendering for faces. 2013-07-15 13:12:22 -07:00
Stephen Birarda
93b122bc76 Revert "link STK to interface" 
This reverts commit d55387f727.
 2013-07-12 13:12:52 -07:00
Stephen Birarda
d55387f727 link STK to interface 2013-07-12 11:18:15 -07:00
Andrzej Kapolka
61f6b8b974 Moved all the avatar bits to their own subdirectory. 2013-07-11 14:53:46 -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