357 commits

Author	SHA1	Message	Date
Seth Alves	b9f9b18083	if an edit packet doesn't include a change to lifetime, don't attempt to cap the lifetime	2016-06-30 15:41:58 -07:00
Zander Otavka	2786061d71	Fix bug with entity adding w/o permission ... Entities could be added to the local tree, but be rejected by the server because of a lack of permissions.	2016-06-24 16:34:54 -07:00
Seth Alves	2fd38c1585	when adding or editing an entity from a script, make the _lastEdited in the transmitted properties be the same as the one in the Entity in the local tree	2016-06-23 13:10:15 -07:00
Seth Alves	c62b73bf61	when the entity-server caps a lifetime of an edit from a tmp-rez only interface, bump the lastEdited time forward so that the interface accepts the change back into its local tree	2016-06-22 11:42:57 -07:00
Seth Alves	9ca27f267d	cap lifetime rather than reject edits from nodes which only have tmp-rez rights	2016-06-21 16:48:04 -07:00
humbletim	e65e6dc9ce	Fix entity lifetime guards (re: canRez/canRezTmp)	2016-06-19 13:40:03 -04:00
Brad Hefta-Gaub	da28b0f3e7	Merge pull request #8048 from ctrlaltdavid/20961 ... fix import of invalid JSON file failing silently	2016-06-12 19:42:53 -07:00
David Rowe	2953ca08cb	Fix import of invalid JSON file failing silently	2016-06-10 12:04:41 +12:00
Seth Alves	bade215907	maximum 'tmp' entity lifetime is now a domain-server setting, defaults to 1 hour	2016-06-09 10:41:30 -07:00
Seth Alves	b2f63a2132	hook up can-rez-tmp and can-write-to-asset-server	2016-06-07 16:17:58 -07:00
David Rowe	2f3fa80b96	Add Clipboard.getContentsDimensions() JavaScript method	2016-05-26 09:52:22 +12:00
Seth Alves	ff36b39067	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-20 14:38:53 -07:00
Seth Alves	7ea7bd3e1d	set created-time for imported entities to 'now'	2016-05-19 10:21:04 -07:00
Seth Alves	ac506dc4b7	where needed, copy clientOnly into properties before calling queueEditEntityMessage	2016-05-11 12:46:16 -07:00
Seth Alves	e4e0be8fa3	relay owningAvatar from properties to entity on entity creation	2016-05-10 16:51:38 -07:00
Seth Alves	de4c9530c9	carry clientOnly flag over from properties when addEntity is called	2016-05-10 14:48:12 -07:00
Seth Alves	f90b9ec65d	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-10 12:08:45 -07:00
Seth Alves	4c1f815870	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-10 10:09:40 -07:00
Seth Alves	b761ecf44f	merge from upstream	2016-05-10 08:18:45 -07:00
Andrew Meadows	ffc3123467	Merge pull request #7658 from sethalves/grab-fixes ... Grab fixes	2016-05-09 15:30:37 -07:00
Seth Alves	0e6d9a1eec	avatar mixer can relay "client-only" entities between interfaces -- the entity server wont know about them.	2016-05-07 14:48:31 -07:00
Seth Alves	a0771f8ee5	use smart pointers for entity simulations	2016-05-07 09:14:33 -07:00
Atlante45	07adef9465	Fix entities collision sounds	2016-05-05 14:55:28 -07:00
Seth Alves	9db839bc13	don't allow someone else to delete an action that I own. reset dynamic property when releasing and entity, even if refCount isn't 0	2016-05-04 15:01:00 -07:00
Seth Alves	382a0c48da	fix warning	2016-05-04 12:09:26 -07:00
Seth Alves	9e53055d43	parentID and parentJointIndex are now protected by simulation ownership	2016-05-03 15:48:50 -07:00
Seth Alves	16bf59f8a6	fix a crash in RenderableModelEntityItem::getModel	2016-04-25 10:26:32 -07:00
Seth Alves	95f446183f	use for loop rather than iterator	2016-04-08 13:32:33 -07:00
Seth Alves	6088612ce0	guard access to _missingParent vector with a lock to allow safe access from multiple threads	2016-04-08 13:16:30 -07:00
howard-stearns	cec4175e9d	whitespace	2016-04-01 15:00:51 -07:00
howard-stearns	b5cbd7720e	Lock entity tree on export, and clipboard on import.	2016-04-01 14:56:56 -07:00
howard-stearns	86a77d4f55	Remove unused/non-existent include.	2016-03-29 16:55:17 -07:00
howard-stearns	eef9de4d4f	Remove obsolete remapIDs.	2016-03-29 16:28:02 -07:00
howard-stearns	4ebf816166	cleanup	2016-03-29 16:17:19 -07:00
howard-stearns	bcb729eac2	Abstract out globalizeProperties.	2016-03-29 15:21:06 -07:00
howard-stearns	4a28dadae5	Working, but not cleaned up.	2016-03-29 13:26:50 -07:00
Howard Stearns	5db1c33e4d	kill offsets	2016-03-29 09:18:29 -07:00
howard-stearns	b09b9a4a0a	snapshot after using tree from entity item.	2016-03-28 16:58:20 -07:00
howard-stearns	7a066afa26	Checkpoint for freakin edit.js again.	2016-03-28 14:25:51 -07:00
howard-stearns	c6347eb92a	checkpoint for debugging/comparing edit.js	2016-03-28 13:39:43 -07:00
howard-stearns	8858559247	Make access to entityToElementMap thread safe.	2016-03-21 14:02:18 -07:00
Seth Alves	db5c6d80d2	possibly fix a couple of crashes	2016-03-17 10:31:54 -07:00
Seth Alves	5292e537ea	further unmangle merge	2016-03-14 11:22:01 -07:00
Seth Alves	908481d5d4	merge from upstream	2016-03-14 11:15:16 -07:00
Seth Alves	7641b1e99d	remove debug print	2016-03-13 08:45:23 -07:00
Seth Alves	415f21c189	be more aggressive about putting entities into the missing-its-parent list	2016-03-13 08:35:21 -07:00
Seth Alves	0a2fb77698	delete child entities when parent is deleted	2016-03-13 07:04:50 -07:00
Seth Alves	5f05d576cc	move checkAndAdjustQueryAACube into SpatiallyNestable	2016-03-11 15:55:42 -08:00
Brad Hefta-Gaub	550b9a98b1	fix error in preload logic	2016-02-12 14:45:55 -08:00
Brad Hefta-Gaub	a40a562db2	handle two conner cases where preload would get called twice	2016-02-11 09:33:52 -08:00