731 commits

Author	SHA1	Message	Date
Andrew Meadows	580b6a3b2c	small optimization: check before lock	2019-09-06 17:23:38 -07:00
Brad Davis	aefa43bd11	Prevent duplicates from accumulating in EntityTree::_needsParentFixup	2019-06-24 13:02:28 -07:00
Seth Alves	8a32d230a8	avoid div by zero	2019-06-04 13:00:26 -07:00
Zach Fox	e87381f431	Merge branch 'master' of github.com:highfidelity/hifi into privateUserData	2019-05-13 14:13:34 -07:00
Zach Fox	55138ed088	CR feedback	2019-05-13 14:12:51 -07:00
Andrew Meadows	915cbb69df	split work out of EntityTree::update(), call it preUpdate()	2019-05-06 17:37:35 -07:00
Andrew Meadows	514d598797	remove unhelpful profiling with wrong category	2019-05-06 17:35:57 -07:00
Zach Fox	d53b528994	Some fixes - i don't think this code is complete	2019-05-06 13:38:09 -07:00
Zach Fox	a68da2bca7	Finish out the feature, i think	2019-05-06 11:08:23 -07:00
Zach Fox	fb77928652	Private user data is accessible to all right now	2019-05-01 15:29:04 -07:00
Roxanne Skelly	029eab73cb	Lambda capture was referencing something on the local stack ... which may go out of scope when lambda was called.	2019-04-04 16:00:15 -07:00
Howard Stearns	489fadda6e	and now it's a list that cleans up after itself	2019-03-27 14:58:58 -07:00
Howard Stearns	f6ee77a6ae	an entity list of one	2019-03-27 12:23:02 -07:00
Howard Stearns	71111936a2	prep for entity lists	2019-03-27 11:42:16 -07:00
Howard Stearns	57da21cec2	more about challenges use entity id as id, not cert id	2019-03-26 17:12:28 -07:00
Howard Stearns	c9b79b24e3	track nonces by entity id instead of by cert	2019-03-26 15:23:13 -07:00
Howard Stearns	be74218d93	eliminate copy of hash table	2019-03-26 12:05:10 -07:00
Howard Stearns	91a165b4c3	separate out the certified entity map stuff (no-op refactor)	2019-03-26 11:49:08 -07:00
Howard Stearns	02129e0543	no-op refactor in prep for multiple entities per cert	2019-03-25 16:14:48 -07:00
SamGondelman	d4e1ec9741	fix emitScriptEvent	2019-03-15 16:20:01 -07:00
Roxanne Skelly	e94d248ac5	Merge pull request #15126 from howard-stearns/domainUnlimited ... unlimited certified copies in a domain	2019-03-08 10:23:42 -08:00
Howard Stearns	d309995aef	spell domainUnlimited right, and track challenges so that we don't reap	2019-03-07 14:48:57 -08:00
Howard Stearns	97bfa538ff	unlimited certified copies in a domain	2019-03-07 09:51:20 -08:00
Sam Gondelman	dc4e2645da	even better!	2019-03-07 08:05:32 -08:00
SamGondelman	380df059ff	fix shapes app	2019-03-06 18:18:39 -08:00
Shannon Romano	4f3d593d90	Merge pull request #15072 from SamGondelman/clear ... Case 11775: Don't clear my avatar entities on domain switch	2019-03-05 15:42:51 -08:00
SamGondelman	f2c248c0a2	disable href and entity script events when in edit mode	2019-03-04 17:10:20 -08:00
SamGondelman	3e6061e435	try to not clear my avatar entities on domain switch	2019-03-01 13:45:00 -08:00
Andrew Meadows	8a7853a701	remove crufty comment	2019-02-28 14:38:13 -08:00
Andrew Meadows	33d6e2ce3b	avoid mem-leaked entities when clearing tree	2019-02-28 14:21:35 -08:00
SamGondelman	25b31cfc72	merge with master	2019-02-15 11:08:24 -08:00
SamGondelman	bed2732d34	start moving materials to rendering only	2019-02-14 12:59:16 -08:00
SamGondelman	4b406bf41c	fix getEntityObject and tablet highlighting (Overlays.findOverlays)	2019-02-01 16:23:06 -08:00
SamGondelman	0bfcde67ea	remove overlays from application.cpp	2019-01-24 14:11:24 -08:00
SamGondelman	5d19666f60	merge with master	2019-01-23 17:58:56 -08:00
SamGondelman	9a734b2011	merge with master	2019-01-23 17:48:24 -08:00
Andrew Meadows	9a854291af	supress spurious not important AvatarEntity updates	2019-01-18 15:36:38 -08:00
Shannon Romano	11b8ae6d44	Merge pull request #14710 from sethalves/mouse-grab-with-traits ... case 15962: case 20481: Mouse grab with traits	2019-01-18 11:56:41 -08:00
Seth Alves	b1c34eb9ec	update queryAACube during grab rather than only when grab is released	2019-01-15 16:01:44 -08:00
Dante Ruiz	4ab7308669	addressing code review requests	2019-01-14 14:04:01 -08:00
Dante Ruiz	e7d3844620	making pre review requests	2019-01-14 11:14:57 -08:00
Dante Ruiz	8252481ce7	Delete domain entities only	2019-01-11 16:00:10 -08:00
Andrew Meadows	0098dedcbb	don't update server for AvatarEntity queryAACube	2019-01-09 18:25:12 -08:00
Andrew Meadows	0083c77280	add EntityTypes::extractEntityTypeAndID(), remove one spaghetti	2019-01-09 17:27:14 -08:00
Andrew Meadows	e4cc3fa976	minor cleanup	2019-01-09 17:27:14 -08:00
Andrew Meadows	d1927340f5	remove redundant addToNeedsParentFixupList()	2019-01-09 17:27:14 -08:00
SamGondelman	45ec7fe3e1	working on ignorePickIntersection and web entities	2019-01-09 12:03:35 -08:00
SamGondelman	791257bd0a	convert old created to quint	2019-01-07 14:17:01 -08:00
SamGondelman	b5b7574c48	set created	2019-01-04 16:52:11 -08:00
Seth Alves	54a5805b5c	add final edit when dropping an avatar-entity. don't allow grabbing of other's avatar entities	2019-01-03 08:17:52 -08:00