4171 commits

Author	SHA1	Message	Date
HifiExperiments	6eacc5c8c2	Merge remote-tracking branch 'upstream/kasen/core' into zoneOcclusion	2020-04-03 14:37:14 -07:00
HifiExperiments	c062cb75ae	Merge remote-tracking branch 'upstream/kasen/core' into blendshapes	2020-04-03 14:35:21 -07:00
Kasen IO	e101535106	Add link to top of Entites API docs for the list of entity types.	2020-03-18 14:58:32 -04:00
kasenvr	48ae156db7	Merge pull request #104 from daleglass/implicit_copy_constructor ... Make default copy constructors explicit	2020-02-08 14:45:44 -05:00
Kasen IO	08ec9ef3b7	Various URL updates + window title update.	2020-02-05 15:25:51 -05:00
David Rowe	b816d7053a	Update models used in JSDoc examples	2020-01-20 21:07:33 +13:00
Dale Glass	68d10a2fe1	Make default copy constructors explicit ... Recent versions of gcc generate a warning without this	2020-01-19 00:20:49 +01:00
Marcus Llewellyn	f5fcb90cac	Revert "Removed obsolete default scripts + more branding changes."	2020-01-16 18:51:49 -06:00
Marcus Llewellyn	e5dd23b922	Merge pull request #33 from kasenvr/feature/metaverse-url-switching ... Ability to change Metaverse API from setting	2020-01-14 18:40:04 -06:00
HifiExperiments	c45ee33e97	review comment	2020-01-13 17:44:32 -08:00
Kasen IO	336b5e275b	Removed obsolete default scripts + more branding changes.	2020-01-12 23:13:01 -05:00
HifiExperiments	bc319cb340	zone occlusion	2020-01-11 22:29:07 -08:00
HifiExperiments	b40a468b4c	fix EOF	2020-01-06 18:31:35 -08:00
HifiExperiments	ef8f085b47	support blendshapes on model entities	2020-01-05 02:37:44 -08:00
Kasen IO	c34cd996df	change Metaverse API from setting	2019-12-20 11:39:05 +01:00
David Rowe	8255a50cde	Update MeshProxy and Entities.getMeshes() JSDoc	2019-12-20 13:34:21 +13:00
Brad Hefta-Gaub	fb70569fc2	Merge pull request #16548 from HifiExperiments/visible ... Case 17368: Fix wearables not disappearing with avatar	2019-12-13 13:20:15 -08:00
Brad Hefta-Gaub	f8a9789f86	Merge pull request #16499 from HifiExperiments/proceduralMesh ... Procedural vertex shaders	2019-12-13 13:00:01 -08:00
Brad Hefta-Gaub	2d56d7c026	Merge pull request #16551 from ctrlaltdavid/DEV-1943 ... DEV-1943: Make MyAvatar.getAvatarEntityData() return all properties	2019-12-13 10:53:24 -08:00
Kasen IO	1f01beba70	Fixed patch issues	2019-12-13 12:29:08 -05:00
Kasen IO	9839b23061	Made Sam's graphics patches work with 86 K2.	2019-12-13 02:38:14 -05:00
HifiExperiments	0bd5e15b47	fix non-procedural material entity crash ... Signed-off-by: Kasen IO <kasenvr@gmail.com>	2019-12-13 02:17:52 -05:00
SamGondelman	1736252f0d	trying and failing to fix models	2019-12-12 23:04:47 -05:00
HifiExperiments	6e961b9f2f	procedural vertex shaders ... Signed-off-by: Kasen IO <kasenvr@gmail.com>	2019-12-12 22:49:48 -05:00
HifiExperiments	2eb0ec18fc	fix non-procedural material entity crash	2019-12-11 00:42:59 -08:00
David Rowe	65bba26dfb	EntityScriptServerLog API	2019-12-11 19:22:28 +13:00
David Rowe	c7f82a8264	Add new MyAvatar.getAvatarEntityData() implementation for API	2019-11-28 17:10:19 +13:00
HifiExperiments	3dfd63d46b	merge with master	2019-11-26 20:42:44 -08:00
Simon Walton	6b371ec388	Changes to avatar mixer to use screenshare zones	2019-11-25 18:30:53 -08:00
Simon Walton	6e23924ed9	Add screenshare zone-property - WIP	2019-11-25 13:22:35 -08:00
Maia Hansen	6169936c2b	Merge pull request #16512 from AndrewMeadows/time-moves-forward ... DEV-2585: fix for whiteboard poly lines getting their parentID incorrectly reverted	2019-11-19 12:34:53 -08:00
Andrew Meadows	0bccc38906	remove one call to usecTimestampNow()	2019-11-19 08:52:14 -08:00
Andrew Meadows	3b8275c240	_lastEdited can only increase or be reset	2019-11-19 08:44:33 -08:00
Andrew Meadows	08263b2672	add helpful comment about mysterious code	2019-11-19 08:42:28 -08:00
Sabrina Shanman	518d6a530a	Merge pull request #16507 from highfidelity/master ... Merge master into instancing	2019-11-18 13:54:33 -08:00
Sam Gateau	6370059a96	Merge pull request #16483 from AndrewMeadows/debug-workload-selection ... Add tools for debugging entity workload proxies	2019-11-18 11:02:00 -08:00
HifiExperiments	b73a608094	procedural vertex shaders	2019-11-15 00:22:40 -08:00
Andrew Meadows	ec872bfcf8	remove unused variable	2019-11-14 09:59:43 -08:00
Andrew Meadows	b5ca93a019	remove redundant checks in 'if' clause	2019-11-14 09:59:43 -08:00
Andrew Meadows	b231dadba5	add check for local-entity when changing phys properties	2019-11-14 09:59:43 -08:00
Andrew Meadows	28f51f6204	add comments	2019-11-14 09:59:43 -08:00
Andrew Meadows	de44cdaf25	remove unnecessary check in if clause	2019-11-14 09:59:43 -08:00
Andrew Meadows	039f7cae13	avoid Qt container in another spot	2019-11-14 09:59:43 -08:00
Andrew Meadows	3546bab19a	use std::vector<> instead of QVector<>	2019-11-14 09:59:43 -08:00
Andrew Meadows	fb090d1388	force delete OtherAvatar entities when necessary	2019-11-14 09:59:43 -08:00
Andrew Meadows	4159bc4862	abide by domain-entity hierarchy deletion rules	2019-11-14 09:59:43 -08:00
Andrew Meadows	4e6a647718	don't restrict edit properties of myAvatarEntity	2019-11-14 09:59:43 -08:00
Andrew Meadows	9d92546a8b	revert the revert of PR-16307	2019-11-14 09:59:43 -08:00
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