505 commits

Author	SHA1	Message	Date
Seth Alves	c5aafd4644	fix spatialKey conversion	2018-10-25 07:47:16 -07:00
Seth Alves	387a8ce933	fix QJsonArray handling	2018-10-25 07:47:15 -07:00
Seth Alves	252e504ab9	attempt to keep userData and new grab properties in sync	2018-10-25 07:47:15 -07:00
Andrew Meadows	6558d539e4	adjust simulation bid priority by props changed	2018-10-18 10:33:02 -07:00
Andrew Meadows	9bfa4a5267	remove unhelpful/wrong TODO comment	2018-10-18 10:33:02 -07:00
Andrew Meadows	1a685d2409	set script-triggerd sim ownership priority correctly	2018-10-18 10:33:02 -07:00
Andrew Meadows	ce81ab1f9d	don't edit restricted properties unless sim ownership possible	2018-10-18 10:33:02 -07:00
Andrew Meadows	0b34524ba0	minimimze time holding locks on tree in editEntity()	2018-10-18 10:31:27 -07:00
Andrew Meadows	21654ba77c	cleanup access to sessionID	2018-10-18 10:31:27 -07:00
Andrew Meadows	f63610af2b	namechange: TerseUpdate --> TransformAndVelocities	2018-10-18 10:31:27 -07:00
Sam Gondelman	67662df760	Merge branch 'master' into scriptvec3	2018-10-08 12:59:34 -07:00
John Conklin II	afe6d97b00	Merge pull request #14100 from danteruiz/soft-entities-updates ... update soft entities and fix deadlock from qml.	2018-10-04 13:33:34 -07:00
Sam Gondelman	5b6e7b2566	Merge branch 'master' into scriptvec3	2018-10-02 08:58:04 -07:00
Brad Hefta-Gaub	edd5db7768	Merge pull request #14042 from thoys/perf/create/getMultipleEntities ... Speed up Entity List properties fetching by adding Entities.getMultipleEntities API	2018-10-01 16:16:48 -07:00
Dante Ruiz	c1c853790b	update soft entities and fix deadlock	2018-09-27 14:53:28 -07:00
Thijs Wenker	80beb6c444	addressed CR feedback	2018-09-25 22:43:58 +02:00
Thijs Wenker	06491ef12f	API function for retrieving multiple entity properties with better performance	2018-09-20 19:34:00 +02:00
Seth Alves	1a44054c49	attempt fix for fb-17131	2018-09-15 09:15:43 -07:00
SamGondelman	9b75c7e07f	trying to separate colors and vectors	2018-09-04 17:20:05 -07:00
Sam Gondelman	6730635931	Merge branch 'master' into scriptvec3	2018-08-27 10:43:52 -07:00
SamGondelman	283c0c0311	s i m p l i f y	2018-08-23 11:47:56 -07:00
Stephen Birarda	e33f349d53	fix flagging for avatar entity update/delete	2018-08-21 10:32:05 -07:00
Sam Gondelman	f0986a7f5a	Merge branch 'master' into scriptvec3	2018-08-20 10:56:45 -07:00
John Conklin II	1edf1b4337	Merge pull request #13555 from SamGondelman/destroy ... Trying to fix dependency shutdown	2018-08-16 13:14:58 -07:00
David Back	8db0711b5b	set grabbable user data in addModelEntity, pass grabbable from asset browser	2018-08-08 16:33:47 -07:00
SamGondelman	1ba28de5b6	try to fix nodelist not getting destroyed	2018-08-01 17:52:27 -07:00
SamGondelman	2ca217eb4a	merge with master	2018-07-30 17:43:15 -07:00
SamGondelman	318ef907b8	parabola/polyvox, fixing some bugs	2018-07-24 10:08:35 -07:00
SamGondelman	956c1511b6	Merge remote-tracking branch 'upstream/master' into parabolic	2018-07-19 15:23:25 -07:00
SamGondelman	9929529f30	vec3 conversion	2018-07-11 14:18:22 -07:00
SamGondelman	90091d11e4	parabola picks, started implementing math	2018-07-03 09:47:31 -07:00
Wayne Chen	9e3626cca3	returning false if there is no entity to connect to	2018-06-29 14:42:33 -07:00
Sam Gondelman	850e2d5cf5	Merge branch 'master' into particleFix	2018-06-21 17:32:24 -07:00
SamGondelman	8f411ad6c8	CR	2018-06-20 16:13:10 -07:00
Andrew Meadows	4329ea5240	Merge master' into 'workload'	2018-06-04 16:11:25 -07:00
John Conklin II	ec3f9549f1	Merge pull request #13172 from wayne-chen/getChildrenIDs-issue-1934 ... Fix EntityScriptingInterface::getChildrenIDs function	2018-05-31 14:27:25 -07:00
Andrew Meadows	d50da2babc	Merge 'master' into 'workload'	2018-05-23 14:51:05 -07:00
Liv Erickson	56493346c1	fix permissions check	2018-05-22 15:41:48 -07:00
Thijs Wenker	7f4e9a0089	style	2018-05-21 06:17:08 +02:00
Thijs Wenker	f4df75d016	CR feedback	2018-05-21 06:04:05 +02:00
Livi Erickson	70bbac5c83	update with lastEditedCheck	2018-05-20 18:49:41 -07:00
Liv Erickson	29b11b9101	some fixes to server cloneables	2018-05-18 17:12:41 -07:00
Andrew Meadows	00e360aff0	reduce sim ownership priority when releasing grab	2018-05-17 17:25:07 -07:00
David Back	4e14eb37e3	update comment	2018-05-17 16:34:19 -07:00
David Back	30855f94eb	set last edited to 0 to ensure server update	2018-05-17 16:02:58 -07:00
David Back	f74e219029	rename properties, add clone avatar entity, remove worldEntityProps arg, fix clone ID cleanup on delete	2018-05-15 17:24:14 -07:00
Wayne Chen	f82e597ac7	Updating documentation for getChildrenIDs + fixing issue #1934	2018-05-15 09:34:07 -07:00
Wayne Chen	bd6905b3d2	Adding possible solution to issue#1934.	2018-05-14 18:25:39 -07:00
David Back	a57c280813	convertToCloneProperties	2018-05-11 17:54:08 -07:00
David Back	dea588ae4a	remove prints	2018-05-09 18:12:04 -07:00