4123 commits

Author	SHA1	Message	Date
Andrew Meadows	cf08a4162a	add workload job to help debug entity proxies	2019-11-12 10:35:16 -08:00
sabrina-shanman	7b14c00540	Merge branch 'master' into instancing	2019-11-05 10:22:24 -08:00
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
Sam Gateau	3e8d6671f7	Merge branch 'instancing' of github.com:highfidelity/hifi into instancing	2019-10-10 09:04:22 -07:00
Sam Gateau	abaf0262a7	Merge branch 'master' of https://github.com/highfidelity/hifi into instancing	2019-10-08 18:55:51 -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
Sam Gateau	dd53ace114	Merge branch 'master' of github.com:highfidelity/hifi into instancing	2019-10-07 17:21:02 -07: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
Sam Gateau	521ce3936b	I changed names! Renaming the Geometry to NetworkModel, the GeometryResource to ModelResource, i think there is no need for the 2, only one would be enough in my opinion...	2019-10-07 15:19:23 -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
David Rowe	0a32386f45	Merge branch 'master' into DOC-102	2019-07-20 09:13:52 +12:00
kasenvr	e9e9607a3b	modkit core changes initial commit ... whitespace corrections + warnings updated cmake plugin rework with focus on JS API integration example cleanup edit_filter scope separate-out edit_filter wantsScope stuff -plugin metadata split scriptengines out separately cleanup __url/__filename sets additional cleanup fix typo; consolidate ScriptInitializerMixin inits add more example API protoypes cleanup pass; fix entity_server / agent init fix whitespace remove technically unnessary plugin filtering +EDIT_FILTER_SCRIPT; cleanup reorder public/slot/private use std::count_if formatting better debug output; cleanup fix msvc compiler warning cleanup eradicate QtScript references from API Example updated header comments Updated KasenAPIExample	2019-07-14 21:35:13 -04:00
SamGondelman	60600779c9	merge with master	2019-07-12 11:01:17 -07:00
David Rowe	2cb3425740	Merge branch 'master' into DOC-102	2019-07-11 16:38:23 +12:00
David Rowe	a45d8924fa	Miscellaneous minor JSDoc fixes noticed in passing	2019-07-11 16:31:09 +12:00
SamGondelman	72f52b069e	cleanup, fix shadow qml	2019-07-03 16:21:47 -07:00
Sam Gondelman	0d9f639331	Merge branch 'master' into bias	2019-07-03 10:20:16 -07:00
SamGondelman	692c776be5	expose shadow bias and max distance wip	2019-07-02 15:18:28 -07:00
SamGondelman	fa416adaf6	adding unlit property to text, fixing transparency, normals, other cleanup	2019-07-02 10:28:36 -07:00
David Rowe	2d6d3eb4fe	Doc review	2019-06-28 17:05:36 +12:00
SamGondelman	9c1b139d5f	merge with master	2019-06-25 23:46:39 -07:00
Andrew Meadows	20376c9542	Merge pull request #15823 from ctrlaltdavid/DOC-79 ... DOC-79: Entities JSDoc Update	2019-06-25 14:18:13 -07:00
Brad Davis	aefa43bd11	Prevent duplicates from accumulating in EntityTree::_needsParentFixup	2019-06-24 13:02:28 -07:00
Sam Gondelman	e4847cc4ae	Merge branch 'master' into proceduralMesh	2019-06-24 10:16:45 -07:00
David Rowe	4c8f281383	Typos etc.	2019-06-22 14:16:17 +12:00
David Rowe	eb227c6b9a	Document Entities entity methods	2019-06-22 11:59:07 +12:00
David Rowe	e3f971a304	Update Entities examples to have a delay after creation before editing	2019-06-22 09:23:07 +12:00
David Rowe	3c53cb2e90	Add missing grabDelegetToParent property to JSDoc	2019-06-21 15:21:16 +12:00
David Rowe	52860adc1c	Add callEntityMethod() and similar examples	2019-06-21 14:27:51 +12:00
David Rowe	a858314898	Remainder of Entities signals' JSDoc	2019-06-21 11:25:10 +12:00
David Rowe	0945bdaac7	Remainder of Entities methods' JSDoc	2019-06-20 15:11:01 +12:00
David Rowe	72fdbc0aa8	Entity information and manipulation	2019-06-19 10:18:48 +12:00
David Rowe	23785b5406	Regularize links to individual entity types	2019-06-15 14:06:49 +12:00
David Rowe	9c752c9964	Fix up descriptions in EntityType table	2019-06-15 11:07:40 +12:00
David Rowe	b16086de74	Revise JSDoc for key Entities methods plus entity properties	2019-06-15 10:44:56 +12:00
Andrew Meadows	eee52deefe	destroy WebSurfaces on shutdown	2019-06-12 16:07:15 -07:00
SamGondelman	37feb7f027	merge with master	2019-06-10 10:29:39 -07:00
SamGondelman	129d96a997	get rid of lightmapMap	2019-06-07 14:53:31 -07:00
David Rowe	6299d38673	Distinguish between Uuid API and Uuid type in JSDoc	2019-06-05 14:39:05 +12:00
Seth Alves	8a32d230a8	avoid div by zero	2019-06-04 13:00:26 -07:00
Sam Gondelman	16a56dc1ec	Merge branch 'master' into proceduralMesh	2019-06-04 09:56:25 -07:00
SamGondelman	f4a7b27042	cleaning up name lookups	2019-05-31 12:04:54 -07:00
Andrew Meadows	bfe809f3f7	local entities should not be in physics	2019-05-29 20:19:12 -07:00
Sam Gondelman	3d05a954bc	Merge branch 'master' into proceduralMesh	2019-05-23 09:35:14 -07:00
David Rowe	ca7ddece8b	Add missing Script JSDoc	2019-05-21 10:32:12 +12:00
SamGondelman	6d3e23a7fe	merge with master	2019-05-16 20:03:10 -07:00
SamGondelman	283cc18269	Merge remote-tracking branch 'upstream/master' into proceduralMesh	2019-05-16 16:33:16 -07:00
SamGondelman	da254c2ccc	(¬‿¬)	2019-05-15 23:48:04 -07:00
Sabrina Shanman	fbe947c8ac	Merge pull request #15558 from AndrewMeadows/fix-crash-bugz178 ... BUGZ-178: avoid crash for RenderableModelEntityItem with invalid model	2019-05-14 13:07:40 -07:00
Shannon Romano	c677f71650	Merge pull request #15514 from zfox23/privateUserData ... New Entity Property: Private User Data	2019-05-14 10:24:39 -07:00
Andrew Meadows	5a257eb137	avoid crash for RenderableModelEntityItem with invalid model	2019-05-14 09:48:06 -07:00
Seth Alves	8b2d12e2f7	when an avatar entity is deleted, also delete its descendants	2019-05-13 17:33:10 -07:00
jennaingersoll	4c6c0acc56	Merge pull request #15454 from ctrlaltdavid/M22246 ... Case 22246: Picks, PickType, RayPick JSDoc update	2019-05-13 16:16:17 -07:00
Zach Fox	2ce9e9ee10	The right way to restrict private user data:	2019-05-13 16:07:29 -07:00