Eric Johnston
9ab8fecff5
Minor tweaks to Rave Glove mode, per Ryan's testing
...
1. Improve response by using unfiltered data from Leap library
2. Reduce distracting arm-flail by only attaching the arm to che glove when we're not in rave mode.
2013-07-22 07:19:25 -07:00
ZappoMan
84328057ba
Merge pull request #717 from machinelevel/dev4
...
Rave glove demo: Greatly improved Leap handling
2013-07-20 10:27:26 -07:00
Eric Johnston
6ceb48127a
Small fix when no Leap connected.
2013-07-19 19:56:05 -07:00
Eric Johnston
d10ffd4f2d
Small .h fix after testing without Leap libs
2013-07-19 19:53:30 -07:00
Eric Johnston
0cdad1a313
Merge branch 'master' of https://github.com/worklist/hifi into dev4
2013-07-19 19:48:52 -07:00
Eric Johnston
b8cf4a9775
Rave glove: stabilization of Leap hands
2013-07-19 19:47:07 -07:00
ZappoMan
4b08996525
Merge pull request #714 from ey6es/pointy
...
Basic video/depth sending/receiving using VP8 encoding.
2013-07-19 16:01:42 -07:00
Andrzej Kapolka
353f16b2d0
Style fixes.
2013-07-19 15:56:04 -07:00
Andrzej Kapolka
f70b4dcab2
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-19 15:49:07 -07:00
ZappoMan
52a2ac50a9
Merge pull request #715 from LionTurtle/master
...
Bug fix on lookatVectors (fixed scale in head.cpp)...
2013-07-19 10:18:42 -07:00
Eric Johnston
262851346c
Rave Glove Demo: Leap Rework (simplification and elimination of redundant data passing)
...
This version matches fingers based on Leap serialized ID's, avoiding finger-replacement-crosstalk.
2013-07-19 09:31:45 -07:00
Eric Johnston
28bf0b5147
Merge branch 'master' of https://github.com/worklist/hifi into dev4
2013-07-19 08:47:37 -07:00
Mark Peng
a14768bb29
Remove more unnecessary additions.
2013-07-19 01:00:55 -07:00
Mark Peng
ceb743a65d
Remove unncessary import math.h (for reals).
2013-07-19 00:56:12 -07:00
Mark Peng
fc22240525
Remove unnecessary import math.h.
2013-07-19 00:55:31 -07:00
Mark Peng
a84c1c9e21
Merge remote-tracking branch 'upstream/master'
2013-07-19 00:46:52 -07:00
Mark Peng
927aea8bb4
Bug fix on lookatVectors (fixed scale in head.cpp). Added bool
...
isLookingAtOtherAvatar. Basic halo indicator in Application.cpp.
2013-07-19 00:44:23 -07:00
ZappoMan
e6c50e3d80
Merge pull request #713 from birarda/ds-switch
...
smarter domain-server hostname switching
2013-07-18 22:15:33 -07:00
Andrzej Kapolka
ff0d63173c
Pass the aspect ratio into the shader, since it no longer necessarily
...
corresponds to the texture rectangle's aspect ratio.
2013-07-18 21:25:11 -07:00
Mark Peng
cfcb31172c
Merge remote-tracking branch 'upstream/master'
2013-07-18 21:08:08 -07:00
Andrzej Kapolka
0ae6887c4a
The depth texture needs nearest neighbor filtering.
2013-07-18 21:06:38 -07:00
Andrzej Kapolka
b15724665b
Removed unused variable, fixed shader comments.
2013-07-18 18:16:45 -07:00
Andrzej Kapolka
b5a8c2710c
Merge branch 'master' of https://github.com/worklist/hifi into pointy
...
Conflicts:
interface/src/Application.h
interface/src/Audio.h
interface/src/Webcam.cpp
2013-07-18 18:09:57 -07:00
Andrzej Kapolka
e6a2aec1c1
Added libvpx library for OS X.
2013-07-18 17:56:15 -07:00
Stephen Birarda
ef7dc4a39a
if the hostname field is left blank reset to DEFAULT_DOMAIN_HOSTNAME
2013-07-18 17:42:25 -07:00
Andrzej Kapolka
b8be66c6fc
Now able to stream depth data.
2013-07-18 17:39:49 -07:00
Stephen Birarda
01e6891fd3
save custom domain server hostname to QSettings
2013-07-18 17:23:52 -07:00
ZappoMan
30be3f9a4e
Merge pull request #712 from birarda/master
...
fix VS packet receipt on domain server switch
2013-07-18 15:53:29 -07:00
Stephen Birarda
902e300347
Merge pull request #711 from ZappoMan/bug_fixes
...
adjust server sleep time to allow 60fps
2013-07-18 15:49:55 -07:00
Stephen Birarda
a00b95666a
don't listen to VS packets not from current VS
2013-07-18 15:49:07 -07:00
Stephen Birarda
45d82dc97c
correct reference to new hostname for Qt temp variable changes
2013-07-18 15:20:05 -07:00
ZappoMan
4f36a0cda1
adjust server sleep time to allow 60fps
...
(cherry picked from commit 4d1ae43085
2013-07-18 15:15:57 -07:00
Stephen Birarda
4dd6afc08f
fix grabbing of domain server hostname from QString
2013-07-18 14:59:11 -07:00
Stephen Birarda
04a2dd3b86
clear environment data on domain server switch
2013-07-18 14:36:55 -07:00
Mark Peng
fe01067473
Merge remote-tracking branch 'upstream/master'
2013-07-18 14:35:41 -07:00
Mark Peng
7ee0d8da2e
Render circle in 3D space for lookatIndicator. Still not normal to the screen.
2013-07-18 14:34:51 -07:00
Andrzej Kapolka
7ce04444fc
Most of the way towards working video encoding.
2013-07-18 14:14:44 -07:00
ZappoMan
12c519cbac
Merge pull request #710 from birarda/master
...
don't not kill NODE_TYPE_VOXEL_SERVER
2013-07-18 14:11:08 -07:00
Stephen Birarda
67e5a6409e
don't not kill NODE_TYPE_VOXEL_SERVER in removeSilentNodes
2013-07-18 14:07:08 -07:00
Eric Johnston
06aeba7d29
Merge branch 'master' of https://github.com/worklist/hifi into dev4
2013-07-18 12:27:47 -07:00
Stephen Birarda
402ec86bd1
Merge pull request #709 from PhilipRosedale/gyroTweaks
...
Gyros don't move view for small head movements
2013-07-18 11:27:49 -07:00
ZappoMan
f781829f91
Merge pull request #708 from ZappoMan/bug_fixes
...
fixed crash
2013-07-18 11:25:36 -07:00
ZappoMan
c41f5e27ef
fixed crash
2013-07-18 11:25:01 -07:00
Philip Rosedale
b3b8ef3347
Gyros don't move view for small head movements
2013-07-18 11:24:39 -07:00
Philip Rosedale
e6cd90fa37
Merge pull request #704 from Ventrella/particles
...
more code cleanup
2013-07-18 11:08:18 -07:00
Stephen Birarda
5edcfaa38b
Merge pull request #705 from ZappoMan/bug_fixes
...
cleaned up some compiler warnings and constants
2013-07-18 10:27:30 -07:00
Stephen Birarda
da25821270
Merge pull request #706 from birarda/master
...
switch stars file URL to non-SSL
2013-07-18 10:26:57 -07:00
Stephen Birarda
2ad99f3129
point to stars file on non-SSL for easier RV redirect
2013-07-18 10:26:08 -07:00
ZappoMan
1e421d222d
cleaned up some compiler warnings and constants
2013-07-18 10:20:01 -07:00
Jeffrey Ventrella
f89b1fcd4c
more clean up of particle system
2013-07-17 18:10:30 -07:00
