583 commits

Author	SHA1	Message	Date
Seth Alves	c317ba8054	merge from upstream	2017-01-25 15:57:53 -08:00
Stephen Birarda	304618f51d	cleanup comment and scoping for server script URL changes	2017-01-25 12:39:41 -08:00
Stephen Birarda	f1b4f79ad9	a simple hack to accept newer server scripts	2017-01-25 12:39:41 -08:00
Stephen Birarda	33cde412b1	make getJSONParameters thread-safe	2017-01-18 17:49:54 -08:00
Stephen Birarda	a1ad496772	handle match on non-default serverScripts property during entity send	2017-01-18 14:58:36 -08:00
Stephen Birarda	3556379034	leverage JSON filter changes to OctreeQuery in EntityServer	2017-01-18 14:58:36 -08:00
Ryan Huffman	b0c2a9d614	Add serverScripts entity property	2017-01-17 14:47:06 -08:00
Seth Alves	a47aaea37a	don't bootstrap self with an avatar hold action	2017-01-12 10:12:45 -08:00
Seth Alves	4a29cce584	adjust when USER_COLLISION_GROUP_MY_AVATAR is auto-disabled	2017-01-10 06:17:40 -08:00
Seth Alves	35577f49d0	change the test for when MY_AVATAR collisions are short-circuited	2017-01-09 17:00:39 -08:00
Seth Alves	ad45bbf5ba	set DIRTY_COLLISION_GROUP flag when parentID changes	2017-01-09 16:45:54 -08:00
Seth Alves	45a26d599f	if something is a child of the local avatar, never let it collide with MY_AVATAR	2017-01-09 16:40:28 -08:00
Seth Alves	01ff3f14b6	re-evaluate an entities in-bullet status when parentID changes	2017-01-09 15:28:05 -08:00
Seth Alves	6fe35ac0da	use smart pointers to avoid leaking EntityTreeElementExtraEncodeData	2016-12-12 16:04:41 -08:00
Faye Li Si Fi	0556661d13	getting rid of uneccessary flag, fix formatting, and getting it to work yay	2016-12-07 15:40:21 -08:00
samcake	a05e42138c	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-11-14 09:58:12 -08:00
Seth Alves	850361f222	lastEditedBy property for entities	2016-11-10 15:26:28 -08:00
samcake	b563e280e4	Commuting the LIghtEntityItem changes correctly to the LightRenderItem	2016-08-31 13:55:41 -07:00
Andrew Meadows	19cd4648ad	scale collision render mesh correctly	2016-08-24 22:26:56 -07:00
SamGondelman	ccca6d935f	don't fade after physics kick in	2016-08-12 14:35:22 -07:00
SamGondelman	36d9f92101	performance optimization to minimize calling usecTimestampNow	2016-08-09 13:10:02 -07:00
Seth Alves	5f6e608207	don't overwrite physical properties with those from the entity during editEntity -- only set those that the script didn't.	2016-07-19 11:23:21 -07:00
Andrew Meadows	8009d23f70	more STATIC_MESH and dynamic overlap prevention	2016-06-22 15:20:45 -07:00
Andrew Meadows	702e83ba6a	prevent incompatible entity properties combos	2016-06-21 14:03:21 -07:00
Brad Hefta-Gaub	7ed35399e9	make the application of redundant physics update idempotent to improve action glitches	2016-06-02 18:01:23 -07:00
Seth Alves	419c744bd4	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-19 09:49:18 -07:00
Atlante45	38f74c1843	Remove the last of the glow level	2016-05-14 14:49:31 -07:00
Seth Alves	ac506dc4b7	where needed, copy clientOnly into properties before calling queueEditEntityMessage	2016-05-11 12:46:16 -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	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	cd934bab90	set _actionDataDirty when adding an action.	2016-05-05 14:16:13 -07:00
Seth Alves	0c794cac5d	Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes	2016-05-05 10:13:07 -07:00
Seth Alves	d76b8f2335	action->locallyAddedButNotYetReceived is unneeded with isMine available	2016-05-05 06:44:52 -07:00
Andrew Meadows	be9a572fb0	fix grab motion glitch on long-ping connections	2016-05-04 16:50:42 -07:00
Seth Alves	91af732516	if we receive an update from the entity-server that doesn't include one of our actions, resend the action data	2016-05-04 16:30:38 -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	9e53055d43	parentID and parentJointIndex are now protected by simulation ownership	2016-05-03 15:48:50 -07:00
Andrew Meadows	ba226b9cb4	promote priority immediately when already owned	2016-05-03 13:43:08 -07:00
Seth Alves	1da041de9b	don't consume the physics related property changes from the packet that informs us that we are the simulationOwner of an entity	2016-05-02 15:09:08 -07:00
Seth Alves	ae8f502808	keep track of actions we are editing and ignore updates from server for these actions	2016-05-02 14:23:36 -07:00
Andrew Meadows	c686418be0	optimize use of EntityItem::getDimensions()	2016-04-27 10:34:29 -07:00
Brad Hefta-Gaub	8c7ef31636	Merge pull request #7746 from AndrewMeadows/supress-spurious-logs ... reduce warnings about truncated kinematic timesteps	2016-04-23 09:34:45 -07:00
Brad Hefta-Gaub	04dab65b59	Merge pull request #7727 from ZappoMan/supportLargeClockSkew ... support for larger than 35 minute clock skew	2016-04-23 08:42:38 -07:00
Andrew Meadows	d984ce4792	properly update _lastSimulated for kinematic objs	2016-04-22 17:19:00 -07:00
Andrew Meadows	34d622e498	add warning about truncated kinematic timestep	2016-04-22 13:10:23 -07:00
Andrew Meadows	872622c6f7	fix acceleration of for server-side kinematics	2016-04-22 09:38:43 -07:00
Andrew Meadows	14abb15216	set kinematic accel before stepping	2016-04-22 09:38:43 -07:00
Andrew Meadows	8efb07cfd8	correctg measured acceleration for kinematics	2016-04-22 09:38:43 -07:00