21953 commits

Author	SHA1	Message	Date
Seth Alves	21ca767b7c	remove setPosition and setRotation for actions because they were never finished and never used.	2017-04-18 11:59:16 -07:00
Seth Alves	fbd4677a9a	add a way to set hinge-constraint motor speed from javascript	2017-04-15 21:10:02 -07:00
Seth Alves	b4ff3a8691	don't destroy and recreate constraints when reinserting rigid body	2017-04-15 21:08:59 -07:00
Seth Alves	d42970d480	fix hinge-constraint constructors to use otherAxis	2017-04-15 08:51:08 -07:00
Seth Alves	41fb05ecf7	bump protocol version	2017-04-14 16:26:54 -07:00
Seth Alves	371118a6c0	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-14 16:26:30 -07:00
Seth Alves	f08fecbfa7	make sure new constraint data gets transmitted over network	2017-04-14 16:25:27 -07:00
Seth Alves	708008d8a5	cleanups	2017-04-14 13:43:48 -07:00
Sam Gateau	3519a72f8a	Merge pull request #10190 from samcake/ambient-bis ... Introducing a tool to debug the current Zone Stack	2017-04-14 13:28:59 -07:00
Seth Alves	07b23b8235	expose other hinge-constraint parameters to javascript	2017-04-14 13:28:25 -07:00
Seth Alves	d17d12446b	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-14 12:49:03 -07:00
Seth Alves	d0144f4110	avatar-action-far-grab works now	2017-04-14 12:44:54 -07:00
Thijs Wenker	6f58e91d76	Merge pull request #10121 from birarda/bug/recording-cache ... cleanup Agent RSI handling, make loadRecording async	2017-04-14 21:35:51 +02:00
Stephen Birarda	7b48feca66	address code review comments	2017-04-14 11:53:53 -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	2dab3069da	fix bug that was causing spring action to cause constant re-insertion of its rigidbody into bullet. store UUIDs rather than shared pointers in _objectDynamicsByBody so that refcounting works right and actions get their destructors called.	2017-04-14 11:06:40 -07:00
Seth Alves	f5a5369055	attempt to remove dynamics associated with a rigid-body before removing the rigid-body	2017-04-14 07:06:53 -07:00
Seth Alves	52aee63e05	keep track of objectDynamics per rigidBody	2017-04-14 06:08:58 -07:00
Seth Alves	afa8fc161b	allow hinge constraint between two entities	2017-04-13 15:37:28 -07:00
Andrew Meadows	e364b8d33e	avatar-mixer resends to avoid stale avatar	2017-04-13 13:35:59 -07:00
Seth Alves	7695d2ac05	put the protocol version back to what's in master, for now	2017-04-13 11:29:40 -07:00
Seth Alves	1ab3a1eb60	bump entity-protocol version	2017-04-12 16:36:04 -07:00
Seth Alves	9b12956909	formatting	2017-04-12 16:34:34 -07:00
Seth Alves	0eb9507a10	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0	2017-04-12 16:25:50 -07:00
Andrew Meadows	e64e2614e3	Merge pull request #10147 from alhighfidelity/Kinect-Hand-Filter ... Kinect hand filter	2017-04-12 14:27:05 -07:00
Seth Alves	507f658a5f	update comment	2017-04-12 07:37:41 -07:00
Seth Alves	9f252f04e7	cleanups	2017-04-12 07:25:23 -07:00
Seth Alves	53cb192af1	fixed names of pivot and axis	2017-04-12 07:22:27 -07:00
Seth Alves	cc77fce95f	hinge is sort-of working	2017-04-12 07:12:05 -07:00
Seth Alves	2b0315645c	actions work again	2017-04-11 21:11:03 -07:00
Seth Alves	74c0a70cb0	rename base action classes to dynamics, start on constraints	2017-04-11 20:39:13 -07:00
Chris Collins	b07ed13023	Merge pull request #10184 from druiz17/snapshot-fix ... snapshot bug fixes	2017-04-11 13:00:46 -07:00
Chris Collins	c86acfafef	Merge pull request #10120 from huffman/feat/stick-default-avatar ... Change default avatar to ball and stick avatar	2017-04-11 12:56:25 -07:00
samcake	5daf365784	Avoiding warning maybe	2017-04-11 12:15:30 -07:00
Chris Collins	3a603e7ced	Merge pull request #10193 from sethalves/fix-dont-delete-tablet-qobject ... change handling of life-time of TabletProxy QObjects	2017-04-11 11:53:47 -07:00
Zach Fox	6569de697d	Merge pull request #10187 from zfox23/fix/getAvatar_Fix ... Fix FB3999; Fix crashes caused by getAvatar() design bug	2017-04-11 11:17:48 -07:00
samcake	612acbc6d5	Avoid pointers on temp var	2017-04-11 10:56:58 -07:00
Seth Alves	077a4fe4ae	change handling of life-time of TabletProxy QObjects	2017-04-11 10:56:47 -07:00
samcake	79bcf95792	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis	2017-04-11 10:00:34 -07:00
druiz17	b7daf8c80b	Merge pull request #10191 from sethalves/fix-collision-hull-munging ... fix -- munge collision-hull at last minute rather than store munged url as a property	2017-04-11 09:09:54 -07:00
Dante Ruiz	d823093ddb	fixed merge conflict	2017-04-11 16:58:25 +01:00
Seth Alves	bf16309917	Merge pull request #10146 from AndrewMeadows/avoid-invisible-avatars-002 ... avoid invisible avatars redux	2017-04-11 07:07:03 -07:00
Seth Alves	938fab6f59	Merge pull request #10061 from humbletim/fix-cached-ResourceCache ... Fix cached ResourceCache::prefetch() state updates	2017-04-11 07:04:06 -07:00
Seth Alves	b99959c73d	munge collision-hull at last minute rather than store munged url as a property	2017-04-11 07:00:22 -07:00
Sam Cake	1dd98af1dd	And introduce a clean sorted select of the items so we keep the order of rendering of the boxes of the zone in the ZOne stack order, the color of box reflect the order (from red to blue)	2017-04-11 01:21:45 -07:00
Sam Cake	80c781bcdc	Fixing warning on mac and more description of the Task class	2017-04-10 22:17:12 -07:00
Stephen Birarda	db6fc40277	fix ScriptAvatar promotion of AvatarData	2017-04-10 22:15:45 -07:00
Stephen Birarda	84a5807ff1	return ScriptAvatarData raw pointer from getAvatar	2017-04-10 22:15:45 -07:00
Stephen Birarda	6c49db0f1b	add missing include for qScriptRegisterMetaType in Agent	2017-04-10 22:15:45 -07:00
Stephen Birarda	42a406e90a	add ScriptAvatar for std::shared_ptr<Avatar> passing to scripts	2017-04-10 22:15:45 -07:00