Commit graph

71358 commits

Author SHA1 Message Date
sam gateau
84ad5c79f9 fixing a no op 2018-08-31 11:09:16 -07:00
sabrina-shanman
b5862aca2a Use bracket initialization for CollisionRegion.loaded 2018-08-31 10:53:20 -07:00
sabrina-shanman
2e290ea798 Only create a NestableTransformNode if the spatially nestable exists 2018-08-31 10:52:00 -07:00
sabrina-shanman
f71fc83309 Remove PickResult::needsToCompareResults 2018-08-31 10:48:48 -07:00
sabrina-shanman
4d85cb17f3 Include full transform in CollisionPick::getResultTransform 2018-08-31 10:46:17 -07:00
sabrina-shanman
9bf088d32b Just assign mathPick.loaded in CollisionPick::getMathematicalPick 2018-08-31 10:28:45 -07:00
sam gateau
6bd1ab5ae0 fixing a bad constant 2018-08-31 09:18:33 -07:00
sabrina-shanman
e94d7de99a Add JS API hook for getting overlay IDs from a pointer via
Pointer.getPointerProperties
2018-08-31 09:18:07 -07:00
sam gateau
262fdb3c28 ardressing coding standard 2018-08-31 09:09:22 -07:00
sam gateau
eb5f6c8eb3 ardressing coding standard 2018-08-31 09:07:34 -07:00
Sam Gateau
764f75c340 including review feedback 2018-08-30 22:26:45 -07:00
Sam Gateau
969d16262f Removing cruft and warnings 2018-08-30 22:20:30 -07:00
Sam Gateau
371105d0c4 Removing cruft and warnings 2018-08-30 22:18:34 -07:00
Sam Gateau
0ae18febc7 Removing cruft and warnings 2018-08-30 22:09:48 -07:00
David Rowe
f144308334 Make tablet menu page title navigation go back a level 2018-08-31 16:58:59 +12:00
David Rowe
ed441d5570 Merge branch 'master' into M17901 2018-08-31 14:30:11 +12:00
Sam Gateau
e0f4c8239e Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-08-30 19:16:53 -07:00
Sam Gateau
a7fd35747d
Merge pull request #13896 from AndrewMeadows/workload-feedback
Filter timings used in feedback logic for workload region sizes
2018-08-30 19:11:49 -07:00
Sam Gateau
dc852bf906 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-08-30 19:00:56 -07:00
sam gateau
194903692e clening up the code in LODmanager and the associated js/qml 2018-08-30 18:09:11 -07:00
Stephen Birarda
07b24b4768 send kill packet to ignored node for ignorer 2018-08-30 17:32:09 -07:00
Sam Gondelman
067d7b280d
Merge pull request #13900 from SamGondelman/blendshapeCrash
Fix blendshape crash
2018-08-30 17:10:24 -07:00
SamGondelman
5f08ed5027 misc perf improvements 2018-08-30 16:55:15 -07:00
Alexander Ivash
07739453c5 coding standards 2018-08-31 01:51:13 +03:00
Alexander Ivash
cb1855b0d7 filter out left/right hands from joints list in avatarapp
should fix:
	FB17884 - Wearable disappears when added to some joints
	FB17885 - Changing werable joint moves the model and detaches from avatar body
2018-08-31 01:51:13 +03:00
NissimHadar
d99cd2a42c Merge branch 'master' of https://github.com/highfidelity/hifi into addMap_d 2018-08-30 15:07:45 -07:00
NissimHadar
0f6fdef928 Fixed compilation error (within #ifdef) 2018-08-30 15:06:05 -07:00
NissimHadar
eeb63bd16a Merge branch 'addMap_d' of https://github.com/NissimHadar/hifi into addMap_d 2018-08-30 15:04:39 -07:00
Anthony Thibault
78d7c321b8
Merge pull request #13796 from amantley/noNeckFix
Avatar without Neck Joint bug 14620
2018-08-30 14:52:44 -07:00
sam gateau
8179de35b0 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-30 14:46:40 -07:00
NissimHadar
4b7ca76ebd Create correct folder. 2018-08-30 14:15:57 -07:00
John Conklin II
8fa4a2855e
Merge pull request #13641 from amantley/rotateFilterChange
Hand Azimuth Controls Shoulder Rotation
2018-08-30 13:59:00 -07:00
David Back
cee270780b
Merge pull request #13908 from dback2/androidCrashStateVariables
Fix Android StateController assert
2018-08-30 13:37:13 -07:00
Sam Gateau
9e2a540bab Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-30 12:12:24 -07:00
Sam Gateau
78c7948ebc fine tuning the noise coef ramp and documenting the algorithm 2018-08-30 12:11:43 -07:00
John Conklin II
f5ebdfa233
Merge pull request #13905 from zfox23/fixPr13870
Fixup PR13870: Make the feature work in Master
2018-08-30 11:08:23 -07:00
John Conklin II
bf0ab865bb
Merge pull request #13903 from birarda/bug/av-entity-delete-master
send MyAvatar avatar entity updates through entity tree
2018-08-30 10:25:31 -07:00
David Back
8b1fcfcce9 fix double windows platform 2018-08-30 10:16:27 -07:00
Andrew Meadows
6c4862910e smoother edges for workload region feedback response 2018-08-30 10:13:35 -07:00
Sam Gateau
12ec56875e
Merge pull request #13867 from SamGondelman/recurse
findRayIntersection/findParabolaIntersection performance improvements
2018-08-30 09:49:16 -07:00
sabrina-shanman
a4bb8cb622 Add comment on future of PickTransformNodes 2018-08-30 09:08:02 -07:00
Sam Gateau
6c502e79e3 Fine tuning a LOD regulator PV that works 2018-08-29 22:56:44 -07:00
Ken Cooke
6583864597 AVX2 implementation of interleave_4x4() 2018-08-29 19:19:20 -07:00
Sam Gateau
8f4419de30 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-08-29 19:11:03 -07:00
SamGondelman
248c2621a4 fix blendshapes crash 2018-08-29 17:57:54 -07:00
Sam Gateau
4844f06e5e brain freeze 2018-08-29 17:33:39 -07:00
Zach Fox
b8cd5dd8b9 Fixup PR13870: Make the feature work in Master 2018-08-29 16:58:19 -07:00
Sam Gondelman
cfffa65819
Merge pull request #13899 from SamGondelman/pointerPerf
Improve Pointer performance
2018-08-29 16:57:43 -07:00
sabrina-shanman
1fe909f9ad Make CollisionPick::getResultTransform() always return a valid transform 2018-08-29 16:33:51 -07:00
Stephen Birarda
aaf5f593c5 send MyAvatar avatar entity updates through entity tree 2018-08-29 16:30:24 -07:00