553 commits

Author	SHA1	Message	Date
Andrew Meadows	ffc3123467	Merge pull request #7658 from sethalves/grab-fixes ... Grab fixes	2016-05-09 15:30:37 -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
Andrew Meadows	a79f49a5cd	don't stop slow kinematic objs when sending updates	2016-04-22 09:38:43 -07:00
Andrew Meadows	ad045bc439	remove second-order term from kinematic motion	2016-04-22 09:38:43 -07:00
Andrew Meadows	3639ffe53e	optimize kinematic motion math	2016-04-22 09:38:43 -07:00
Brad Hefta-Gaub	31f9d592e0	support for larger than 35 minute clock skew	2016-04-20 18:42:00 -07:00
Andrew Meadows	a263091c94	fix entity-server crash for out of bounds	2016-04-14 15:23:14 -07:00
Seth Alves	3288bff963	don't flood log with messages about expired actions. also, try to remove such actions	2016-04-13 09:47:07 -07:00
Brad Hefta-Gaub	cc418c615f	Merge pull request #7631 from sethalves/parent-equipping-and-platform-hack ... treat children of avatars and children of entities differently until velocity handling is fixed	2016-04-10 14:55:03 -07:00
Seth Alves	43f735dd21	avoid loop where bullet moves an entity and then an entity tells bullet that it has moved.	2016-04-09 22:18:43 -07:00
Seth Alves	2aa3e5d418	re-enabled EntityItem::simulateKinematicMotion for things with parents	2016-04-09 09:06:18 -07:00
Seth Alves	5375fdd0f0	don't do simple kinematic simulation on things that have parents	2016-04-06 16:42:14 -07:00
Seth Alves	af05b97c1e	put back accidently deleted line. cleanups	2016-04-04 17:31:59 -07:00
Seth Alves	d814d7b35d	merge from upstream	2016-04-04 16:32:49 -07:00
Seth Alves	69bb0ebd74	Revert "faster kinematic motion for entities"	2016-04-04 16:11:54 -07:00
Seth Alves	b8587e0711	update collision shapes of entities which are children of avatars	2016-04-04 16:06:53 -07:00
Andrew Meadows	a08ab8e127	restore setFlag in simulateKinematicMotion()	2016-04-04 11:48:45 -07:00
Andrew Meadows	a53cb2e532	use _gravity rather than _acceleration ... also tweaks and comments about supporting low gravity	2016-04-04 11:10:50 -07:00
Andrew Meadows	74058ac049	more correct moving test for ballistic kinematics	2016-04-03 19:15:16 -07:00
Andrew Meadows	0830c55bcf	getLocalEverything->getLocalTransformAndVelocities	2016-04-01 17:48:56 -07:00
Andrew Meadows	442b52313f	faster kinematic motion calculations	2016-04-01 13:14:03 -07:00
howard-stearns	5381be6902	Whitespace	2016-03-29 17:06:19 -07:00
howard-stearns	bcb729eac2	Abstract out globalizeProperties.	2016-03-29 15:21:06 -07:00
howard-stearns	b09b9a4a0a	snapshot after using tree from entity item.	2016-03-28 16:58:20 -07:00
Brad Hefta-Gaub	62a56ecbfa	fix typos	2016-03-23 17:45:22 -07:00
Seth Alves	1e02c8d9d3	minimize diff	2016-03-17 17:28:36 -07:00
Seth Alves	cbfde2032c	fix bug which caused observers of a parenting grab to not see the entity in the grabber's hand	2016-03-17 17:09:32 -07:00
ZappoMan	1a17de6dbb	reduce log spam	2016-03-14 14:02:25 -07:00
Brad Hefta-Gaub	35d6afbe77	Merge branch 'master' of https://github.com/highfidelity/hifi into fixSceneNotStable	2016-03-08 14:53:41 -08:00
Brad Hefta-Gaub	6d211dd4e5	first cut at fixing the scene not stable bug	2016-03-08 14:52:21 -08:00
Seth Alves	9346171695	if entity registration isn't default, adjust physics shapes to match	2016-03-04 16:47:30 -08:00
samcake	f12030c1a4	Merge branch 'master' of https://github.com/highfidelity/hifi into red	2016-02-11 18:41:02 -08:00