469 commits

Author	SHA1	Message	Date
Atlante45	ce51350b65	Fix warnings on windows 64bit	2015-12-11 15:42:15 -08:00
Atlante45	6f29d9e7b8	Use strongly typed enum instead of nested alias	2015-12-10 11:10:09 -08:00
Philip Rosedale	c93252b134	Merge pull request #6596 from AndrewMeadows/fix-bad-ownership ... fix bad simulation ownership when using edit.js	2015-12-08 17:49:38 -08:00
Andrew Meadows	987b8d3334	fix bad simulation ownership when using edit.js	2015-12-08 14:34:25 -08:00
Seth Alves	96e9580473	change some more parameters back to being pass-by-reference, where it's safe	2015-12-07 05:30:19 -08:00
Seth Alves	4e74c98ae7	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-12-03 11:00:13 -08:00
Seth Alves	6f79b381f9	working toward making children of avatar joints work	2015-12-03 11:00:06 -08:00
Brad Hefta-Gaub	1e51a90204	add edit times and entity ids to the viewer stats	2015-12-02 14:43:00 -08:00
Seth Alves	6eae98fb28	merge from upstream	2015-12-02 14:38:26 -08:00
Brad Hefta-Gaub	08ba535c38	add some basic send tracking	2015-12-02 13:43:05 -08:00
Andrew Meadows	ab6367ff4e	remove debug option for disabling physics updates	2015-12-01 11:13:01 -08:00
Seth Alves	cf39cac7fc	attempt to make SpatiallyNestable data access thread-safe	2015-11-29 12:50:33 -08:00
Seth Alves	6062691c2a	minimize diff vs master	2015-11-26 07:04:27 -08:00
Seth Alves	10cf85bad9	fix some rotation handling in EntityItem, minimize diff vs master	2015-11-26 07:02:53 -08:00
Seth Alves	ca75802b9c	unmangle merge	2015-11-26 06:43:28 -08:00
Andrew Meadows	e26081e981	always update physics properties when they change ... and move activation check logic to MotionState	2015-11-24 10:20:19 -08:00
Seth Alves	f013f95e9b	merge from upstream	2015-11-21 08:43:00 -08:00
Brad Hefta-Gaub	2f3cf82202	don't apply out of order edits to entities that have been deleted	2015-11-18 14:26:18 -08:00
Seth Alves	b0d24be58f	add a way to get a list of all actions of a certain type from an entity. hold actions average their positional targets.	2015-11-13 16:02:39 -08:00
Seth Alves	3746920655	allow action updates from others when we are the simulation owner	2015-11-13 13:56:30 -08:00
Seth Alves	6ec5b12081	send to network when an action is deleted, also	2015-11-13 09:52:35 -08:00
Seth Alves	3f7f5a2bbd	send to network when an action is deleted, also	2015-11-13 09:49:31 -08:00
Seth Alves	5acbb74362	send to network when an action is deleted, also	2015-11-13 09:45:06 -08:00
Seth Alves	d7be1699a7	adjust how the decision to send action changes over the wire is made	2015-11-12 15:27:10 -08:00
Seth Alves	a8cd891e48	adjust how the decision to send action changes over the wire is made	2015-11-12 14:19:23 -08:00
Seth Alves	07f3d8eca0	more debugging prints	2015-11-11 16:03:08 -08:00
Seth Alves	31ebe5dba1	terse logging for sim ownership	2015-11-11 08:51:10 -08:00
Seth Alves	5e4f30b2bb	improve terse entity logging. change how action data sending is triggered	2015-11-10 13:58:09 -08:00
Seth Alves	9b3708ea66	use parentChanged to recalculate entity bounding boxes	2015-11-04 09:27:57 -08:00
Seth Alves	60824a1fb0	back out some off-brand changes. add parentChanged call	2015-11-03 16:07:28 -08:00
Seth Alves	f60b1d9bd7	unmangle merge	2015-11-03 13:50:35 -08:00
Seth Alves	3ac0fef1ea	merge from upstream	2015-11-01 15:22:57 -08:00
Stephen Birarda	fb55f0becb	guard timeElapsed for simulateKinematicMotion to max 1s	2015-10-29 12:50:34 -07:00
Seth Alves	22d6b6df34	make withWriteLock and withTryWriteLock const	2015-10-28 13:49:52 -07:00
Seth Alves	a1096510e8	put some useless consts back	2015-10-28 10:52:01 -07:00
Seth Alves	f6a0004f26	get rid of some useless consts	2015-10-28 10:45:24 -07:00
Seth Alves	08a0bf33a4	avoid unneeded read-lock if action-data was dirty	2015-10-28 09:55:55 -07:00
Seth Alves	d504f449e4	undo last commit -- avoid unneeded read-lock if action-data was dirty	2015-10-28 09:55:11 -07:00
Seth Alves	2b5b4f1118	avoid unneeded read-lock if action-data was dirty	2015-10-28 09:54:16 -07:00
Seth Alves	f91dc93620	adjust locking in EntityItem::getActionDataInternal	2015-10-28 08:40:38 -07:00
Seth Alves	f3c61a823e	try harder to get children flags right when something moves. added worldToLocal methods	2015-10-23 16:58:09 -07:00
Seth Alves	61269c3ce8	fix up entity constructors so that setProperties isn't called during the constructor	2015-10-23 13:52:50 -07:00
Seth Alves	22af5b27ab	avoid shared_from_this while constructing	2015-10-23 12:55:48 -07:00
Seth Alves	bf290c35be	when an entity gets a physics flag set, set the same flag in any children	2015-10-23 09:46:57 -07:00
Seth Alves	7b08d047b1	when EntityTree::updateEntityWithElement is called on an entity, call it on all the children of that entity	2015-10-22 16:59:56 -07:00
Seth Alves	d86d69aeba	keep track of children. use local position and orientation on the wire.	2015-10-22 15:36:03 -07:00
Seth Alves	778dc8dc15	add parentID and parentJointIndex EntityItemProperties	2015-10-22 11:52:56 -07:00
Seth Alves	264b658132	hook up entities and avatars to SpatialParentFinder	2015-10-22 11:05:48 -07:00
Seth Alves	6cb195b335	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-10-20 15:53:56 -07:00
Seth Alves	bddbe89c86	don't accept incoming location edits if an entity is being controlled by a shouldSuppressLocationEdits action	2015-10-19 16:13:53 -07:00