Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 08:20:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
5040 commits 25 branches 0 tags 1.1 GiB
Commit graph

5040 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
129d428a6e Merge pull request #742 from birarda/local-domain 
use 0 IP address to designate node on same IP as domain
 2013-08-01 12:06:26 -07:00
Stephen Birarda
2b31a3586e comment changes for local vs. non-local 2013-08-01 12:01:48 -07:00
Stephen Birarda
2fde29e04a use a 0 public address to designate server local to DS 2013-08-01 11:53:18 -07:00
Jeffrey Ventrella
1df7026b26 merge? 2013-08-01 10:54:09 -07:00
Jeffrey Ventrella
5c38f78afc Merge remote-tracking branch 'upstream/master' into particles 2013-08-01 10:53:49 -07:00
Jeffrey Ventrella
0cd1018e76 some experimental work on hand rendering 2013-08-01 10:53:20 -07:00
Philip Rosedale
ba2c98a3eb Merge branch 'master' of https://github.com/worklist/hifi 2013-08-01 10:12:13 -07:00
ZappoMan
a96c1df691 Merge pull request #740 from birarda/master 
necessary changes for AvatarData
 2013-08-01 10:12:05 -07:00
Stephen Birarda
71ab8ae4f8 some necessary changes for AvatarData transmission 2013-08-01 10:07:10 -07:00
Andrzej Kapolka
a86ceb2759 More work on full frame video. 2013-07-31 18:18:37 -07:00
Jeffrey Ventrella
8f8d230761 Merge remote-tracking branch 'upstream/master' into particles 2013-07-31 17:59:37 -07:00
Jeffrey Ventrella
5b2693f99c added emitter active bool for switching emitters on/off when Leap loses fingers 2013-07-31 17:59:15 -07:00
Andrzej Kapolka
d18a9dc499 Working on full frame video support. 2013-07-31 17:06:09 -07:00
Stephen Birarda
aed0aa3034 Merge branch 'master' of github.com:worklist/hifi 2013-07-31 16:35:25 -07:00
ZappoMan
55988ab802 Merge pull request #738 from Ventrella/particles 
Changed rave glove modes to use names suggested by Brad
 2013-07-31 16:21:04 -07:00
Stephen Birarda
493eda8dd0 Merge pull request #737 from birarda/qt5 
fix automoc error for OpenNI header
 2013-07-31 16:18:32 -07:00
Stephen Birarda
8166ed3a77 move OpenNI include 2013-07-31 16:15:39 -07:00
Stephen Birarda
b3fc378a0f don't include XnCppWrapper if Q_MOC_RUN is defined 2013-07-31 16:14:17 -07:00
Jeffrey Ventrella
5c040ad84d test 2013-07-31 16:08:46 -07:00
Jeffrey Ventrella
eb732abcd6 Merge remote-tracking branch 'upstream/master' into particles 2013-07-31 16:07:44 -07:00
Jeffrey Ventrella
be8a587d49 named rave glove effects 2013-07-31 16:07:21 -07:00
ZappoMan
d8245997ce Merge pull request #716 from Ventrella/particles 
Improvements to the Particles System
 2013-07-31 15:50:57 -07:00
Stephen Birarda
d66adc7a18 Merge pull request #736 from birarda/qt5 
call use modules after OpenNI is linked
 2013-07-31 15:49:01 -07:00
Stephen Birarda
c34bc4173b call use modules after OpenNI is linked 2013-07-31 15:45:22 -07:00
Jeffrey Ventrella
6c1cc911d5 Merge remote-tracking branch 'upstream/master' into particles 2013-07-31 15:12:54 -07:00
Jeffrey Ventrella
5b1ba56d67 toggle debug print statements for Leap fingers 2013-07-31 15:12:29 -07:00
Andrzej Kapolka
415949cc26 Terminology change to reflect the fact that we're no longer using the mean. 2013-07-31 14:40:33 -07:00
Stephen Birarda
8807128791 Merge pull request #735 from birarda/qt5 
remove useless link to QT_LIBRARIES
 2013-07-31 14:25:11 -07:00
Stephen Birarda
10b57bca80 remove useless link to QT_LIBRARIES 2013-07-31 14:24:30 -07:00
Jeffrey Ventrella
0aaeb4550a cleanup 2013-07-31 13:07:52 -07:00
Jeffrey Ventrella
89f36a7eb7 cleanup 2013-07-31 12:38:40 -07:00
Jeffrey Ventrella
2901b58059 changed variable name from t to effectsTimer 2013-07-31 12:34:43 -07:00
Stephen Birarda
ffa3c5556c Merge pull request #734 from birarda/qt5 
switch cmake source for jenkins build to root
 2013-07-31 12:28:28 -07:00
Stephen Birarda
2c5b8d3121 cmake source is root, make specific target 2013-07-31 12:21:49 -07:00
Andrzej Kapolka
729158f882 Added depth smoothing, experimenting with using depth minimum rather than 
mean.
 2013-07-31 12:19:14 -07:00
Jeffrey Ventrella
482c5f0f4a turned on leap hand diagram 2013-07-31 12:09:46 -07:00
Leonardo Murillo
fcfc0d1c75 Merge pull request #733 from birarda/qt5 
fix link to QtWebKit
 2013-07-31 12:07:12 -07:00
Stephen Birarda
43fad3037f fix link to QtWebKit lib to be fervor specific 2013-07-31 12:04:47 -07:00
Stephen Birarda
0deb94d48a Merge pull request #732 from birarda/qt5 
redundant setting of CMAKE_PREFIX_PATH in interface CMakeLists
 2013-07-31 11:56:25 -07:00
Stephen Birarda
0086dfdb26 redundant setting of CMAKE_PREFIX_PATH in interface CMakeLists 2013-07-31 11:53:48 -07:00
Stephen Birarda
be2669bbec Merge pull request #723 from birarda/qt5 
switch to qt5
 2013-07-31 11:42:57 -07:00
Stephen Birarda
9e63b78a69 Merge branch 'master' of github.com:worklist/hifi into qt5 2013-07-31 11:35:24 -07:00
Jeffrey Ventrella
1f48de891b Merge remote-tracking branch 'upstream/master' into particles 2013-07-31 11:06:31 -07:00
Philip Rosedale
549832467c Merge branch 'master' of https://github.com/worklist/hifi 2013-07-30 16:42:21 -07:00
Philip Rosedale
61515879de Merge pull request #731 from ey6es/pointy 
Various tweaks to depth streaming: send depth in separate stream from video (rather than one on top of the other); better computation of mean face depth; use mean face depth to calculate forward/backward lean; send valid mask in V channel.
 2013-07-30 16:41:26 -07:00
Andrzej Kapolka
353d674ad9 Masking tweak. 2013-07-30 15:56:47 -07:00
Andrzej Kapolka
96bd7dbe25 Removed the magic from a number. 2013-07-30 15:30:34 -07:00
Andrzej Kapolka
c787781efb Send color and depth as separate streams (rather than one on top of the other) 
so that we can control their bitrates separately.
 2013-07-30 15:11:32 -07:00
Philip Rosedale
98ec2efc01 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-30 14:55:33 -07:00
Stephen Birarda
ab2f9ee31b Merge branch 'qt5' 2013-07-30 14:19:35 -07:00