413 commits

Author	SHA1	Message	Date
Sam Gondelman	9aa99f24f0	Merge pull request #14905 from SamGondelman/materialMapping ... Case 20242: FST materialMapping supports our material JSON format	2019-02-15 11:21:51 -08:00
Anthony Thibault	a3407b96b0	Merge branch 'master' into bug-fix/revert-anim-pose-optimization	2019-02-14 16:56:17 -08:00
Anthony Thibault	39b4eaac34	Revert "AnimPose operator* optimizations" ... This reverts commit 569bef50fd.	2019-02-14 16:13:00 -08:00
Andrew Meadows	ed8481ead9	fix grab bugs	2019-02-12 14:04:56 -08:00
SamGondelman	77a8ddb3f0	Merge remote-tracking branch 'upstream/master' into materialMapping	2019-02-11 16:35:05 -08:00
Anthony Thibault	e6cdfe3377	Merge pull request #14827 from luiscuenca/FixShapeInfoAssertion ... Case 14722: Fix assertion when trying to create multisphere shapeInfo with empty data (80.0/master)	2019-02-08 15:10:44 -08:00
Sabrina Shanman	baf72eaae0	Merge pull request #14802 from sabrina-shanman/hfm_prep_joints ... Case 20887: Move FST joint property handling to the model preparation step	2019-02-08 15:02:23 -08:00
Anthony Thibault	d012d07519	Merge pull request #14865 from hyperlogic/feature/anim-optimizations ... Animation System Optimizations	2019-02-08 12:44:10 -08:00
SamGondelman	f7a487a020	move materialcache et al to material-networking library	2019-02-08 10:28:07 -08:00
SamGondelman	3addcb630c	Merge remote-tracking branch 'sabrina/hfm_prep_joints' into materialMapping	2019-02-07 11:45:59 -08:00
Anthony Thibault	569bef50fd	AnimPose operator* optimizations	2019-02-05 14:48:05 -08:00
luiscuenca	5438bddc84	Fix assertion on shapeInfo when creating multisphere with empty data	2019-01-31 09:43:30 -07:00
Seth Alves	3ab2db96b6	deactivate grab action when grab is released	2019-01-30 14:43:11 -08:00
Seth Alves	0846eb8ec6	attempt to allow position edits in releaseGrab entity-method	2019-01-30 14:43:11 -08:00
sabrina-shanman	203e8e2455	Realize joint properties isFree and freeLineage are unused, so tear them out	2019-01-29 11:55:35 -08:00
luiscuenca	a6dce5dd84	Merge branch 'master' into multiSphereAvatar04	2019-01-28 17:48:22 -07:00
Andrew Meadows	f2b9f088b4	fix bad comparison causing undeleted grabs	2019-01-28 08:58:57 -08:00
luiscuenca	f54f9e5bfd	Merge branch 'master' into multiSphereAvatar04	2019-01-25 13:54:01 -07:00
luiscuenca	df4be641eb	More fixes	2019-01-25 13:42:18 -07:00
Andrew Meadows	09fe9735fa	plug grab leak, more correct names	2019-01-24 14:57:54 -08:00
Andrew Meadows	ee3fde9df1	unravel spaghetti, prefer std over Qt containers	2019-01-24 14:39:00 -08:00
Andrew Meadows	fd457a9c0e	remove cruft and fix a resource leak	2019-01-23 23:19:20 -08:00
Andrew Meadows	1bdcf8f0cb	MyAvatar bids for ownerhsip on grab	2019-01-23 21:26:10 -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
luiscuenca	43244193e8	Mesh picking against default pose with transformed ray	2019-01-18 12:46:18 -07: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
luiscuenca	67cc5bd7f2	Fix warnings and wrong shapes position for myAvatar	2019-01-16 10:52:34 -07:00
luiscuenca	a7f143dbce	Merge branch 'master' into multiSphereAvatar04 ... # Resolved Conflicts: # interface/src/avatar/MyAvatar.h # interface/src/avatar/OtherAvatar.cpp	2019-01-15 18:27:04 -07:00
luiscuenca	71e7023a3e	Refactor and optimizations	2019-01-15 18:07:50 -07:00
Roxanne Skelly	6317ceb9b3	Case20277 - Ignoring user causes loading orb to appear at /0,0,0 ... Loading orb was created for all other avatars upon OtherAvatar object creation without checking the ignore list.	2019-01-15 13:34:29 -08:00
luiscuenca	19701ef333	Fix scale and add rayTest	2019-01-11 15:36:07 -07:00
Andrew Meadows	9ea6968e35	fix bug where attached AvatarEntities do not update in timely fashion	2019-01-09 17:40:18 -08:00
Andrew Meadows	c998ddbb9e	ScriptableAvatar::setAvatarEntityData() works	2019-01-09 17:28:00 -08:00
Andrew Meadows	a4be4fb6c0	MyAvatar.setAvatarEntityData() works	2019-01-09 17:28:00 -08:00
Andrew Meadows	cbcd70aee6	namechanges and comments to help clarify necessary fixes	2019-01-09 17:28:00 -08:00
Andrew Meadows	9f404ef006	Agent bots can manipulate AvatarEntities again	2019-01-09 17:28:00 -08:00
Andrew Meadows	d622635a71	fix wording in comment to reflect new 'HostType' parameter	2019-01-09 17:27:14 -08:00
Andrew Meadows	c4115bece3	remove unused ScriptEngine instance	2019-01-09 17:27:14 -08:00
Andrew Meadows	09f3b8f485	add bit of sanity checking for incomming AvatarEntities data	2019-01-09 17:27:14 -08:00
Andrew Meadows	61b8d005b5	scripts can edit AvatarEntities again	2019-01-09 17:27:14 -08:00
Andrew Meadows	e37b5b52f0	correctly load AvatarEntities from settings redux	2019-01-09 17:27:14 -08:00
Andrew Meadows	01fc442695	save AvatarEntities settings as strings	2019-01-09 17:27:14 -08:00
Andrew Meadows	d3fea94540	send AvatarEntities via raw data packet	2019-01-09 17:27:14 -08:00
luiscuenca	95fca826a5	Add fit AABox for avatar and implement multisphere on shapeManager	2019-01-09 17:49:19 -07:00
John Conklin II	e4abb66199	Merge pull request #14627 from AndrewMeadows/fewer-avatar-entity-updates ... case 20304: please don't flood the avatar-mixer with unnecessary AvatarEntity udpates	2019-01-09 14:55:23 -08:00
luiscuenca	39dc25ea92	Merge branch 'master' into multiSphereAvatar04 ... # Conflicts: # interface/src/avatar/OtherAvatar.h # libraries/avatars-renderer/src/avatars-renderer/Avatar.h	2019-01-08 15:41:33 -07:00
Sam Gondelman	db3187ec6c	Merge branch 'master' into propFix	2019-01-07 14:57:38 -08:00
Jeff Clinton	75d26dc45f	Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption ... Add menu checkbox to toggle collisions with other avatars	2019-01-07 08:58:09 -08:00
SamGondelman	b5b7574c48	set created	2019-01-04 16:52:11 -08:00