71678 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Alexander Ivash	7058b07aea	FB18024: 2 users report that while in VR and in GoTo menu, keyboard is unable to be minimized	2018-09-07 12:41:39 +03:00
Alexia Mandeville	190a335c71	Adding more margin to forgotten links	2018-09-07 00:01:00 -07:00
Alexia Mandeville	92f218ae29	Adding margins to forgotten link text	2018-09-06 22:59:19 -07:00
Alexia Mandeville	2443723a2b	Removing margins, adding width attribute	2018-09-06 21:14:04 -07:00
Simon Walton	22cfad2483	Squelch (false) warning from gcc	2018-09-06 18:32:37 -07:00
Anthony Thibault	6508533a15	Remove anim stats from plain ole stats. ... There are still present in anim stats tho.	2018-09-06 17:58:40 -07:00
Wayne Chen	45b2098346	Merge branch 'interstitial-final-page' of https://github.com/danteruiz/hifi into interstitalMerged	2018-09-06 17:58:04 -07:00
Dante Ruiz	45a99a9244	fixing some bugs	2018-09-06 17:55:10 -07:00
Simon Walton	e11d93a497	Merge pull request #2 from SamGondelman/otherAvatars ... Avatar mixer and manager perf improvements and cleanup	2018-09-06 17:47:16 -07:00
sabrina-shanman	52bc09cd2a	Add override qualifier to BaseNestableTransformNode::getTransform	2018-09-06 17:44:06 -07:00
Wayne Chen	72818f3729	Merge branch 'master' of https://github.com/highfidelity/hifi into interstitalMerged	2018-09-06 17:37:36 -07:00
Wayne Chen	ef3449f96d	Merge branch 'interstitial-final-page' of https://github.com/danteruiz/hifi into interstitalMerged	2018-09-06 17:36:47 -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
Wayne Chen	e76ebf7a0b	changing location of shortcuts	2018-09-06 17:29:16 -07:00
Ryan Huffman	22df1b3bc6	Add comment to Assets.sendFakeHandshake about excluding jsdoc	2018-09-06 17:19:41 -07:00
Dante Ruiz	2f9119529a	editing the interstitial page	2018-09-06 17:06:17 -07:00
SamGondelman	ed7f993c0d	avatar mixer and manager perf improvements and cleanup	2018-09-06 16:57:20 -07:00
sabrina-shanman	23a6abbaca	Update jsdocs to reflect new collision pick scaling behavior	2018-09-06 16:47:09 -07:00
Simon Walton	f6fd27a76b	Merge pull request #1 from AndrewMeadows/avatar-mixer-scaling-2 ... tweak avatar sort coefficients and fix bad avatar bounding box calculations	2018-09-06 16:39:20 -07:00
Andrew Meadows	92210f28b5	cleanup and use correct avatar bounding box	2018-09-06 16:33:30 -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
Simon Walton	f59168e1c8	make sure ignoredNode is available before sending packet	2018-09-06 16:31:31 -07:00
Simon Walton	9e0c21065e	Stop sending avatars when over bandwidth quota	2018-09-06 16:20:46 -07:00
Anthony Thibault	acc7f1f168	Moved AnimStats into its own qml panels. ... Added state machine tracking as well.	2018-09-06 16:18:58 -07:00
Alexia Mandeville	8e5f5cc796	Moving forgotten links	2018-09-06 16:16:43 -07:00
David Back	3d75d4726a	scale invertly once passing minimum	2018-09-06 16:04:59 -07:00
Stephen Birarda	a908c1554f	make sure ignoredNode is available before sending packet	2018-09-06 16:04:54 -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
Andrew Meadows	229e9624e6	remove bad bounding box calculations in avatar-mixer	2018-09-06 15:34:28 -07:00
Andrew Meadows	021146e4f0	minor tweak to default avatar-update sort coefficients	2018-09-06 15:33:52 -07:00
David Back	434e840167	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleScaleImprovements	2018-09-06 15:27:02 -07:00
Dante Ruiz	98dafa3b67	fix overlayParentID	2018-09-06 14:31:49 -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
Alexia Mandeville	aabfda6eb5	Adding descriptive text	2018-09-06 14:16:42 -07:00
Alexia Mandeville	00e10ad684	Updating sign up text, moving forgotten info links	2018-09-06 14:05:51 -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
David Back	6ac38190c1	tweak scaling multiple	2018-09-06 12:23:38 -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
Simon Walton	e1aba52c23	Revert to statics for priority sort weights; update defaults from Andrew	2018-09-06 12:09:44 -07:00
sabrina-shanman	727b62144f	Fix MyAvatarHeadTransformNode not using avatar scale	2018-09-06 12:03:13 -07:00
David Back	92ff522862	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleScaleImprovements	2018-09-06 11:54:05 -07:00