29263 commits

Author	SHA1	Message	Date
SamGondelman	589e88af4a	Merge remote-tracking branch 'upstream/master' into scriptvec3	2018-09-04 17:54:45 -07:00
SamGondelman	9b75c7e07f	trying to separate colors and vectors	2018-09-04 17:20:05 -07:00
John Conklin II	476887a224	Merge pull request #13909 from NissimHadar/fixFileUtils ... Create correct folder.	2018-09-04 14:20:20 -07:00
Sam Gateau	b92d1061c4	Merge pull request #13920 from AndrewMeadows/dont-bid-for-locked ... don't bid for simulation ownership of locked entities	2018-09-04 13:26:21 -07:00
John Conklin II	eaa5e2ea9a	Merge pull request #13927 from kencooke/audio-hrtf-avx2-more ... Low-level performance improvements to audio-mixer	2018-09-04 12:06:32 -07:00
Sam Gateau	a328528642	Merge pull request #13883 from NissimHadar/addMap_d ... Added read of map_d from MTL files	2018-09-04 09:38:07 -07:00
Ken Cooke	f5b7232f58	Cleanup	2018-09-03 14:00:30 -07:00
Ken Cooke	94e8ee99f5	AVX2 implementation of interpolate()	2018-09-03 13:06:49 -07:00
Ken Cooke	96aa0549be	AVX2 implementation of crossfade_4x2()	2018-09-01 12:08:49 -07:00
John Conklin II	b94dd526b9	Merge pull request #13919 from SamGondelman/avatarmanager2 ... Fix blendshapes crash one last time	2018-08-31 17:12:42 -07:00
Sam Gondelman	7cdc7dcc66	Merge pull request #13873 from sabrina-shanman/stt_parenting ... Collision Pick Parenting	2018-08-31 14:43:55 -07:00
SamGondelman	028092f803	fix blendshapes one last time	2018-08-31 13:33:45 -07:00
Andrew Meadows	727bd6b05a	don't bid for simulation ownership of locked things	2018-08-31 13:31:26 -07:00
sabrina-shanman	b5862aca2a	Use bracket initialization for CollisionRegion.loaded	2018-08-31 10:53:20 -07:00
sabrina-shanman	f71fc83309	Remove PickResult::needsToCompareResults	2018-08-31 10:48:48 -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	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 Gondelman	067d7b280d	Merge pull request #13900 from SamGondelman/blendshapeCrash ... Fix blendshape crash	2018-08-30 17:10:24 -07: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
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
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
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
Ken Cooke	6583864597	AVX2 implementation of interleave_4x4()	2018-08-29 19:19:20 -07:00
SamGondelman	248c2621a4	fix blendshapes crash	2018-08-29 17:57:54 -07:00
Zach Fox	b8cd5dd8b9	Fixup PR13870: Make the feature work in Master	2018-08-29 16:58:19 -07:00
sabrina-shanman	0926968e2b	Do not have depth as a parameter in getTransform(..) when called in NestableTransformNode	2018-08-29 16:30:06 -07:00
sabrina-shanman	686f9fb18a	Move load state flag from CollisionPickResult to CollisionRegion and make it a boolean	2018-08-29 16:29:59 -07:00
John Conklin II	7298cb4654	Merge pull request #13888 from dback2/editControllerMapping ... Edit mode controller mapping using new platform state variables	2018-08-29 16:06:47 -07:00
sabrina-shanman	78a438d89a	Correct CollisionRegion jsdoc for 'joint' parameter	2018-08-29 14:55:14 -07:00
Ken Cooke	6cc31e7397	AVX2 implementation of biquad2_4x4()	2018-08-29 13:30:13 -07:00
John Conklin II	47ce8be526	Merge pull request #13854 from wayne-chen/fixTabletButton-case-16847 ... MS16847: Tablet button doesn't load in HMD mode	2018-08-29 13:20:04 -07:00
John Conklin II	26f76081e6	Merge pull request #13843 from luiscuenca/fixGLTFLoadTexFromDir ... Read glTF resources from other than the main directory	2018-08-29 12:31:41 -07:00
David Back	96d2ba660c	Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping	2018-08-29 12:05:51 -07:00
David Back	dcf2074d7e	remove [ camera key, allow F to enter camera without selection	2018-08-29 11:56:37 -07:00
Andrew Meadows	a134357489	fix compile typo	2018-08-29 11:37:19 -07:00
Andrew Meadows	f9d14e1351	filter time-cost drivers for region regulation	2018-08-29 11:17:59 -07:00
Ken Cooke	3e17556cc1	Prefer static_assert() over assert()	2018-08-29 10:47:02 -07:00
Ken Cooke	6f151ad283	Consistent parameter order for SIMD functions	2018-08-29 10:03:40 -07:00
Ken Cooke	bf348f43aa	Prepare for runtime CPU dispatch of all SIMD functions	2018-08-29 09:55:54 -07:00
SamGondelman	0c8a4cc81e	merge with master	2018-08-28 17:31:51 -07:00
Anthony Thibault	f281afa71f	Merge pull request #13874 from amantley/phaseWalkFix ... Phase walk fix bug 17770	2018-08-28 11:29:29 -07:00
Sam Gateau	d9d23e7fcf	Merge pull request #13877 from luiscuenca/multiplyOtherAvatars ... Create N replicas of each other-avatar on the client side	2018-08-28 09:02:13 -07:00
sabrina-shanman	6f6e70a470	Re-order variable initialization in CollisionRegion copy contructor	2018-08-28 08:45:47 -07:00
David Back	990638fd95	Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping	2018-08-27 18:04:23 -07:00