Commit graph

16974 commits

Author SHA1 Message Date
Andrzej Kapolka
bfaac9eae1 Deferred lighting tweaks. 2014-09-15 18:38:10 -07:00
Brad Hefta-Gaub
cb1c8a9bb2 Merge pull request #3417 from thoys/load-script-from-message-example-js
load a javascript from a message when the user agrees
2014-09-15 18:33:14 -07:00
Brad Hefta-Gaub
a9206e0e85 Merge pull request #3422 from chansensturm/audio-temp
Implement Gordon-Smith 2-pole quadrature oscillator
2014-09-15 18:24:11 -07:00
Craig Hansen-Sturm
117a868bcf head penumbra filter tuning with Freddy / filter defaults to on 2014-09-15 17:49:48 -07:00
Andrzej Kapolka
7580a1da89 Glow fix for simple shader. 2014-09-15 17:33:07 -07:00
Andrzej Kapolka
da05d37015 Leave the glow level alone when writing the deferred-lit bits. 2014-09-15 17:19:15 -07:00
Andrzej Kapolka
580d591dc4 Working on getting glow to work with deferred lighting. 2014-09-15 17:11:36 -07:00
Philip Rosedale
4cfbc2b11b Merge branch 'master' of https://github.com/worklist/hifi 2014-09-15 16:32:59 -07:00
Brad Hefta-Gaub
1ca11c5d75 Merge pull request #3421 from Atlante45/radio_js
Radio js
2014-09-15 16:19:27 -07:00
Philip Rosedale
bd5cb346d2 Merge pull request #3420 from AndrewMeadows/ragdoll
Walking avatar tweaks
2014-09-15 16:12:23 -07:00
Andrzej Kapolka
0f3a020b5d Working on getting particles/entities to work with deferred lighting;
normalize normals from buffer.
2014-09-15 16:07:48 -07:00
Atlante45
9bed37c86c Update position of audio 2014-09-15 16:05:26 -07:00
Atlante45
f3e2507ed3 Merge branch 'master' of https://github.com/highfidelity/hifi into radio_js 2014-09-15 15:54:31 -07:00
Philip Rosedale
8eeebd15da Merge pull request #3418 from ey6es/master
Ryan's new blendshape mappings for Mixamo.
2014-09-15 14:17:00 -07:00
Andrew Meadows
0539246089 merge upstream/master into andrew/ragdoll 2014-09-15 13:56:51 -07:00
Andrew Meadows
b2432876ce More reliable floor detection for avatar movement.
Also tweaked max walking speed.
2014-09-15 13:53:37 -07:00
Craig Hansen-Sturm
7a9cf193b4 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-15 13:47:24 -07:00
Craig Hansen-Sturm
dbec48a804 Merge pull request #3419 from birarda/master
add a missing update of having heard from the audio-mixer
2014-09-15 13:46:21 -07:00
Stephen Birarda
193c125d66 fix scope for switch case 2014-09-15 13:29:13 -07:00
Andrzej Kapolka
467a9582c7 Somehow my reverting the ambient occlusion effect didn't take. 2014-09-15 13:29:03 -07:00
Stephen Birarda
6e9da9747e add a missing update of having heard from the audio-mixer 2014-09-15 13:25:50 -07:00
Andrzej Kapolka
6a0b3fa202 Ryan's new blendshape mappings for Mixamo. 2014-09-15 13:16:17 -07:00
Andrzej Kapolka
e3a1341be1 Don't include the color on the skin. 2014-09-15 12:52:35 -07:00
Andrzej Kapolka
b3b82ba56c I think we need to include the color. 2014-09-15 12:49:51 -07:00
Andrzej Kapolka
70c8c146bc Fix for specular issue on Nvidia, try passing along material colors. 2014-09-15 12:44:25 -07:00
Thijs Wenker
6feb732467 load a javascript from a message when the user agrees 2014-09-15 21:30:19 +02:00
Andrzej Kapolka
9caa4d3a08 Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-15 12:19:30 -07:00
Andrzej Kapolka
919112fe7c Starting to work on handling translucent meshes with deferred lighting. 2014-09-15 12:18:59 -07:00
Andrzej Kapolka
4475759461 Revert the normal-based ambient occlusion; I wasn't crazy about the look of
it.  Will perhaps revisit later.
2014-09-15 11:52:44 -07:00
Craig Hansen-Sturm
1c955384fb coding standard/typo 2014-09-15 09:56:11 -07:00
Clément Brisset
198b14310f Merge pull request #3416 from ZappoMan/fixGlitches
normalize all quats before packing
2014-09-15 09:40:07 -07:00
ZappoMan
fd9f64cb44 normalize all quats before packing 2014-09-15 08:46:28 -07:00
Philip Rosedale
a70e27f442 Merge pull request #3411 from ZappoMan/fixWarnings
fix warnings and removed some asserts
2014-09-14 20:28:39 -07:00
Philip Rosedale
06b6ceee66 Merge pull request #3412 from ZappoMan/fixStretchedAttachments
fix bug with attachments being stretched
2014-09-14 20:26:56 -07:00
David Rowe
1527c40e1d Add hand roll, pitch, and yaw 2014-09-14 15:25:02 -07:00
David Rowe
3ddd5854cd Position avatar hands with Leap Motion with no roll, pitch or yaw 2014-09-14 15:03:22 -07:00
David Rowe
4382b62613 Add TODO for reviewing Leap Motion right hand roll calculation 2014-09-14 14:02:03 -07:00
David Rowe
1b48d5c040 Add hand pitch, roll, and yaw from Leap Motion 2014-09-14 13:47:15 -07:00
David Rowe
be20ec9f4a Construct controllers in inactive state 2014-09-14 13:47:14 -07:00
David Rowe
1f159a5ce5 Refactor w.r.t. hands 2014-09-14 13:47:13 -07:00
David Rowe
c7b34b4f54 Lower left and right hands independently when no longer being tracked 2014-09-14 13:47:13 -07:00
David Rowe
b4592aceb6 Add interim work-around and TODOs for Leap Motion controller issues 2014-09-14 13:47:12 -07:00
David Rowe
16eca79cfa Add leapHands.js that makes avatar fingers mirror real finger movements 2014-09-14 13:47:11 -07:00
Craig Hansen-Sturm
0ba952b2f8 cleanup/remove stray static _frameOffset 2014-09-14 12:32:48 -07:00
Craig Hansen-Sturm
089267a937 completely remove new audio objects from playback rendering path when they are unused 2014-09-14 12:26:25 -07:00
Craig Hansen-Sturm
4a63f9f764 implement Gordon-Smith 2-pole quadrature oscillator 2014-09-14 12:22:32 -07:00
Craig Hansen-Sturm
85f68662b0 implement Gordon-Smith 2-pole quadrature oscillator 2014-09-14 12:22:29 -07:00
Craig Hansen-Sturm
2f4ab716f9 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-14 11:32:00 -07:00
Stephen Birarda
57534ff0bb Merge pull request #3414 from birarda/master
fix for domain-server passing back stack manager config
2014-09-14 09:56:25 -07:00
Stephen Birarda
c98b69f24f don't comment value return, rename domain settings file 2014-09-14 09:52:10 -07:00