57 commits

Author	SHA1	Message	Date
Seth Alves	b2ccc33a79	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-05 14:52:07 -07:00
Seth Alves	3ec3005c6d	code review	2017-05-01 15:32:17 -07:00
Seth Alves	7f69bdecb2	first try at angular-velocity setting action	2017-05-01 07:06:21 -07:00
Seth Alves	dabec586ec	if spring is linked to another entity which we can't find, disable the spring	2017-04-30 11:01:34 -07:00
Seth Alves	c9dfebb713	allow spring action to have targets relative to another entity	2017-04-30 10:58:58 -07:00
Seth Alves	7ce0ef2ec4	fix spring action so that it can be linear or rotational or both	2017-04-30 10:04:07 -07:00
Seth Alves	d0144f4110	avatar-action-far-grab works now	2017-04-14 12:44:54 -07:00
Seth Alves	b1dc5be316	make far-grab it's own action (which is just like spring) in order to avoid bootstrapping own avatar	2017-04-14 11:48:06 -07:00
Seth Alves	cc77fce95f	hinge is sort-of working	2017-04-12 07:12:05 -07:00
Seth Alves	74c0a70cb0	rename base action classes to dynamics, start on constraints	2017-04-11 20:39:13 -07:00
Brad Hefta-Gaub	dbbed462b4	cleanup naked qDebug() calls	2016-12-19 22:24:25 -08:00
Seth Alves	f80333ee9e	fix indentation, move an early exit to earlier	2016-05-06 10:06:51 -07:00
Seth Alves	d76b8f2335	action->locallyAddedButNotYetReceived is unneeded with isMine available	2016-05-05 06:44:52 -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	44beca1687	try having all spring derived actions agree on a target	2016-05-04 11:29:17 -07:00
Andrew Meadows	b9352d3eaa	prevent nan inside spring action	2016-01-15 08:44:52 -08:00
Andrew Meadows	72928fdbd6	fix problem where grab stops on slow movement	2016-01-14 10:42:27 -08:00
Andrew Meadows	6a5a74700f	activate sprung objects when action strong enough	2016-01-12 15:11:27 -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	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
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	64c5cde2d2	further unmangle branch split	2015-10-15 10:33:58 -07:00
Seth Alves	e571cb7ca4	more lock adjustments	2015-10-15 10:22:25 -07:00
Seth Alves	d72152da87	more locking	2015-10-14 13:01:56 -07:00
Seth Alves	07a4dc3a7f	more lock fixing	2015-10-14 12:49:06 -07:00
Seth Alves	fcbb107bc0	tweak	2015-10-13 14:13:53 -07:00
Seth Alves	7c6846c260	add lifetime and tag arguments to actions	2015-09-30 13:09:41 -07:00
Brad Davis	aa989c3687	Fixing some entity race condition crashes	2015-09-10 20:53:17 -07:00
Brad Hefta-Gaub	21afafd4e6	fix hold action with zero offsetLength	2015-09-04 14:07:12 -07:00
Seth Alves	b25f6df7af	quiet compiler	2015-08-11 10:22:56 -07:00
Seth Alves	848e5bcebf	this code can be called for hold actions if they end up in an svo save. revert a line from a previous commit	2015-07-12 13:43:21 -07:00
Andrew Meadows	9ce9c541de	fix activation of object when action changes	2015-07-10 18:45:40 -07:00
Andrew Meadows	294c1ba367	always serialize ACTION_TYPE_SPRING	2015-07-10 12:25:11 -07:00
Andrew Meadows	56f00a526d	cleanup of ObjectActionSpring	2015-07-10 12:25:11 -07:00
Andrew Meadows	a0a1b01ea9	coalesce dupe action data members: _id and _type	2015-07-07 17:50:08 -07:00
Andrew Meadows	e9df8cacc7	make some arguments const, cleanup some #includes	2015-07-07 17:50:08 -07:00
Andrew Meadows	77bd7b2821	some ObjectAction methods should be const	2015-07-07 17:50:08 -07:00
Seth Alves	6e7973f5b9	coding-standard / code-review	2015-06-30 19:28:22 -07:00
Seth Alves	c3747ab8aa	initialize some variables	2015-06-29 19:40:57 -07:00
Seth Alves	88fc74374b	if a hold action is edited by a local script, mark it as 'mine'. if it's not 'mine', let the spring action handle the wire protocol	2015-06-29 19:27:10 -07:00
Seth Alves	fbede0a23f	guard against feeding bullet a NaN	2015-06-29 15:54:24 -07:00
Seth Alves	0970f010a4	provide a way for scripts to get information about what actions an entity has and what the arguments of those actions are	2015-06-27 13:31:00 -07:00
Seth Alves	30be515a94	remove unneeded lock around action-data in entity item. Actions now use a weak pointer to keep track of owner entity	2015-06-27 08:53:27 -07:00
Seth Alves	c95db5672a	include argument-packing version in serialized argument data	2015-06-26 10:01:45 -07:00
Seth Alves	5381e6e9bb	entity server has its own version of actions which simply remember the encoded arguments. Entities with actions don't experience simulateKinematicMotion	2015-06-19 16:20:07 -07:00
Seth Alves	32cf669d8b	moving toward sending actions over wire	2015-06-18 17:51:41 -07:00
Seth Alves	3c90c851e9	start on code to de/serialize actions	2015-06-18 15:01:34 -07:00
Seth Alves	45c7cd4929	respond to code review, add a simple hold-a-stick script	2015-06-10 18:48:51 -07:00
Seth Alves	eccf4eb8a8	hold action works	2015-06-10 17:05:49 -07:00