71254 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Sam Gateau	81a542982b	Merge branch 'master' of github.com:highfidelity/hifi into black-bis	2018-09-07 12:02:20 -07:00
John Conklin II	405e2da91e	Merge pull request #13949 from sabrina-shanman/stt_parenting_scale ... Scale Collision Pick to match parent	2018-09-07 11:54:02 -07:00
John Conklin II	e578b047b0	Merge pull request #13838 from danteruiz/fix-hmd-debug-window ... fixing scripting window visiblity and size issues	2018-09-07 11:47:44 -07:00
John Conklin II	2ac0377a6e	Merge pull request #13952 from amantley/steppingReboot ... Fix for lurching walk(case 16945), when walking in hmd.	2018-09-07 11:43:03 -07:00
sam gateau	fa72910ac1	fixing fuckeries	2018-09-07 11:14:12 -07:00
sam gateau	d979d02139	why did i do that?	2018-09-07 10:03:55 -07:00
Zach Fox	d8c30ff769	Merge pull request #13955 from zfox23/MS17877_connectionsSort ... Fix MS17877: Persist Connections table sort choice	2018-09-07 09:17:15 -07:00
sabrina-shanman	8d4c47cf8e	Make template specialization of BaseNestableTransformNode explicit	2018-09-07 08:49:44 -07:00
sabrina-shanman	52bc09cd2a	Add override qualifier to BaseNestableTransformNode::getTransform	2018-09-06 17:44:06 -07:00
sabrina-shanman	f40f40e135	Use more reasonable value for BaseNestableTransformNode::_baseScale when given bad value	2018-09-06 17:35:12 -07:00
sabrina-shanman	7a9480723e	Remove unused variable in PickScriptingInterface::createTransformNode	2018-09-06 17:30:29 -07:00
sabrina-shanman	23a6abbaca	Update jsdocs to reflect new collision pick scaling behavior	2018-09-06 16:47:09 -07:00
sabrina-shanman	836f810c41	Have OverlayTransformNode and similar define scale relative to nestable scale on creation time, and refactor code	2018-09-06 16:33:29 -07:00
sam gateau	7349562111	Removing commented code	2018-09-06 15:50:31 -07:00
sam gateau	5ecbdb50c7	Merge branch 'master' of github.com:highfidelity/hifi into black-bis	2018-09-06 15:36:32 -07:00
Zach Fox	0e785f9bdb	Fix MS17877: Persist Connections table sort choice	2018-09-06 15:35:26 -07:00
John Conklin II	7bbedf65c7	Merge pull request #13950 from sethalves/overlay-set-name-crash ... fix a crash related to setting an overlay's name	2018-09-06 14:28:11 -07:00
John Conklin II	8c77749fb6	Merge pull request #13947 from SamGondelman/perf ... Fix blendshapes crash one last time, one last time	2018-09-06 14:21:18 -07:00
John Conklin II	b486b6d148	Merge pull request #13928 from AndrewMeadows/enable-workload-feedback ... enable workload regulation by default	2018-09-06 14:20:40 -07:00
sam gateau	6544e9f0b0	Removing the commented debug code	2018-09-06 13:58:03 -07:00
sam gateau	38bfee7b72	Fix compilation on android and add the simple getBufferIDUnsynced in bindUniformBuffer	2018-09-06 13:54:21 -07:00
amantley	c986d55d8b	removed step script from repo	2018-09-06 13:18:54 -07:00
amantley	90a51e6181	added walk velocity threshold, this determines if we are in the walk state. when we are then we don't do cg leaning calculation. this will smooth out the walking in a large tracked area	2018-09-06 13:12:48 -07:00
John Conklin II	152ec3d631	Merge pull request #13945 from davidkelly/dk/17915 ... volume slider on individual users in PAL remembers setting now	2018-09-06 12:55:46 -07:00
sabrina-shanman	714cfc5ef1	Add scaling information to CollisionRegion jsdoc and missing info to CollisionPickProperties jsdoc	2018-09-06 12:14:50 -07:00
sabrina-shanman	727b62144f	Fix MyAvatarHeadTransformNode not using avatar scale	2018-09-06 12:03:13 -07:00
sam gateau	e428248472	Adressing build warnings	2018-09-06 11:33:26 -07:00
sam gateau	5aa45b64d2	Adressing build warnings	2018-09-06 11:24:13 -07:00
sabrina-shanman	7839ba42db	Make the Collision Pick threshold scale with the largest dimension of the parent	2018-09-06 11:02:07 -07:00
sam gateau	129e2ce188	Merge branch 'master' of github.com:highfidelity/hifi into black-bis	2018-09-06 10:30:41 -07:00
sabrina-shanman	3f7a7fb11a	Return early from AvatarTransformNode and similar when getTransform fails	2018-09-06 10:29:01 -07:00
sabrina-shanman	e8ea95e375	Use elseifs in PickScriptingInterface::createTransformNode	2018-09-06 10:21:48 -07:00
sabrina-shanman	390e89a64d	Fix missing NestableTransformNode import	2018-09-06 10:20:26 -07:00
Ryan Huffman	80b5f90160	Merge pull request #13857 from thoys/fix/interactiveWindows/onlyOnTopWhileMainWindowActive ... MS17463: only show InteractiveWindow on top of interface window	2018-09-06 10:15:20 -07:00
sabrina-shanman	f7226757ad	Just import TransformNode in AvatarTransformNode.h and similar	2018-09-06 10:03:05 -07:00
Seth Alves	042044ceaf	dammit	2018-09-06 09:38:12 -07:00
Seth Alves	5a0a259c21	dammit	2018-09-06 09:37:01 -07:00
Seth Alves	69ae04ab09	protect Base3DOverlay::_name with a mutex	2018-09-06 09:03:28 -07:00
amantley	6fb335429d	starting to re-implement the walking state detection for smoothwalking	2018-09-05 17:55:27 -07:00
sam gateau	4ef8f29522	Merge branch 'master' of github.com:highfidelity/hifi into black-bis	2018-09-05 17:50:21 -07:00
sam gateau	21f65d8a78	position are used correctly for evaluting bounds in the Mesh	2018-09-05 17:50:06 -07:00
Sam Gateau	03f51352aa	Merge pull request #13932 from SamGondelman/framebuffer ... Fix framebuffer debugging	2018-09-05 17:38:21 -07:00
SamGondelman	cde2dc2eaa	please work	2018-09-05 17:04:05 -07:00
sabrina-shanman	84a2512f31	Fix collision pick scale not being used	2018-09-05 16:51:27 -07:00
sabrina-shanman	e8ce152687	Scale collision picks relative to parent by adding and using more ... specialized transform nodes.	2018-09-05 16:51:28 -07:00
Sam Gateau	912e0abb0a	Merge pull request #13891 from samcake/black ... Improving the LOD manager behavior for better scaling	2018-09-05 16:01:09 -07:00
David Kelly	b022697dfa	volume slider on users fixed	2018-09-05 15:36:07 -07:00
amantley	73e628bb8d	merge with master fixes	2018-09-05 14:42:49 -07:00
sam gateau	15f54ac47d	Merge branch 'black-bis' of github.com:samcake/hifi into black-bis	2018-09-05 14:37:20 -07:00
sam gateau	1feaf286b4	keeping position separated from the other attributes	2018-09-05 14:35:50 -07:00