1579 commits

Author	SHA1	Message	Date
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
Brad Hefta-Gaub	856af8c764	fix EntityItemID dependency	2015-10-21 14:33:12 -07:00
Brad Hefta-Gaub	246e46b69a	implement improvement in sphere test	2015-10-21 10:46:50 -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
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	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
Seth Alves	937959c1c1	cleanups	2015-10-16 09:57:27 -07:00
Seth Alves	d2b7e5c4eb	Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes	2015-10-16 09:54:26 -07:00
Seth Alves	8338491c3b	Merge pull request #6095 from Atlante45/master ... Fix export bug	2015-10-16 07:32:56 -07:00
Seth Alves	b18bb1e076	Merge pull request #6084 from AndrewMeadows/physics-cleanup ... move DIRTY_FLAGS out of EntityItem namespace	2015-10-16 07:22:40 -07:00
Seth Alves	359a318568	fold kinematic hold into normal hold (disabled by default, an argument enables)	2015-10-15 20:23:06 -07:00
Atlante45	a84fdecec9	Fix export bug	2015-10-15 18:43:32 -07:00
Brad Hefta-Gaub	26f82e899e	Merge pull request #6079 from ericrius1/whiteboard ... Entity whitelist for raypicking and whiteboard painting example	2015-10-15 17:50:35 -07:00
Stephen Birarda	e5825daa57	Merge pull request #6090 from ZappoMan/fixStat ... Add some additional stats for debugging edit lags	2015-10-15 16:00:29 -07:00
Brad Hefta-Gaub	93113af2d2	improve server error message for failed edit	2015-10-15 11:55:20 -07:00
Andrew Meadows	fa17b77d70	move DIRTY_FLAGS out of EntityItem namespace	2015-10-15 09:34:09 -07:00
ericrius1	cfca0fe8c0	Adding a color indicator to whiteboard	2015-10-14 15:58:18 -07:00
Seth Alves	9937b6a3ef	quiet some debugging	2015-10-14 13:12:11 -07:00
Seth Alves	07a4dc3a7f	more lock fixing	2015-10-14 12:49:06 -07:00
Seth Alves	fa2bf2b2d9	tighten up locking in actions	2015-10-14 11:43:03 -07:00
Seth Alves	9a9e5b962e	make edit logging terse vs not a domain-server setting	2015-10-14 09:45:35 -07:00
Seth Alves	77bb11675d	terse entity-edit logging	2015-10-14 09:31:44 -07:00