ZappoMan
451b2bc595
added Sending Mode to on screen stats
2013-08-07 12:07:39 -07:00
ZappoMan
11b7e84a80
Merge pull request #811 from ey6es/master
...
Several minor fixes for depth camera code.
2013-08-07 12:01:01 -07:00
Andrzej Kapolka
377adb30ae
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 11:14:48 -07:00
atlante45
ce12c51fce
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 11:13:26 -07:00
ZappoMan
96e6c2f9bd
Merge pull request #810 from ZappoMan/master
...
quick fix crash in parseVoxelStats()
2013-08-07 11:11:46 -07:00
atlante45
08309e3aac
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 11:11:29 -07:00
ZappoMan
ccf3498ae5
quick fix crash in parseVoxelStats()
2013-08-07 11:11:03 -07:00
atlante45
f151b2cfc1
- Don't render body when in first person view
2013-08-07 10:58:30 -07:00
atlante45
132d03e291
Moved string when following to chest
2013-08-07 10:56:32 -07:00
ZappoMan
d893d4cf16
Merge pull request #807 from machinelevel/dev4
...
Rave tweaks: change the look of the hands, fix screen-darken
2013-08-07 10:49:59 -07:00
Eric Johnston
1fc4f17f7a
Rave tweaks: change the look of the hands, fix screen-darken
...
Screen-darken is now a simple fullscreen draw
Leap hands are now visible and match body lighting
Fingertips are hidden and hand coloring matches body and arm
"fake hands" aren't active unless they're chosen from the Debug menu.
2013-08-07 10:29:31 -07:00
Andrzej Kapolka
ca939fb6b8
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 10:18:45 -07:00
Jeffrey Ventrella
b007ab11d4
Merge remote-tracking branch 'upstream/master' into particles
2013-08-07 10:18:32 -07:00
Jeffrey Ventrella
253154ce6d
fixed mohawk physics bug
2013-08-07 10:17:53 -07:00
Andrzej Kapolka
f20ac7f4bc
Include received video data in bandwidth usage, clear webcam bits when it's
...
been turned off.
2013-08-07 10:17:04 -07:00
Philip Rosedale
cdfabd7647
Merge pull request #805 from ZappoMan/master
...
Tweaks for Grayson
2013-08-07 10:01:58 -07:00
ZappoMan
61560af28f
cleanup
2013-08-06 19:21:46 -07:00
ZappoMan
a5f472254d
removed ground plane grid, and changed start position
2013-08-06 19:15:26 -07:00
Philip Rosedale
7583e1cd14
Merge pull request #802 from ey6es/master
...
Added a textured rendering mode for depth data that doesn't use video input; rather, it computes normals from the depth and uses local lighting.
2013-08-06 17:13:50 -07:00
Eric Johnston
378cb343ae
Rave tweaks per Ryan's request: Mood lighting for the avatars. This also sets us up to have light coming from the effects, if we want.
2013-08-06 16:45:15 -07:00
Andrzej Kapolka
2f2eaf8ae5
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-06 16:28:22 -07:00
Andrzej Kapolka
63aeb4df75
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/Application.cpp
2013-08-06 16:28:14 -07:00
Andrzej Kapolka
bd3c235fe4
Switching between textured and untextured modes.
2013-08-06 16:23:58 -07:00
atlante45
558255ca3d
- Made collision On by default
2013-08-06 16:13:31 -07:00
Philip Rosedale
426abbb55a
Merge pull request #799 from ZappoMan/fun_fade
...
add fade effect to voxel add and delete, fix crash with audio injector
2013-08-06 15:09:43 -07:00
ZappoMan
634b69b545
Merge pull request #797 from machinelevel/dev4
...
Rave demo changes per Ryan's request: Darken the world when you're in ra...
2013-08-06 15:00:26 -07:00
ZappoMan
05452dc2aa
Merge pull request #796 from PhilipRosedale/touchLook
...
Tune gyros, always fly in direction of sight, head always moves with gyros, adjustable view sensitivity
2013-08-06 14:59:28 -07:00
ZappoMan
facc9e1ee7
add fade effect to voxel add and delete, fix crash with audio injector
2013-08-06 14:55:40 -07:00
Eric Johnston
2e5dade413
Rave demo changes per Ryan's request: Darken the world when you're in rave mode, but leave the avatars and effects un-darkened.
...
Also fixed a warning in AvatarData.cpp initialization
2013-08-06 14:29:30 -07:00
ZappoMan
6cf87fc120
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
...
Conflicts:
interface/src/Application.cpp
2013-08-06 13:49:42 -07:00
Philip Rosedale
ebd5c4832a
Merge branch 'master' of https://github.com/worklist/hifi into touchLook
2013-08-06 12:34:55 -07:00
Philip Rosedale
120bbbd506
Tuned gyro look, added better preferences
2013-08-06 12:34:45 -07:00
ZappoMan
c93ed450a2
Merge pull request #791 from Atlante45/stalking_indicator
...
Stalking indicator
2013-08-06 12:33:26 -07:00
Philip Rosedale
abf64f3e7f
Merge pull request #792 from Atlante45/turn_off_collisions
...
Add option to turn collisions on and off
2013-08-06 12:27:27 -07:00
ZappoMan
88e2e3dd3f
added visulization for voxel add/kill
2013-08-06 12:05:43 -07:00
atlante45
ddf1b06bf9
Add option to turn collisions on and off
2013-08-06 11:33:59 -07:00
atlante45
eb9f32b7cb
Merge branch 'master' of https://github.com/worklist/hifi into stalking_indicator
2013-08-06 11:07:58 -07:00
atlante45
32c155ef71
Render a string to show who is following who
2013-08-06 10:53:10 -07:00
ZappoMan
73510ec975
added notifications with jurisdiction details for when voxel servers come and go
2013-08-06 10:33:09 -07:00
Philip Rosedale
58cb852597
Touch-driven pitch happens immediately even when wearing gyros
2013-08-06 10:06:40 -07:00
Philip Rosedale
e5de67152e
Merge pull request #786 from Ventrella/particles
...
Added member variables to Hand.cpp to manage rave glove mode switching
2013-08-05 19:26:55 -07:00
Philip Rosedale
d7dc07502c
Merge pull request #787 from machinelevel/dev4
...
Rave glove demo: network-glove fixes
2013-08-05 18:58:04 -07:00
Eric Johnston
d85ce81313
Rave glove demo: network-glove fixes
...
After this change, people can see each other's rave glove performances.
1. Moved hand->simulate call into avatar->simulate so that it gets called on all avatars, not just mine.
2. Hide the rave stage, so it's out of the way while we figure out the best way to darken the world, if that's still desired.
2013-08-05 17:27:42 -07:00
ZappoMan
b016c08578
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
...
Conflicts:
libraries/avatars/src/HandData.h
2013-08-05 16:53:41 -07:00
ZappoMan
acd3acb81e
correctly handle freeing of memory for _jurisdictionRoot in VoxelSceneStats
2013-08-05 16:51:01 -07:00
Jeffrey Ventrella
2dbd0f7f31
Merge branch 'master' of https://github.com/worklist/hifi into particles
2013-08-05 16:31:49 -07:00
Jeffrey Ventrella
f51db292a4
ya
2013-08-05 16:26:32 -07:00
ZappoMan
07a61a3c8e
Merge pull request #782 from Atlante45/master
...
few fixes on rescaling and following
2013-08-05 15:44:15 -07:00
atlante45
55e34558cb
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-05 15:26:43 -07:00
Andrzej Kapolka
36ae7dbd48
Normalize when we render the ground. This shouldn't be necessary, but it
...
looks like various parts of the code rely on RESCALE_NORMAL, which is set but
not unset in avatar/Head/Hand. We'll have to look at that more closely later
on.
2013-08-05 15:24:21 -07:00
