4085 commits

Author	SHA1	Message	Date
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
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