483 commits

Author	SHA1	Message	Date
Seth Alves	823428290d	Merge branch 'master' of github.com:highfidelity/hifi into various-fixes	2016-01-18 13:26:45 -08:00
Seth Alves	d6e3b85237	fix javascript access via localPosition and localRotation	2016-01-18 11:15:32 -08:00
Andrew Meadows	952f5b23f6	namechange collisionsWillMove --> dynamic	2016-01-15 15:21:25 -08:00
Andrew Meadows	222398e5cc	no packet version check for collision mask	2016-01-12 15:10:18 -08:00
Andrew Meadows	e1ba4ff0a8	add CollisionMask entity property	2016-01-12 15:08:52 -08:00
Seth Alves	942e77166e	merge from upstream	2016-01-05 11:11:19 -08:00
Seth Alves	40a25f859a	cleanups	2016-01-03 08:00:23 -08:00
Seth Alves	81d3571171	fix getMaximumAACube and getMinimumAACube success return values	2015-12-18 12:04:47 -08:00
Seth Alves	473212e5b7	try to be more coherent about queryAABox meaning	2015-12-17 14:29:41 -08:00
Seth Alves	45d19167c9	fix a couple of missing-parent bugs	2015-12-16 10:09:46 -08:00
Seth Alves	2b800d711f	queryAACube to and from scriptvalues	2015-12-15 15:18:43 -08:00
Seth Alves	008065ba38	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-14 09:15:56 -08:00
Seth Alves	c74f8bca49	location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent	2015-12-14 09:13:36 -08:00
Seth Alves	24fb43e8cd	first steps toward a puffed-out query-box for child entities	2015-12-12 12:33:14 -08:00
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