29168 commits

Author	SHA1	Message	Date
sabrina-shanman	b5862aca2a	Use bracket initialization for CollisionRegion.loaded	2018-08-31 10:53:20 -07:00
sabrina-shanman	f71fc83309	Remove PickResult::needsToCompareResults	2018-08-31 10:48:48 -07:00
sabrina-shanman	e94d7de99a	Add JS API hook for getting overlay IDs from a pointer via ... Pointer.getPointerProperties	2018-08-31 09:18:07 -07:00
sabrina-shanman	a4bb8cb622	Add comment on future of PickTransformNodes	2018-08-30 09:08:02 -07:00
sabrina-shanman	0926968e2b	Do not have depth as a parameter in getTransform(..) when called in NestableTransformNode	2018-08-29 16:30:06 -07:00
sabrina-shanman	686f9fb18a	Move load state flag from CollisionPickResult to CollisionRegion and make it a boolean	2018-08-29 16:29:59 -07:00
sabrina-shanman	78a438d89a	Correct CollisionRegion jsdoc for 'joint' parameter	2018-08-29 14:55:14 -07:00
sabrina-shanman	6f6e70a470	Re-order variable initialization in CollisionRegion copy contructor	2018-08-28 08:45:47 -07:00
sabrina-shanman	397b03d5d5	Add threshold parameter to collision pick with minimum of 0	2018-08-27 14:12:24 -07:00
sabrina-shanman	51683b0b53	Remove storage of parenting information from CollisionRegion	2018-08-27 10:16:09 -07:00
sabrina-shanman	cce62f4d92	Do not assume picks with doesIntersect()==false have no results to compare. Fixes CollisionPickResult 'loaded' value always evaluating to false when not colliding	2018-08-24 15:47:52 -07:00
sabrina-shanman	6e160ad22f	Add TransformNode-based parenting and implement for CollisionPicks	2018-08-24 15:47:52 -07:00
sabrina-shanman	68b86963d4	Add CollisionRegion copy constructor	2018-08-24 15:47:52 -07:00
sabrina-shanman	b0f8d3e427	Add PickTransformNode	2018-08-24 15:47:52 -07:00
sabrina-shanman	3167d3c0c7	Create TransformNodes for SpatiallyNestables, the mouse, and MyAvatar head	2018-08-24 15:47:52 -07:00
John Conklin II	fcdbc6c6d2	Merge pull request #13778 from SamGondelman/bloom ... Enable bloom in zone properties	2018-08-24 14:46:31 -07:00
Andrew Meadows	10d0833c19	use DynamicsWorld::numCollisionObjects instead of our own count	2018-08-23 15:57:54 -07:00
Andrew Meadows	777b90bdc0	add 'physics body count' to debug stats	2018-08-23 12:59:28 -07:00
Andrew Meadows	87223946ad	add/remove avatars according to workload region	2018-08-23 12:59:28 -07:00
Andrew Meadows	99aafb1f95	move code from Avatar to OtherAvatar	2018-08-23 12:59:28 -07:00
Andrew Meadows	1c87d7b109	reorder initialization to remove compile warning	2018-08-23 12:59:28 -07:00
Andrew Meadows	3c01433e12	stub for avatars changing workload regions	2018-08-23 12:59:28 -07:00
Andrew Meadows	55b1a6762c	explicit delete default ctor, make _nestableType private	2018-08-23 12:59:28 -07:00
John Conklin II	1320a34a18	Merge pull request #13841 from luiscuenca/noAttachmentsToJSON ... Don't include old attachment data on new avatar recordings	2018-08-23 10:51:33 -07:00
John Conklin II	5dd64645eb	Merge pull request #13861 from SimonWalton-HiFi/safe-landing-fixes ... Fix safe-landing protocol for sparse domains	2018-08-23 10:17:08 -07:00
Simon Walton	c0966d738e	Use EntityVersion for the EntityQueryInitialResultsComplete packet	2018-08-22 16:40:49 -07:00
Simon Walton	c4b916af62	Just bump packet version for EntityQueryInitialResultsComplete	2018-08-22 16:22:30 -07:00
Simon Walton	dd098f05c2	Change EntityQueryInitialResultsComplete protocol to use exclusive sequence number	2018-08-22 14:54:07 -07:00
luiscuenca	b3d127c953	Fix flickering	2018-08-22 14:31:34 -07:00
Stephen Birarda	01e8fd66a3	fix script engine(s) cleanup from ESS	2018-08-22 13:52:37 -07:00
John Conklin II	04d72ea39d	Merge pull request #13850 from samcake/punk ... Adjust Workload Region to be bigger	2018-08-22 10:21:14 -07:00
luiscuenca	5a5aa2f5b9	Remove proxy line	2018-08-22 09:13:27 -07:00
John Conklin II	1036f3c8b6	Merge pull request #13803 from birarda/feat/avatar-traits ... introduce avatar traits system, migrate skeleton URL and avatar entities	2018-08-22 09:13:21 -07:00
luiscuenca	5f4903f884	Record entities	2018-08-22 08:53:51 -07:00
Sam Gateau	0f6f465e7f	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-08-21 19:23:33 -07:00
Brad Davis	e9683011f8	Fix parabola rendering on AMD GPUs	2018-08-21 16:58:38 -07:00
Bradley Austin Davis	d3fd2132ce	Merge pull request #13851 from samcake/black ... Fix the local lights not working on AMD	2018-08-21 15:36:12 -07:00
sam gateau	30c0c44822	Completely remove the texcoord frame transform as we don;t use it at all	2018-08-21 14:52:42 -07:00
sam gateau	6b994ba39a	Completely remove the texcoord frame transform as we don;t use it at all	2018-08-21 14:51:54 -07:00
Stephen Birarda	7d8db482a3	put back ExtendedIODevice ctor for ubuntu warning	2018-08-21 13:21:21 -07:00
sam gateau	8c5aab7fa0	tabs!	2018-08-21 12:30:31 -07:00
sam gateau	b7d8b92fb5	Add comment in shader and fix bad cull mode	2018-08-21 12:25:27 -07:00
sam gateau	5ae604f341	REmove the texture Transform for deferred_light slv which then makes it work correctly on AMD	2018-08-21 12:14:32 -07:00
Stephen Birarda	8226ffb916	fix ref to instances vector for instance erase	2018-08-21 11:57:21 -07:00
Stephen Birarda	8c58ae4e60	fix insert of second trait instance	2018-08-21 11:56:28 -07:00
Stephen Birarda	25ed166f07	fix logic for initial send of deleted trait instance	2018-08-21 11:49:48 -07:00
John Conklin II	ad835597e6	Merge pull request #13779 from amantley/perspectiveBug ... Perspective bug	2018-08-21 11:31:14 -07:00
Stephen Birarda	3e2d4dc696	fixes and improvments addressing CR comments	2018-08-21 10:53:52 -07:00
Stephen Birarda	4875738a05	always add to detached, flag update on full replace	2018-08-21 10:32:05 -07:00
Stephen Birarda	99f532a20e	always check added avatar entities once in updateAvatarEntities	2018-08-21 10:32:05 -07:00