28180 commits

Author	SHA1	Message	Date
amantley	bcbd9323c0	Merge remote-tracking branch 'upstream/master' into animSplineIK	2019-01-25 14:42:24 -08:00
amantley	446d7b9514	added the flex coeff for the primary and secondary spline targets to the json	2019-01-25 14:41:18 -08:00
Adam Smith	f651ad2f67	Merge pull request #14711 from SamGondelman/NOverlays10 ... Case 20585: Add missing Web Overlay functionality to Web Entities	2019-01-25 14:00:52 -08:00
Shannon Romano	90c7423dfb	Merge pull request #14772 from wayne-chen/loginScreenPreserveRatio ... MS20825: Login Screen Aspect/Crop with resizing	2019-01-25 11:16:10 -08:00
Shannon Romano	28edb472fc	Merge pull request #14713 from raveenajain/collideWithOtherAvatars_scale ... 20565 Avatar::_collideWithOtherAvatars does not scale	2019-01-25 11:06:36 -08:00
Shannon Romano	552729abe7	Merge pull request #14759 from Atlante45/feat/gltf ... Enable "Add To World" Asset Browser button for glTF	2019-01-25 09:56:40 -08:00
amantley	2574e82184	cleaned up print statements	2019-01-24 19:47:27 -08:00
amantley	37f92d2319	added code to read tip and base var info from the json	2019-01-24 17:02:30 -08:00
Wayne Chen	4880c7081e	adding blurred images	2019-01-24 16:00:24 -08:00
Wayne Chen	5c55761e4d	adding fill mode for aspect/crop	2019-01-24 15:57:04 -08:00
Adam Smith	dadd49f535	Merge pull request #14667 from SamGondelman/NOverlays9 ... Case 20535: renderLayer, primitiveMode, groupCulled Entity properties	2019-01-24 14:36:27 -08:00
SamGondelman	9a734b2011	merge with master	2019-01-23 17:48:24 -08:00
amantley	cdd03646c2	latest spline code with ik node removed started cleanup	2019-01-23 17:22:13 -08:00
Jeff Clinton	49fa2dc75d	Merge pull request #14715 from ctrlaltdavid/M20052 ... Case 20052: Fix tablet sometimes not working after domain change	2019-01-23 15:29:20 -08:00
Jeff Clinton	b9f9766b01	Merge pull request #14747 from SimonWalton-HiFi/wallet-in-hmd ... Fix security-image display in HMD	2019-01-23 13:18:45 -08:00
Simon Walton	77293150b7	Const declarations to enforce singleton capability	2019-01-22 18:05:47 -08:00
Simon Walton	3a5d550fa5	Treat QmlCommerce as a singleton class	2019-01-22 17:13:36 -08:00
Clement	61be5a3cc4	Enable "Add To World" Asset Browser button for glTF	2019-01-22 17:01:06 -08:00
Jeff Clinton	3776472550	Merge pull request #14731 from AndrewMeadows/fix-mexico-hats ... cases 20709 and 20715: wear and see mexico hats	2019-01-22 12:58:56 -08:00
amantley	dbd03e2eb4	got the spline arms and legs working without any inverse kinematic node in the json, using _withIKnode.json	2019-01-22 11:53:18 -08:00
amantley	8d88c627b0	nearly have the arms legs and back working with out the ik node	2019-01-21 17:41:08 -08:00
raveenajain	2393db5e12	collision logic	2019-01-21 16:24:32 -08:00
raveenajain	3f2aa56187	feedback changes	2019-01-21 13:24:07 -08:00
Simon Walton	c3a8c71f60	Add TabletMenu to list of pages that trigger the QmlCommerce bridge	2019-01-21 12:27:14 -08:00
amantley	6680ca53ad	added updateHands2 which deals with two bone hands animvars	2019-01-20 08:56:39 -08:00
raveenajain	379f98b26d	just using change	2019-01-18 18:20:28 -08:00
amantley	3a2697fa8c	working on the two bone ik for the hands	2019-01-18 17:55:19 -08:00
raveenajain	d2e37d0c90	my and other avater changes, if setting toggled can pass through other avatar	2019-01-18 16:50:44 -08:00
Andrew Meadows	9a854291af	supress spurious not important AvatarEntity updates	2019-01-18 15:36:38 -08:00
amantley	7777162351	got the spine2 rotationa and the head spline working	2019-01-18 15:28:41 -08:00
Adam Smith	da7cd6b2f7	Merge pull request #14691 from SamGondelman/multifrustum ... Case 20394: Fix multi-frustum view updating	2019-01-18 15:23:58 -08:00
Antonina Savinova	8c4c488676	Merge pull request #14721 from Atlante45/feat/upstream-limitter ... Limit upstream bandwidth to the Avatar Mixer	2019-01-18 13:32:03 -08:00
Jeff Clinton	09b16d2d7a	Merge pull request #14735 from SamGondelman/snap ... Case 20724: Fix Snap app settings issue	2019-01-18 13:00:18 -08:00
Shannon Romano	11b8ae6d44	Merge pull request #14710 from sethalves/mouse-grab-with-traits ... case 15962: case 20481: Mouse grab with traits	2019-01-18 11:56:41 -08:00
SamGondelman	d6f0fbd17b	fix snap app issue	2019-01-18 10:48:20 -08:00
Anthony Thibault	0ab13f1e48	Merge pull request #14705 from luiscuenca/changeCollisionDesignOnAvatarApp ... Change Avatar App design for avatar collisions	2019-01-17 16:06:17 -08:00
Shannon Romano	c764f5182f	Merge pull request #14717 from roxanneskelly/Case20277 ... Case20277 - Ignoring user causes loading orb to appear at /0,0,0	2019-01-17 15:36:31 -08:00
Andrew Meadows	74f9a415d3	move _cauterizationNeedsUpdate back to MyAvatar	2019-01-17 13:58:34 -08:00
Seth Alves	4fbc257be0	don't cauterize head-children when they are grabbed	2019-01-17 13:34:36 -08:00
John Conklin II	19e4a7389b	Merge pull request #14676 from wayne-chen/updateLoginUserLogging ... case 20654: Updating user activity logging for login experience	2019-01-17 12:59:12 -08:00
John Conklin II	45ec44423b	Merge pull request #14694 from danteruiz/delete-only-domain-entities ... case 20595: case 20563: Do not delete local entities when switching domains.	2019-01-17 11:25:58 -08:00
Adam Smith	f955313afc	Merge pull request #14687 from SamGondelman/cancel ... Case 20580: Trying to fix wearables and avatar app	2019-01-17 11:25:30 -08:00
amantley	e5b16ef174	implemented the splineIK in animSplineIK.cpp, todo: disable animinversekinematic.cpp	2019-01-16 18:31:52 -08:00
SamGondelman	9727c8fd38	CR	2019-01-16 14:14:01 -08:00
Seth Alves	fd09180776	Merge pull request #14645 from ctrlaltdavid/M19774-d ... Make mouselook directly proportional to right-click mouse	2019-01-16 09:09:38 -08:00
Roxanne Skelly	6cb12daf74	CR Fixes	2019-01-15 17:49:13 -08:00
SamGondelman	1d2270e9c7	web entity fixes	2019-01-15 16:51:36 -08:00
Seth Alves	b1c34eb9ec	update queryAACube during grab rather than only when grab is released	2019-01-15 16:01:44 -08:00
Wayne Chen	3b913db609	fixing typo	2019-01-15 14:21:37 -08:00
Clement	8480624797	Limit upstream data to avatar mixer	2019-01-15 14:18:53 -08:00