3794 commits

Author	SHA1	Message	Date
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
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
Seth Alves	c4fc884bce	ignore position edits from server when grabs are in effect	2019-01-15 16:35:20 -08:00
Seth Alves	b1c34eb9ec	update queryAACube during grab rather than only when grab is released	2019-01-15 16:01:44 -08:00
Seth Alves	174c79d66d	use new-style far-grabbing code for mouse grabs	2019-01-15 13:43:51 -08:00
Shannon Romano	4b34465113	Merge pull request #12899 from kitely/warn-property-too-large ... Log a warning if an entity's property is too large	2019-01-15 12:00:04 -08:00
Dante Ruiz	4ab7308669	addressing code review requests	2019-01-14 14:04:01 -08:00
SamGondelman	68e15c6c07	fixes from 78	2019-01-14 13:36:21 -08:00
Dante Ruiz	e7d3844620	making pre review requests	2019-01-14 11:14:57 -08:00
Dante Ruiz	8252481ce7	Delete domain entities only	2019-01-11 16:00:10 -08:00
Andrew Meadows	bc19689910	remove unnecessary culling of properties	2019-01-10 17:32:52 -08:00
Andrew Meadows	0098dedcbb	don't update server for AvatarEntity queryAACube	2019-01-09 18:25:12 -08:00
Andrew Meadows	b9667a0679	fix merge conflict after rebase	2019-01-09 17:28:00 -08:00
Andrew Meadows	9d6acf007a	fix build after rebase	2019-01-09 17:28:00 -08:00
Andrew Meadows	c998ddbb9e	ScriptableAvatar::setAvatarEntityData() works	2019-01-09 17:28:00 -08:00
Andrew Meadows	63ed0a3a98	move blob conversion recipes to EntityItemProperties	2019-01-09 17:28:00 -08:00
Andrew Meadows	4dd6e23fef	fix typo in comment	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	09f3b8f485	add bit of sanity checking for incomming AvatarEntities data	2019-01-09 17:27:14 -08:00
Andrew Meadows	0083c77280	add EntityTypes::extractEntityTypeAndID(), remove one spaghetti	2019-01-09 17:27:14 -08:00
Andrew Meadows	1815d71158	fix data corruption bug	2019-01-09 17:27:14 -08:00
Andrew Meadows	ce660bee9b	fix compile errors after rebase	2019-01-09 17:27:14 -08:00
Andrew Meadows	6c81e8845b	cleanup	2019-01-09 17:27:14 -08:00
Andrew Meadows	fe2ee68b79	add EntityItemProperties::copyFromJSONString()	2019-01-09 17:27:14 -08:00
Andrew Meadows	026c6301a6	correctly load AvatarEntities from settings	2019-01-09 17:27:14 -08:00
Andrew Meadows	263d6cb7ad	only change parentID=AVATAR_SELF_ID for non-clientOnly case	2019-01-09 17:27:14 -08:00
Andrew Meadows	e4cc3fa976	minor cleanup	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	d1927340f5	remove redundant addToNeedsParentFixupList()	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
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
Jamil Akram	4c6b14bf72	Merge pull request #14642 from dback2/propertyRangeAudit ... Entity property range/step audit	2019-01-08 09:42:59 -08:00
John Conklin II	ed4f2d9c10	Merge pull request #14439 from AndrewMeadows/shaped-zones ... Case 15518: shaped zones	2019-01-08 09:06:45 -08:00
David Back	84b2a7d474	Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit	2019-01-07 15:42:02 -08:00
David Back	3aa245036b	Merge branch 'master' into propertyRangeAudit	2019-01-07 15:36:18 -08:00
Sam Gondelman	db3187ec6c	Merge branch 'master' into propFix	2019-01-07 14:57:38 -08:00
SamGondelman	791257bd0a	convert old created to quint	2019-01-07 14:17:01 -08:00
SamGondelman	4210d4a7cd	write created as quint64	2019-01-07 13:24:38 -08:00
SamGondelman	fa66ed766d	one more try	2019-01-07 12:31:52 -08:00
SamGondelman	d57e3b57aa	possible fix for created to/from string	2019-01-07 11:10:36 -08:00
Andrew Meadows	5c750b40c9	fix copy-n-paste errors in EntityItem::contains() for cylinders	2019-01-05 08:03:29 -08:00
SamGondelman	b5b7574c48	set created	2019-01-04 16:52:11 -08:00
David Back	5ea84fb952	CR fixes	2019-01-04 15:39:27 -08:00
SamGondelman	1452d237e2	trying to fix avatar entity issue	2019-01-04 14:34:46 -08:00
Andrew Meadows	13a3982b5a	fix ZoneEntityItem::contains() for model shapes	2019-01-04 12:38:32 -08:00
Andrew Meadows	a642af23b7	enable shapeType=ellipsoid and expose zone shapeType to UI	2019-01-04 12:37:23 -08:00
Andrew Meadows	a656ea723e	special handling of SPHERE case in EntityItem::contains()	2019-01-04 12:37:23 -08:00
Andrew Meadows	65e920039c	cleaner return logic for EntityItem::contains() cylinder cases	2019-01-04 12:37:23 -08:00
Andrew Meadows	7625aebaa8	remove reduntant model-networking link dependency	2019-01-04 12:37:23 -08:00