Commit graph

4155 commits

Author SHA1 Message Date
Andrzej Kapolka
f268797bde Merge branch 'master' of https://github.com/worklist/hifi 2013-12-09 16:00:00 -08:00
Andrzej Kapolka
569425df88 Merge pull request #1348 from PhilipRosedale/narcissus
Improved full screen mirror view to allow leaning
2013-12-09 15:42:06 -08:00
Andrzej Kapolka
9641ca1e66 More efficient (though perhaps overkill) blendshape mapping. 2013-12-09 15:37:09 -08:00
Andrzej Kapolka
a431268815 Somewhat inefficient take on allowing blendshapes coefficients to apply
multiple blendshapes.
2013-12-09 15:21:20 -08:00
Andrzej Kapolka
9a3c44ce7d Enable alpha testing for models. 2013-12-09 14:49:37 -08:00
Andrzej Kapolka
8f633f87e9 Fix for seg fault on Linux exit. 2013-12-09 13:32:02 -08:00
Philip Rosedale
9616268da7 Improved full screen mirror view to allow leaning 2013-12-09 13:02:18 -08:00
Andrzej Kapolka
2381b2bbaf Get rid of initial glow. 2013-12-09 12:30:14 -08:00
Andrzej Kapolka
c36e04c435 This should fix the erroneous persistence on startup. 2013-12-09 11:21:32 -08:00
Andrzej Kapolka
85f7995700 Don't apply ambient occlusion to avatars (just voxels). 2013-12-09 11:00:35 -08:00
Philip Rosedale
3bd8c53115 Fix to get other avatar’s model data 2013-12-07 11:36:51 -08:00
Andrzej Kapolka
4c2c8675e7 Merge pull request #1343 from PhilipRosedale/remove_avatar_balls
Fix to jerky avatar movement, fix for rotation broken
2013-12-06 17:51:11 -08:00
Philip Rosedale
4edb7decdf removed printf 2013-12-06 17:47:01 -08:00
Philip Rosedale
9195d60b71 Fix to jerky avatar movement, fix for rotation broken 2013-12-06 17:45:28 -08:00
ZappoMan
91d6ef633d Merge pull request #1340 from PhilipRosedale/remove_avatar_balls
Remove avatar balls
2013-12-06 17:11:53 -08:00
Andrzej Kapolka
65c21105ae Merge pull request #1339 from PhilipRosedale/remove_avatar_touch
Removed _avatarTouch class
2013-12-06 17:11:41 -08:00
Philip Rosedale
66c5a10020 Fix chat message height 2013-12-06 16:47:13 -08:00
Philip Rosedale
4707733563 Removed avatar balls 2013-12-06 16:26:02 -08:00
ZappoMan
ba83fa462d Merge pull request #1336 from birarda/master
some NodeList cleanup
2013-12-06 15:59:33 -08:00
Philip Rosedale
0fcc2d8634 Removed _avatarTouch class 2013-12-06 15:11:01 -08:00
Stephen Birarda
8f4e641ade remove NodeList threads that are deprecated 2013-12-05 17:11:58 -08:00
Andrzej Kapolka
d374716c7d Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 17:09:19 -08:00
Andrzej Kapolka
36ea1675ef Merge pull request #1334 from PhilipRosedale/ravectomy
Ravectomy
2013-12-05 17:08:55 -08:00
Stephen Birarda
146d5294a0 more PortAudio cleanup in cmake 2013-12-05 16:51:04 -08:00
Philip Rosedale
3f957bbf5d Rave out! 2013-12-05 16:46:11 -08:00
Andrzej Kapolka
16cfeff00d Ignore further up the hierarchy. 2013-12-05 16:37:40 -08:00
Andrzej Kapolka
02cd97deb1 Adjust palm collision size, use last free index when ignoring. 2013-12-05 16:28:33 -08:00
Philip Rosedale
a1027b7dda reverse Hz change because I’ve got some other stuff in there 2013-12-05 16:03:06 -08:00
Philip Rosedale
006472cb24 tweaked RGB->Hz for drum to make piano 2013-12-05 15:56:55 -08:00
Andrzej Kapolka
9ecef89c6c Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 15:36:56 -08:00
Andrzej Kapolka
ecff3a0542 Basic sphere/capsule-cone penetration test. 2013-12-05 15:36:34 -08:00
Philip Rosedale
e9e6f97084 Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 15:26:14 -08:00
Stephen Birarda
3f9e00d977 fix a boneheaded mistake in AvatarMixer broadcastAvatarData 2013-12-05 15:10:01 -08:00
Andrzej Kapolka
d238d3c35a Called addPenetrations wrong. 2013-12-05 14:49:30 -08:00
Stephen Birarda
5e73e803e9 fixes for procedural audio input 2013-12-05 14:49:28 -08:00
Andrzej Kapolka
9be30acf82 Render the palm collision proxies. 2013-12-05 14:40:24 -08:00
Stephen Birarda
21076af739 hook audio loudness back to QAudioInput 2013-12-05 14:29:55 -08:00
Andrzej Kapolka
3c167da8a4 Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 14:26:37 -08:00
Andrzej Kapolka
d2cb6f0243 Test hand against other avatars. 2013-12-05 14:19:13 -08:00
Andrzej Kapolka
b90c5bdae8 Option to render collision proxies, more general avatar penetration test, fix
for meshes with only one joint influence.
2013-12-05 14:00:38 -08:00
Philip Rosedale
a9bd6718ff Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 13:41:13 -08:00
Philip Rosedale
a7dacec63d Don’t render collision if not own avatar, don’t check for collisions with voxel tree if not me. 2013-12-05 13:36:00 -08:00
Stephen Birarda
487209e270 fix bandwidth meter for audio 2013-12-05 13:21:16 -08:00
Stephen Birarda
d1054b3cfc add received audio to buffer via queued connection 2013-12-05 13:17:16 -08:00
Stephen Birarda
80e1b5a4bc some logic and spacing fixes in the audio mixer 2013-12-05 13:05:29 -08:00
Stephen Birarda
d2f7dd2371 resolve conflicts on merge with upstream master 2013-12-05 12:13:11 -08:00
Andrzej Kapolka
1edfc90e5e Missed a scale multiplier. 2013-12-05 12:02:48 -08:00
Stephen Birarda
71aca69410 fix rendered scope for new Qt Audio 2013-12-05 11:36:45 -08:00
Philip Rosedale
0c4b66ef54 Merge pull request #1312 from ZappoMan/more_on_particle_server
First cut at basic Particle Server
2013-12-05 11:29:01 -08:00
Andrzej Kapolka
0ea0887f66 Add a scale factor to bone radii. 2013-12-05 11:21:56 -08:00