Commit graph

16791 commits

Author SHA1 Message Date
Stephen Birarda
7848c63fae handle name location shortcut explicitly to work around bug 2014-09-17 14:43:48 -07:00
Brad Hefta-Gaub
c248e1807f Merge pull request #3434 from birarda/master
have domain server confirm access token is present before IP update
2014-09-17 14:40:22 -07:00
Brad Hefta-Gaub
28d8645c20 Merge pull request #3437 from Atlante45/fix_attachments_scale_to_fit_crash
Fixes crash in Model::scaleToFit()
2014-09-17 14:38:41 -07:00
Atlante45
3751e05ce3 Fixes crash in Model::scaleToFit() 2014-09-17 13:37:16 -07:00
Craig Hansen-Sturm
cc7cc151c4 Merge pull request #3435 from ZappoMan/fixRotatedStatic
more work toward fixing the static - still not fully fixed
2014-09-17 13:00:45 -07:00
ZappoMan
ab447e20ee move filter to single instance in mixer, and do filtering on pre-mix buffer not the mixed buffer 2014-09-17 12:48:47 -07:00
Stephen Birarda
cc79254a41 have domain server make sure access token is present before IP update 2014-09-17 09:40:48 -07:00
AndrewMeadows
42a84b7ff1 Merge pull request #3429 from ctrlaltdavid/20021
Code Review for Job #20021
2014-09-17 09:19:29 -07:00
ZappoMan
c30ef9c331 Revert "flip default for enable filter to be disable filter to work around settings bug"
This reverts commit 2a9d8d9238.
2014-09-17 08:52:23 -07:00
ZappoMan
e3f573d05b Merge branch 'master' of https://github.com/highfidelity/hifi into fixRotatedStatic 2014-09-17 08:52:00 -07:00
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
ZappoMan
2a9d8d9238 flip default for enable filter to be disable filter to work around settings bug 2014-09-17 07:04:16 -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
David Rowe
ed2216d100 Apply right hand roll work-around only if Windows 2014-09-16 11:13:42 -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
David Rowe
f890ea744b Add calibration of physical hand height 2014-09-15 23:09:00 -07:00
David Rowe
f1d7ab149f Add calibration of "zero" position according to avatar body 2014-09-15 21:25:50 -07:00
Philip Rosedale
af638a9963 Use dimensions, not radius 2014-09-15 20:55:25 -07:00
David Rowe
543e9e3eb5 Access wrist controller rotation only once per frame 2014-09-15 20:22:53 -07:00
David Rowe
a594136a9a Fix up hand roll, pitch, and yaw as best able for now 2014-09-15 20:12:13 -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