763 commits

Author	SHA1	Message	Date
Jeff Clinton	3776472550	Merge pull request #14731 from AndrewMeadows/fix-mexico-hats ... cases 20709 and 20715: wear and see mexico hats	2019-01-22 12:58:56 -08:00
Seth Alves	c8e9bff03a	fix releaseGrab call on grabbed entity when a nearGrab ends	2019-01-17 13:34:36 -08:00
Seth Alves	b1c34eb9ec	update queryAACube during grab rather than only when grab is released	2019-01-15 16:01:44 -08:00
Seth Alves	b5326936d8	grab.js will now ignore click-to-equip entities	2019-01-15 14:17:51 -08:00
David Back	eff9d11437	Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit	2019-01-04 11:07:28 -08:00
Seth Alves	306c54c060	fix code that allows adjusting of own avatar entities while forbidding adjusting those of others	2019-01-03 08:17:52 -08:00
Seth Alves	bf46960dc3	fix timing on startNearGrab entity-method call for cloned entities. Don't allow grabbing of other's equipped or worn entities	2019-01-03 08:17:52 -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
Seth Alves	613f290226	don't attempt to grab other's avatar-entities	2019-01-03 08:17:52 -08:00
Seth Alves	895e8cdba1	fix off-hand adjustment of equipped entities. make traits-based grabbing be enabled by default, again	2019-01-03 08:17:52 -08:00
Seth Alves	78aff6e95c	grab js api; send grab information through trait system	2019-01-03 08:17:52 -08:00
unknown	f8f13e974d	property range audit - add range info via macros accessible via API, tweak min/max/steps in entityProperties	2019-01-02 11:12:10 -08:00
Sam Gondelman	e890fc6980	Merge branch 'master' into NOverlays3	2018-12-19 11:37:10 -08:00
Jeff Clinton	5a81d8c093	Merge pull request #14453 from danteruiz/keyboard-menus ... Keyboard interaction menus	2018-12-12 17:53:59 -08:00
Dante Ruiz	f3fad52e1d	make CR changes	2018-12-12 13:29:32 -08:00
Brad Hefta-Gaub	1e9faa7754	Merge pull request #14276 from ctrlaltdavid/M19345 ... Make create apps not grab tablet if editing an entity with hand	2018-12-09 17:21:10 -08:00
Sam Gondelman	4c5ff0dc3e	Merge branch 'master' into NOverlays3	2018-12-07 14:26:59 -08:00
Ryan Huffman	bf844e0472	Add hiding of certified properties in Create	2018-12-07 11:05:52 -08:00
Sam Gondelman	2291c7e5fb	Merge branch 'master' into NOverlays3	2018-12-06 12:37:18 -08:00
Sam Gondelman	b690faeb12	Merge branch 'master' into NOverlays	2018-12-06 11:29:06 -08:00
Sam Gondelman	d30dd4c26c	Merge branch 'master' into NOverlays3	2018-12-06 11:23:50 -08:00
SamGondelman	3ce6f7f3d6	real image entities	2018-12-03 11:50:59 -08:00
David Rowe	f1dad3c465	Add hystersis between near parent grabbing and tearing away	2018-11-24 08:35:02 +13:00
David Rowe	5e51ba051a	Improve code responsibilities	2018-11-22 11:12:22 +13:00
David Rowe	44efd18882	Make Create and Shapes lasers ignore tablet while editing	2018-11-21 08:38:30 +13:00
David Rowe	eb8c6c8974	Merge branch 'master' into M19345	2018-11-19 09:47:05 +13:00
Thijs Wenker	e89346c146	making rename functionality list refresh proof	2018-11-16 22:10:14 +01:00
David Rowe	b24c482743	Terminate Create far grab etc. upon laser intersecting tablet	2018-11-16 16:29:57 +13:00
David Rowe	f2868fec3f	Merge branch 'master' into M19345	2018-11-16 09:11:11 +13:00
SamGondelman	079d1dcbd6	convert clientOnly to entityHost and add local entities	2018-11-14 11:25:37 -08:00
Thijs Wenker	afd69d04dd	Make ctrl+shift shortcuts work for create app	2018-11-14 01:05:37 +01:00
Thijs Wenker	e890228fc7	Make shortcuts work in edit windows	2018-11-14 01:05:36 +01:00
Howard Stearns	66ae01e0c3	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-12 12:55:20 -08:00
Thijs Wenker	99fcef105f	spaceMode / desiredSpaceMode explanation	2018-11-09 17:59:00 +01:00
Thijs Wenker	e483b1342c	CR fixes	2018-11-09 01:56:17 +01:00
Thijs Wenker	9005efb639	style fixes	2018-11-09 01:30:05 +01:00
Thijs Wenker	08da8c4190	createApp - world/local switch	2018-11-09 01:28:37 +01:00
Zach Fox	e80468e423	Remove URL logging from JS and QML	2018-11-06 15:09:24 -08:00
David Rowe	0eead13fb9	Make Create not grab tablet if editing an entity with hand	2018-10-25 15:03:47 +13:00
Ryan Huffman	6221b9ee59	Merge pull request #14149 from thoys/feat/create/entityList-autoScroll ... MS19054: [CreateApp/EntityList] auto scroll	2018-10-24 10:36:21 -07:00
Thijs Wenker	776b8b8fc7	CR and style fixes	2018-10-24 17:58:06 +02:00
Thijs Wenker	27e0c85b01	entity list auto scroll	2018-10-24 17:58:06 +02:00
Thijs Wenker	4e9f9b3edf	comply with copy/paste update	2018-10-23 22:42:56 +02:00
Thijs Wenker	3fa4ee0e1d	enable duplicate copy cut paste functionality of context menu	2018-10-23 22:42:55 +02:00
Thijs Wenker	4c3f5b3bbc	Entity List Context Menu	2018-10-23 22:42:54 +02:00
Ryan Huffman	573df2d922	Move copy/paste/cut to SelectionManager	2018-10-22 13:56:08 -07:00
Ryan Huffman	e0851c4807	Add cut to Create, and update shortcuts	2018-10-22 13:56:08 -07:00
Wayne Chen	fd3c0d2f76	pushing with new fix	2018-10-17 15:03:09 -07:00
Brad Hefta-Gaub	0e0542ec6e	Merge pull request #13890 from sethalves/grab-properties-1 ... move grab pseudo-properties (userData) into first-class EntityItemProperties	2018-10-17 13:29:20 -07:00
Howard Stearns	a92aa1f9da	new treatment for hmd/tablet login	2018-10-12 14:17:23 -07:00