Philip Rosedale
9defa6255a
disable mouse wheel voxel scale change
2013-08-01 15:31:09 -07:00
Philip Rosedale
ef8daffa4d
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-01 15:00:27 -07:00
Philip Rosedale
fcf20a7ebc
Sound on click, but not on hover
2013-08-01 15:00:08 -07:00
Mark Peng
9ba0e3bb0c
Add reference lines to mouse voxel when adding/deleting voxels.
2013-08-01 13:03:17 -07:00
Philip Rosedale
bc1ac6b455
turn down collision sounds
2013-08-01 12:49:10 -07:00
Philip Rosedale
ba2c98a3eb
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-01 10:12:13 -07:00
Stephen Birarda
71ab8ae4f8
some necessary changes for AvatarData transmission
2013-08-01 10:07:10 -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
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
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
2c5b8d3121
cmake source is root, make specific target
2013-07-31 12:21:49 -07:00
Jeffrey Ventrella
482c5f0f4a
turned on leap hand diagram
2013-07-31 12:09:46 -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
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
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
Andrzej Kapolka
f8ba1c4be1
Use the V channel to provide masking information, indicating invalid depths.
2013-07-30 13:42:29 -07:00
Andrzej Kapolka
3c437076a7
When we have a mean face depth, use that rather than the face size to
...
estimate the z coordinate.
2013-07-30 11:07:33 -07:00
Andrzej Kapolka
3b4a4daec3
Ignore maximum values when computing the depth.
2013-07-29 18:26:51 -07:00
Andrzej Kapolka
9c0e29b5e6
Use only valid values to compute mean, and use the post-warp data to avoid
...
breaking on head tilt (because we were using the bounds of the rotated rect,
which included too much background).
2013-07-29 18:16:10 -07:00
Jeffrey Ventrella
c6d301c591
cleanup
2013-07-29 17:21:45 -07:00
Jeffrey Ventrella
df32c18994
cleanup
2013-07-29 16:15:44 -07:00
Andrzej Kapolka
de52342a14
Working on depth data processing.
2013-07-29 16:04:15 -07:00
Jeffrey Ventrella
4b07d656f4
Merge remote-tracking branch 'upstream/master' into particles
2013-07-29 15:47:22 -07:00
Jeffrey Ventrella
79823c6fed
cleanup
2013-07-29 15:47:01 -07:00
Andrzej Kapolka
3b3801915b
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-29 15:44:41 -07:00
Andrzej Kapolka
6bc3e9b808
Merge pull request #726 from ZappoMan/bug_fixes
...
fix bug with dragonfly leaving trailing bits
2013-07-29 15:44:31 -07:00
ZappoMan
1a73485e36
Improved VoxelNode delete callback based on CR feedback
...
- changed hooks to use a virtual base class approach
- switched account of hooks to use a vector instead of home grown solution
- added support for VoxelNode to know what VoxelSystem it belongs to
2013-07-29 15:30:30 -07:00
Jeffrey Ventrella
a1eba53678
cleanup
2013-07-29 15:09:38 -07:00
Jeffrey Ventrella
f8392c0843
Merge remote-tracking branch 'upstream/master' into particles
2013-07-29 15:07:56 -07:00
Jeffrey Ventrella
37ff8ae030
added color modulation
2013-07-29 15:07:05 -07:00
Andrzej Kapolka
fac3ff1089
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-29 14:35:31 -07:00
ZappoMan
03a75ab295
fixed spacing
2013-07-29 13:08:05 -07:00