1622 commits

Author	SHA1	Message	Date
Seth Alves	3ac0fef1ea	merge from upstream	2015-11-01 15:22:57 -08:00
Bradley Austin Davis	46d87dda5a	Fixing paths for SDL2 and Sixense libs	2015-10-30 19:00:26 -07:00
samcake	393f6a4c76	Fixing a bad field ID for keyLight.AmbientURL and bumping the domain version	2015-10-30 11:35:50 -07:00
Stephen Birarda	fb55f0becb	guard timeElapsed for simulateKinematicMotion to max 1s	2015-10-29 12:50:34 -07:00
Brad Hefta-Gaub	3bbba99e2b	Merge pull request #6178 from samcake/color ... Refactor the KeyLIght properties in their own group	2015-10-29 10:44:44 -07:00
Andrew Meadows	f9012d5051	Merge pull request #6187 from sethalves/fix-actions-ttl ... fix actions bug	2015-10-29 09:30:21 -07:00
samcake	e4aab4bd97	Merge branch 'master' of https://github.com/highfidelity/hifi into color	2015-10-28 15:32:13 -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	8d0aaed41a	fix bug that was deleting actions with 0 ttl. in js interface, action parameter 'lifetime' is now called 'ttl'	2015-10-26 13:50:21 -07:00
samcake	ca30ce1ff0	Move the keyLIght properties in their own group and add the ambientURL in	2015-10-26 10:08:16 -07:00
samcake	bc7ad9d3f7	Move the keyLIght properties in their own group and add the ambientURL in	2015-10-26 09:27:06 -07:00
samcake	42ac8c5769	Stariting to reorganize the keyLight porperties of the Zone Entity	2015-10-23 18:15:19 -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	7f6ac0207d	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-10-22 19:35:27 -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
Brad Hefta-Gaub	856af8c764	fix EntityItemID dependency	2015-10-21 14:33:12 -07:00
Seth Alves	3944d7be0f	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-10-21 13:50:17 -07:00
Brad Hefta-Gaub	246e46b69a	implement improvement in sphere test	2015-10-21 10:46:50 -07:00
Seth Alves	7d8dca4edb	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-10-21 09:55:21 -07:00
Brad Hefta-Gaub	954afe45d3	Merge pull request #6112 from ericrius1/rayPickAdditions ... Moved whitelist and raypicking code out of octree, fixed small bug with polylines	2015-10-21 09:08:56 -07:00
Brad Hefta-Gaub	d34ad2af42	improved findEntities(sphere) to check against Non-AABBox of entities	2015-10-20 21:01:20 -07:00
Seth Alves	6cb195b335	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-10-20 15:53:56 -07:00
Stephen Birarda	14aab4871d	Merge pull request #6119 from Atlante45/baseball ... Fix autoresizing log spam	2015-10-20 13:45:50 -07:00
ericrius1	0373a481f8	Using EntityItemIDs instead of QUuids	2015-10-20 09:22:16 -07:00
Atlante45	1c46f2aa75	Fix autoresizing log spam	2015-10-19 18:22:44 -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
Seth Alves	9e24542c0b	don't accept incoming location edits if an entity is being controlled by a shouldSuppressLocationEdits action	2015-10-19 16:05:56 -07:00
Seth Alves	00594f0cce	don't accept incoming location edits if an entity is being controlled by a shouldSuppressLocationEdits action	2015-10-19 16:05:10 -07:00
Seth Alves	a1cfebc173	don't accept incoming location edits if an entity is being controlled by a shouldSuppressLocationEdits action	2015-10-19 15:57:15 -07:00
ericrius1	dcb37ccd73	Removed whitelist and raypicking code from octree, fixed a small bug with polylines	2015-10-19 13:14:19 -07:00
ericrius1	8c229d88a8	moving whitelist code out of octree	2015-10-19 11:59:44 -07:00
Seth Alves	46e5bf0435	take entity-server clock-skew into account when handling action expiration times	2015-10-19 11:59:03 -07:00
Seth Alves	5c031a38c7	try another way of fixing held object snagging at slow velocity	2015-10-19 10:29:30 -07:00
Seth Alves	c5a5f26e6a	try another way of fixing held object snagging at slow velocity	2015-10-19 10:27:35 -07:00
Seth Alves	37923e81bb	make SpatiallyNestable::_transform private	2015-10-18 08:18:10 -07:00
Seth Alves	275e77d29e	remove old-style avatar referentials	2015-10-18 07:51:00 -07:00
Seth Alves	353f92f1ba	Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes	2015-10-17 13:09:52 -07:00
Atlante45	1da68e0214	Fix particle bug by having lifetimes increase	2015-10-16 18:11:22 -07:00