atlante45
35557e1973
- Change collision radius according to near clip so nothing comes inside
2013-08-07 12:25:31 -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
e17149a49d
Merge pull request #812 from Atlante45/master
...
Rendering changes
2013-08-07 11:46:43 -07:00
Andrzej Kapolka
377adb30ae
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 11:14:48 -07:00
atlante45
08309e3aac
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-07 11:11:29 -07:00
Eric Johnston
10e4174ce3
Rave tweak: keep the right arm on the right-most Leap hand.
2013-08-07 11:08:14 -07:00
atlante45
dcdae6c6a0
- Add a translucide sphere around avatars far away with radius relative to average loudness
2013-08-07 11:00:20 -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
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
Eric Johnston
35465686db
Rave tweaks: Use separate light settings for avatars and particles
2013-08-06 17:39:56 -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
atlante45
558255ca3d
- Made collision On by default
2013-08-06 16:13:31 -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
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
fb2a1cce50
Merge pull request #795 from machinelevel/dev4
...
Rave glove adjustments per Ryan's requests: hide fingers and arms when r...
2013-08-06 13:45:42 -07:00
Eric Johnston
9a4a0e2819
Rave glove adjustments per Ryan's requests: hide fingers and arms when raving, center hands in front of face.
2013-08-06 12:44:29 -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
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
Philip Rosedale
58cb852597
Touch-driven pitch happens immediately even when wearing gyros
2013-08-06 10:06:40 -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
atlante45
29062c51b2
- changed according to review comments
...
- added reset scale option
2013-08-05 15:23:40 -07:00
atlante45
3d853f5b90
- Smooth rescaling
...
- stop following when leading avatar disconnect
- set max far clip for no more crash with really big avatars
2013-08-05 14:05:58 -07:00
ZappoMan
ce937247d1
added back getUprightEyeLevelPosition()
2013-08-02 18:47:21 -07:00
ZappoMan
fd81053e33
fixed compiler warnings
2013-08-02 18:33:41 -07:00
Mark Peng
71a919f226
Switch back to avatar.getEyePosition() rather than
...
avatar.getHead().getEyePosition() because of mysterious lag.
2013-08-02 18:02:37 -07:00
Mark Peng
d7cd88a9a7
Fix camera positioning so that it is in between avatar's eyes. Plus
...
some code clean up.
2013-08-02 17:30:26 -07:00
atlante45
f441295eb1
Merge branch 'pie_menu' of https://github.com/Atlante45/hifi into stalking_option
2013-08-02 14:15:07 -07:00
ZappoMan
55f7028726
Merge pull request #744 from PhilipRosedale/master
...
Smoother movement, rotation, less distracting collision noises. Play sound on click voxel
2013-08-02 14:03:51 -07:00
Andrzej Kapolka
0052221c33
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-08-01 15:52:58 -07:00
atlante45
fdd01a6551
merge
2013-08-01 15:48:57 -07:00
Andrzej Kapolka
ba9b5888d2
More work on full frame sending.
2013-08-01 13:00:01 -07:00
Philip Rosedale
bc1ac6b455
turn down collision sounds
2013-08-01 12:49:10 -07:00
atlante45
1b2f236d42
Follow mode operationnal
2013-07-30 12:30:15 -07:00
Jeffrey Ventrella
f8392c0843
Merge remote-tracking branch 'upstream/master' into particles
2013-07-29 15:07:56 -07:00
Mark Peng
d01f694d49
Remove extra semicolon in avatar.cpp
2013-07-29 11:52:29 -07:00
Jeffrey Ventrella
f83ee1e0b5
cleanup
2013-07-29 09:48:28 -07:00
Mark Peng
dd2655825a
Fix first person camera positioning to correspond to eyelevel.
...
This makes sure the lookatVectors don't seem to point upwards when
looking at you.
2013-07-26 16:08:17 -07:00
Jeffrey Ventrella
9890cf72ce
added keyboard mode switching for rave glove effects
2013-07-26 12:37:37 -07:00
atlante45
f3c87b81ec
Avatar can follow but don't look at the same point for the moment
2013-07-25 16:14:47 -07:00
atlante45
68194f2037
Slot calling when pie menu on avatar.
2013-07-24 13:50:00 -07:00
atlante45
177471e83b
First step toward follow mode
2013-07-24 11:24:28 -07:00
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
