Commit graph

133 commits

Author SHA1 Message Date
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
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
7ce04444fc Most of the way towards working video encoding. 2013-07-18 14:14:44 -07:00
Andrzej Kapolka
401ef45000 Removed keypoint stuff, fixed stupidity leading to fringed edges (was
linearly interpolating the missing values).
2013-07-16 17:56:53 -07:00
Andrzej Kapolka
fd1671a44f Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-16 12:48:24 -07:00
Andrzej Kapolka
905bd9b011 Track features on face, add a mode to render just key points. 2013-07-16 11:54:19 -07:00
Andrzej Kapolka
6c587af6ac Merge branch 'master' of https://github.com/worklist/hifi into pointy
Conflicts:
	interface/src/avatar/Head.cpp
2013-07-15 13:13:51 -07:00
Andrzej Kapolka
a59fbfbf3e Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-14 18:21:50 -07:00
Andrzej Kapolka
411cb92300 Working on face rendering as point cloud. 2013-07-14 15:54:29 -07:00
Andrzej Kapolka
763e6a2fa1 Merge branch 'master' of https://github.com/worklist/hifi into pointy
Conflicts:
	interface/src/Application.h
2013-07-12 15:34:55 -07:00
Andrzej Kapolka
61f6b8b974 Moved all the avatar bits to their own subdirectory. 2013-07-11 14:53:46 -07:00
Renamed from interface/src/Avatar.cpp (Browse further)