4066 commits

Author	SHA1	Message	Date
HifiExperiments	1e100a672e	merge with master and try to fix opacity mode stuff	2019-10-23 22:21:45 -07:00
Brad Hefta-Gaub	51669e1ac3	Revert "DEV-1811: apply deletion rules to linked entities"	2019-10-11 11:06:10 -07:00
Maia Hansen	07b916f0b7	Merge pull request #16307 from AndrewMeadows/colossal-cave ... DEV-1811: apply deletion rules to linked entities	2019-10-10 13:24:43 -07:00
Andrew Meadows	960646f117	skip delete entities not in the tree	2019-10-08 16:12:14 -07:00
Brad Davis	960cab9994	Qt 5.13 warnings & fixes	2019-10-08 15:40:13 -07:00
David Rowe	f224832d27	Merge branch 'master' into DOC-111	2019-10-08 20:44:13 +13:00
Andrew Meadows	052a0c3ebe	remove cruft, add comments, change variable name	2019-10-07 16:23:30 -07:00
jennaingersoll	47aa43f56a	Merge pull request #16251 from ctrlaltdavid/DOC-155 ... DOC-155: EntityViewer JSDoc	2019-10-07 15:45:42 -07:00
Andrew Meadows	8ab70225d9	apply delete rules down linked hierarchy	2019-10-07 14:38:36 -07:00
Andrew Meadows	470a45c012	EntityItem::_owningAvatarID always AVATAR_SELF_ID for MyAvatar's entities	2019-10-07 14:38:36 -07:00
Andrew Meadows	99d0579007	remove updateEntitiesInternal(), make updateEntities() virtual	2019-10-07 14:38:36 -07:00
Andrew Meadows	9557ba80c9	all delete pass through EntitySimulation::prepareEntityForDelete()	2019-10-07 14:38:36 -07:00
Andrew Meadows	03db88009f	simplify add/removal to EntitySimulation	2019-10-07 14:38:36 -07:00
Andrew Meadows	72ba94f2cd	unravel more spaghetti into PhysicalEntitySimulation	2019-10-07 14:35:28 -07:00
Andrew Meadows	86c60204fd	move entity Action serialization to PhysicalEntitySimulation	2019-10-07 14:35:28 -07:00
jennaingersoll	aab66a2675	Merge pull request #16266 from ctrlaltdavid/DOC-107 ... DOC-107: Fix description of entity acceleraton property and deprecate	2019-10-04 15:17:21 -07:00
David Rowe	be3947f6a7	Fix description of entity acceleraton property and deprecate	2019-10-01 11:16:15 +13:00
David Rowe	8b2d9427bb	Update description of the entities available to the Entities API	2019-09-26 10:54:12 +12:00
David Rowe	16c33ebbec	Clarify frustum property values used by Entities.findEntitiesInFrustum()	2019-09-25 19:29:20 +12:00
David Rowe	605d272392	Merge branch 'master' into DOC-111	2019-09-20 10:25:21 +12:00
David Rowe	d5e08d19e3	Fix JSDoc for miscellaneous white space issues	2019-09-20 08:17:24 +12:00
Andrew Meadows	ab419ddd23	beware null sessionID	2019-09-19 08:25:01 -07:00
Andrew Meadows	54d3ceda28	update QueryAACube of kinematic things with known parentage	2019-09-17 15:31:16 -07:00
David Rowe	dff37a71eb	Fix JSDoc markup HTML issues	2019-09-17 16:26:09 +12:00
Shannon Romano	79d845d127	Merge pull request #16190 from danteruiz/fix-html ... BUGZ-1398: HMD Tablet Apps blocked by Web access error	2019-09-13 12:35:29 -07:00
danteruiz	8491a37923	fixing WebEntities html	2019-09-13 09:57:51 -07:00
Shannon Romano	65d0bb1342	Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc ... Kasen Plugin Infrastructure v½ Codename "Modkit Mini"	2019-09-11 13:04:01 -07:00
Zach Fox	b39e527b5b	DEV-555: Ensure 'href' entity property supports relative paths (coordinates and named paths)	2019-09-10 11:57:02 -07:00
Andrew Meadows	227b99859d	fix api for checking EntityItem grab status	2019-09-06 17:23:38 -07:00
Andrew Meadows	580b6a3b2c	small optimization: check before lock	2019-09-06 17:23:38 -07:00
humbletim	271fac4bca	Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge	2019-09-05 09:46:21 -04:00
HifiExperiments	97b9179144	merge with master	2019-09-05 00:46:56 -07:00
David Rowe	672e61c49d	Fix typo in Entities.EntityProperties-Material example	2019-09-04 21:06:49 +12:00
David Rowe	4e274347b4	Fix typo in Entities.getAbsoluteJointRotationInObjectFrame() JSDoc	2019-09-04 21:05:36 +12:00
Andrew Meadows	81eaf157a6	tighter bounding box when rendering PolyLines	2019-08-22 08:13:11 -07:00
Brad Hefta-Gaub	b0b406adda	Merge pull request #16015 from HifiExperiments/renderUpdate ... BUGZ-902: Drastically reduce locking and branching necessary for render updates	2019-08-15 09:35:17 -07:00
Shannon Romano	9e0e6f9d5e	Merge pull request #16003 from ctrlaltdavid/DOC-84 ... DOC-84: Update JSDoc with glTF	2019-08-06 13:22:04 -07:00
David Rowe	2939610eae	Fix link to TextEffect type	2019-08-06 11:00:24 +12:00
David Rowe	1abf0eb207	Merge branch 'master' into DOC-124 ... # Conflicts: # libraries/entities/src/EntityItemProperties.cpp	2019-08-06 10:59:50 +12:00
HifiExperiments	1b84244210	merge with master	2019-08-05 09:35:56 -07:00
MiladNazeri	ae7b415152	Merge pull request #16008 from HifiExperiments/text ... Supporting text effects + fonts on Text Entities	2019-08-02 14:25:28 -07:00
Seth Alves	f1dee1e7f8	fix uninitialized variables	2019-08-01 14:50:21 -07:00
HifiExperiments	62bb4e1d46	simplify render update check, threadsafety	2019-07-31 21:02:21 -07:00
HifiExperiments	7b29f0f718	reduce locking necessary for render updates	2019-07-31 11:21:29 -07:00
HifiExperiments	078ca7edea	supporting text effects + fonts on text entities	2019-07-30 09:59:45 -07:00
David Rowe	ade85ad8c0	Update API JSDoc with glTF	2019-07-30 10:41:07 +12:00
humbletim	058c81aa1a	Merge branch 'hifi-master' into kpi-v1-modkit-rc	2019-07-26 01:36:52 -04:00
David Rowe	8c92f972e5	Merge branch 'master' into DOC-124 ... # Conflicts: # interface/src/scripting/Audio.h	2019-07-23 12:53:35 +12:00
David Rowe	8a6a4041d9	Tidy key light property's shadow values JSDoc	2019-07-23 11:28:57 +12:00
David Rowe	39ae575ef3	Tidy entities' "unlit" properties	2019-07-23 11:02:43 +12:00