159 commits

Author	SHA1	Message	Date
Clément Brisset	c63fc8557c	More baseball test code	2015-11-03 11:14:59 -08:00
Ryan Huffman	ccb25f4b63	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-03 11:10:45 -08:00
Ryan Huffman	afffe7f5c6	Merge branch 'master' of github.com:Atlante45/hifi into baseball	2015-11-03 11:10:14 -08:00
Clément Brisset	31d92fd90a	Baseball test code	2015-11-03 11:00:35 -08:00
Andrew Meadows	f652e983a9	flag kinematic objs when changed in stepSimulation()	2015-10-30 14:53:29 -07:00
Seth Alves	93503d0a21	make kinematic grab set entities kinematic in bullet and update entity position	2015-10-30 11:03:13 -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
Seth Alves	c0eccca6d3	relay 'kinematic' mode of a hold to other interfaces	2015-10-21 12:29:26 -07:00
Seth Alves	41f7ef1e2e	cleanups	2015-10-19 16:53:27 -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	fe709a9397	keep object active in kinematic mode, also	2015-10-16 10:53:33 -07:00
Seth Alves	966499b9e5	continually activate (in the bullet sense) a held object	2015-10-16 10:17:17 -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
Seth Alves	0964180f2c	code review	2015-10-15 17:10:47 -07:00
Seth Alves	487131dde1	cleanups	2015-10-15 14:52:38 -07:00
Seth Alves	4903db45b1	give other avatars an anim-skeleton	2015-10-15 14:21:06 -07:00
Seth Alves	1d8db13f41	switch to low-entity-server traffic hold	2015-10-15 10:56:47 -07:00
Seth Alves	64c5cde2d2	further unmangle branch split	2015-10-15 10:33:58 -07:00
Seth Alves	a78728c96b	further unmangle branch split	2015-10-15 10:29:25 -07:00
Seth Alves	8195145dc7	further unmangle branch split	2015-10-15 10:13:00 -07:00
Seth Alves	d833fb08d7	further unmangle branch split	2015-10-15 10:03:32 -07:00
Seth Alves	9f40c7bf8c	fix up AvatarActionHold	2015-10-15 09:13:06 -07:00
Seth Alves	9937b6a3ef	quiet some debugging	2015-10-14 13:12:11 -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	fa2bf2b2d9	tighten up locking in actions	2015-10-14 11:43:03 -07:00
Seth Alves	2ecb7e8d29	fix bug that was making action deletes fail	2015-10-13 16:19:12 -07:00
Seth Alves	4fa85441b8	tweak	2015-10-13 15:14:34 -07:00
Seth Alves	257e3845de	get action type correct	2015-10-13 14:45:20 -07:00
Seth Alves	fcbb107bc0	tweak	2015-10-13 14:13:53 -07:00
Seth Alves	8b72f6e7c6	tweak	2015-10-13 13:50:43 -07:00
Seth Alves	7c52849740	change how hold action works	2015-10-13 11:36:58 -07:00
Seth Alves	7c6846c260	add lifetime and tag arguments to actions	2015-09-30 13:09:41 -07:00
Brad Davis	92eeb564fe	PR comments	2015-09-10 20:57:43 -07:00
Brad Davis	aa989c3687	Fixing some entity race condition crashes	2015-09-10 20:53:17 -07:00
Brad Davis	3bc9e8c98d	Fixing some entity race condition crashes	2015-09-10 20:43:41 -07:00
Andrew Meadows	9ce9c541de	fix activation of object when action changes	2015-07-10 18:45:40 -07:00
Andrew Meadows	9cb7e86877	cleanup of AvatarActionHold deserialization	2015-07-10 12:34:12 -07:00
Seth Alves	2dc4922da3	bring over code from entity-level-locking branch	2015-07-09 15:23:05 -07:00
Seth Alves	5312beeaf4	if an action changes its own arguments, cause reserialisation	2015-07-09 14:50:31 -07:00
Seth Alves	a01fb6f1dc	if an action changes its own arguments, cause reserialisation	2015-07-09 14:32:34 -07:00
Seth Alves	d197bf2a85	use palm rotation data in hold action	2015-07-09 12:18:32 -07:00
Seth Alves	08d63b7fd8	first attempt at palm rotation	2015-07-09 11:03:02 -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	0caa8be66e	ignore incoming changes for a hold action that's flagged as 'mine'	2015-06-29 19:50:19 -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	a0fd75c54f	don't enable hold actions from remote nodes	2015-06-29 16:08:37 -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	c95db5672a	include argument-packing version in serialized argument data	2015-06-26 10:01:45 -07:00
Seth Alves	3afdcfd6d1	quiet compiler	2015-06-21 18:12:58 -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	3c90c851e9	start on code to de/serialize actions	2015-06-18 15:01:34 -07:00
Seth Alves	85564199c6	git rid if pull-to-point action (spring handles this). add new action which tries to maintain an entity's distance from a given point	2015-06-17 11:22:10 -07:00
Seth Alves	8ed9a3ca02	add handedness setting to avatar-hold action. update stick.js to allow use of hydra	2015-06-11 11:04:19 -07:00
Seth Alves	eccf4eb8a8	hold action works	2015-06-10 17:05:49 -07:00
Seth Alves	3dcc6c9b8c	make action-factory interface and subclass it in Interface. this allows an action to use avatar data. the login the AvatarActionHold is still bogus.	2015-06-10 12:04:44 -07:00