1639 commits

Author	SHA1	Message	Date
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
birarda	a63c2b3e29	pepper AssociatedTraitValues with some needed comments	2019-01-16 10:15:04 -08:00
SamGondelman	68e15c6c07	fixes from 78	2019-01-14 13:36:21 -08: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	63ed0a3a98	move blob conversion recipes to EntityItemProperties	2019-01-09 17:28:00 -08:00
Andrew Meadows	855497e604	MyAvatar.updateAvatarEntity(id, data) works in theory	2019-01-09 17:28:00 -08:00
Andrew Meadows	a4be4fb6c0	MyAvatar.setAvatarEntityData() works	2019-01-09 17:28:00 -08:00
Andrew Meadows	329ec84104	MyAvatar.setAvatarEntityData() works in theory, blobs saved to settings	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	61b8d005b5	scripts can edit AvatarEntities again	2019-01-09 17:27:14 -08:00
Andrew Meadows	6c81e8845b	cleanup	2019-01-09 17:27:14 -08:00
Andrew Meadows	026c6301a6	correctly load AvatarEntities from settings	2019-01-09 17:27:14 -08:00
Simon Walton	1245abbb53	Merge branch 'master' into avatar-mixer-entities-stats	2019-01-09 16:07:26 -08:00
Simon Walton	73d688610f	Track stats for total AvatarData bytes, traits bytes and identity bytes	2019-01-08 18:33:00 -08:00
Roxanne Skelly	37d4846722	Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377	2019-01-07 11:56:48 -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
Roxanne Skelly	0a76554d57	Remove debugging code	2019-01-05 14:04:26 -08:00
Roxanne Skelly	6d791a80c2	Bump protocol version for BulkAvatarTraits and add some guard code ... around packet parsing.	2019-01-04 19:04:01 -08:00
luiscuenca	d630fe9dbd	Add menu checkbox to toggle collisions with other avatars	2019-01-04 16:38:48 -07:00
Ryan Huffman	b680e9c52a	Update avatar packager with CR feedback	2019-01-04 09:59:17 -08:00
Roxanne Skelly	2b1547b9fa	Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377	2019-01-03 13:39:19 -08:00
Thijs Wenker	c95da0a595	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager ... # Conflicts: # interface/src/Application.cpp	2019-01-03 22:17:54 +01:00
Roxanne Skelly	443b54d931	comment and naming cleanup	2019-01-03 11:25:39 -08:00
Seth Alves	78aff6e95c	grab js api; send grab information through trait system	2019-01-03 08:17:52 -08:00
Ryan Huffman	c21d037800	Fix marketplace uploader not working with projects larger than 128MB	2018-12-27 17:51:27 -08:00
Ryan Huffman	b717188ed0	Update avatar project styling	2018-12-22 21:57:09 -08:00
Roxanne Skelly	3a282045ff	Checkpoint trait-level flow control	2018-12-21 15:48:58 -08:00
Stephen Birarda	e3e400c86f	Merge pull request #14549 from birarda/bug/no-initial-send ... fix for initial send of non-instanced trait	2018-12-07 12:02:08 -08:00
Brad Hefta-Gaub	9428f1de33	Merge pull request #14529 from SimonWalton-HiFi/avatar-mixer-downloads-fst ... Don't fetch avatars' .fst files from within the AvatarData class	2018-12-07 12:01:58 -08:00
birarda	51fd742722	fix for initial send of non-instanced trait	2018-12-07 11:17:44 -08:00
Stephen Birarda	fb3cdabd87	Merge pull request #14527 from birarda/bug/entity-traits-handler-deadlock ... fix for deadlock between setAvatarEntityData and sendChangedTraitsToMixer	2018-12-06 17:28:45 -08:00
Simon Walton	e03104cad5	Merge remote-tracking branch 'upstream/master' into avatar-mixer-downloads-fst ... Remove the code that was fixed in the conflicting PR - it's now fixed in the new location.	2018-12-05 17:58:38 -08:00
Antonina Savinova	2dcfea5f7c	Merge pull request #14487 from SimonWalton-HiFi/avatar-mixer-memory-leak ... Fix minor avatar-mixer memory leaks	2018-12-05 10:29:29 -08:00
Simon Walton	f3236e0843	Remove FST joint members from AvatarData	2018-12-04 10:45:32 -08:00
Simon Walton	eb097af796	Remove all .fst downloads from AvatarData and its derived classes	2018-12-03 17:42:39 -08:00
Simon Walton	9315c546d3	Initial version - move updateJoints() to derived class	2018-12-03 16:26:47 -08:00
birarda	c959dd7024	release avatar entity and traits locks sooner to avoid deadlock	2018-12-03 14:57:38 -08:00
Clement	181f2b4263	Fix Agent crash on shutdown	2018-11-28 18:40:52 -08:00
Simon Walton	e10936ec34	Delete network query resources for failed queries	2018-11-26 18:26:25 -08:00
Howard Stearns	66ae01e0c3	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-12 12:55:20 -08:00
Roxanne Skelly	cef7000a72	Case 19754 - Remove logging URLs and related file locations. ... The goal is to strip out data that can be used by untoward users in copying models, avatars, etc.	2018-11-06 16:24:32 -08:00
luiscuenca	dceeadd99a	change transit speed	2018-11-05 19:35:37 -07:00
John Conklin II	db87fe9696	Merge pull request #14288 from luiscuenca/avatarTransitFreezeFix ... Fix avatars remain stuck in place for other users intermittently	2018-10-29 15:03:43 -07:00
luiscuenca	056fe338e1	Apply transit logic if avatar instance is client side	2018-10-27 07:15:31 -07:00
luiscuenca	767f4e9d6d	Return server position	2018-10-26 17:16:43 -07:00
luiscuenca	62e4b3fead	Avatar mixer gets the updated position	2018-10-26 16:02:17 -07:00
Simon Walton	b6f259fc42	Fix incorrect merge-resolution	2018-10-24 13:17:45 -07:00
Simon Walton	e22e0ecb04	Merge branch 'master' into avatar-mixer-improvements	2018-10-24 10:39:23 -09:00
Luis Cuenca	fac9188dfb	Merge pull request #14187 from luiscuenca/transitAddAnimation ... Add animations to Avatar Transit	2018-10-24 10:51:21 -07:00