ZappoMan
|
2ca628fdf1
|
first cut at particle renderer cleanup particle jurisdiction listener fix storage of particles
|
2013-12-09 11:45:32 -08:00 |
|
Stephen Birarda
|
146d5294a0
|
more PortAudio cleanup in cmake
|
2013-12-05 16:51:04 -08:00 |
|
Stephen Birarda
|
7df6210ba0
|
Merge remote-tracking branch 'upstream/master' into qt-for-portaudio
|
2013-12-04 14:20:44 -08:00 |
|
ZappoMan
|
9faef65ccc
|
first cut at splitting out octree base classes
|
2013-12-03 17:32:02 -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
|
1f2fe5ddee
|
Rudimentary Sixense (Razer Hydra) support.
|
2013-11-15 18:06:32 -08:00 |
|
Stephen Birarda
|
1ddc52252a
|
fix missing link to starfield implementation files
|
2013-10-18 09:01:44 -07:00 |
|
Stephen Birarda
|
1367396344
|
fix broken InfoView after removing fervor
|
2013-09-30 10:39:33 -07:00 |
|
Stephen Birarda
|
bb32da12f1
|
complete removal of fervor and C++11 array
|
2013-09-30 10:30:18 -07:00 |
|
Stephen Birarda
|
b5b43f86d1
|
begin to remove fervor + quazip
|
2013-09-26 17:39:33 -07:00 |
|
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 |
|