Commit graph

16766 commits

Author SHA1 Message Date
AndrewMeadows
27c7b55237 Merge pull request #3430 from ey6es/master
Read and apply material opacity settings.
2014-09-17 08:51:12 -07:00
Stephen Birarda
4d4c7482b3 Merge pull request #3433 from birarda/master
fix presentation of checkboxes who default to true
2014-09-17 08:46:36 -07:00
Stephen Birarda
f1458dec3f fix presentation of checkboxes who default to true 2014-09-17 08:46:08 -07:00
Craig Hansen-Sturm
e8f5c46589 Merge pull request #3431 from ZappoMan/fixRotatedStatic
clean up the weak side/delay code to be more readable.
2014-09-16 21:42:26 -07:00
ZappoMan
9494af6153 fix static when rotating away from source 2014-09-16 20:40:09 -07:00
Andrzej Kapolka
213b4e6ee6 Removed testing code. 2014-09-16 17:53:40 -07:00
Andrzej Kapolka
fbd1efad81 Allow specifying material opacity. 2014-09-16 17:52:39 -07:00
Craig Hansen-Sturm
7b3f61ddc2 Merge pull request #3428 from ZappoMan/sendPositonOrientationInSilentPackets
Send positon orientation in silent packets
2014-09-16 13:39:06 -07:00
Philip Rosedale
55611bdd55 Merge pull request #3427 from birarda/master
add ability for domain server to update IP address in data server
2014-09-16 13:32:14 -07:00
ZappoMan
b50c2a37c2 Merge branch 'master' of https://github.com/highfidelity/hifi into sendPositonOrientationInSilentPackets 2014-09-16 13:11:00 -07:00
ZappoMan
9cbc53abc3 pack position and orientation in silent frames 2014-09-16 13:06:46 -07:00
Stephen Birarda
885030a10c handle receipt of new public socket and propogation to data-server 2014-09-16 12:37:22 -07:00
Stephen Birarda
47137c72a5 groundwork for repeated dynamic IP address updating in domain-server 2014-09-16 12:09:24 -07:00
Craig Hansen-Sturm
896cb70ff6 Merge pull request #3424 from PhilipRosedale/master
Fixes to audio attenuation jumps and better sample loop script
2014-09-16 12:00:36 -07:00
Brad Hefta-Gaub
47b061983f Merge pull request #3426 from birarda/master
don't prepend relative paths with hifi scheme, use quat for location orientation
2014-09-16 10:29:54 -07:00
Stephen Birarda
866f2005bd handle case where a location should be faced 2014-09-16 10:08:21 -07:00
Stephen Birarda
0033dfe5af use quat orientation to store locations and user locations 2014-09-16 09:57:21 -07:00
Philip Rosedale
e5d947422a Merge pull request #3425 from ZappoMan/butterflyCrash
fix crash in butterflies.js
2014-09-16 09:34:01 -07:00
Philip Rosedale
35b772bc4d fixes from review 2014-09-16 09:24:23 -07:00
Stephen Birarda
4cef21aa4f don't prepend relative paths with hifi scheme 2014-09-16 09:14:06 -07:00
ZappoMan
ffe1e2db00 fix crash in butterflies.js 2014-09-16 09:07:22 -07:00
Philip Rosedale
1514b58700 add detect if source is self 2014-09-16 01:30:25 -07:00
Philip Rosedale
62b21f52af fix for sharp change in attenuation when too near a source 2014-09-16 01:18:42 -07:00
Philip Rosedale
af638a9963 Use dimensions, not radius 2014-09-15 20:55:25 -07:00
Philip Rosedale
ca556d7eb3 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-15 20:00:49 -07:00
Philip Rosedale
d01b73bdaa Merge pull request #3423 from chansensturm/audio-temp
Head Penumbra filter changes (feedback from testing with Freddy)
2014-09-15 20:00:11 -07:00
Philip Rosedale
4dc929eddb Simpler script with sphere to indicate emission point 2014-09-15 19:50:38 -07:00
Craig Hansen-Sturm
ea6f89c9f4 head penumbra filter tuning / head penumbra filter now turned on by default 2014-09-15 18:46:10 -07:00
Craig Hansen-Sturm
b6c38b82dc stray inline keyword 2014-09-15 18:41:41 -07:00
Craig Hansen-Sturm
8de32f1170 out-of-line inline's for performance critical member functions 2014-09-15 18:38:36 -07:00
Craig Hansen-Sturm
d8a4d71b08 out-of-line inline's for performance critical member functions 2014-09-15 18:38:32 -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
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
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
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
Thijs Wenker
6feb732467 load a javascript from a message when the user agrees 2014-09-15 21:30:19 +02: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