809 commits

Author	SHA1	Message	Date
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
John Conklin II	2cd9e565b0	Merge pull request #14101 from dback2/editHandlePickPlaneImprovements ... Edit handle pick plane improvements	2018-10-02 10:42:46 -07:00
Seth Alves	834699fa12	Move grab pseudo-properties (userData) into first-class EntityItemProperties.	2018-10-02 08:54:12 -07:00
John Conklin II	9cbd819a39	Merge pull request #13965 from ctrlaltdavid/M17428-f ... Mini tablet in palm	2018-10-01 16:56:36 -07:00
David Back	b5edf42fd0	Merge branch 'master' into editHandlePickPlaneImprovements	2018-10-01 16:36:30 -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
Brad Hefta-Gaub	ef063a4072	Merge pull request #14026 from huffman/fix/edit-rotation ... Fix edit rotation handle fidgeting	2018-10-01 16:15:32 -07:00
David Rowe	8464a70c9e	Fix initial tablet scale	2018-09-29 12:42:41 +12:00
Ryan Huffman	feb230b3bd	Remove old comment in entitySelectionTool.js	2018-09-28 16:17:52 -07:00
David Back	8c306b8428	disable debug pick plane	2018-09-27 16:04:18 -07:00
David Back	f5d9dd82d9	better pick plane for stretch, camera-facing pick plane for scale, debug pick plane, overall cleanup	2018-09-27 16:01:20 -07:00
John Conklin II	55848e6959	Merge pull request #14008 from sethalves/fix-local-angular-velocity ... fix bug that caused localAngularVelocity to get zeroed out	2018-09-24 14:32:57 -07:00
Thijs Wenker	d1f35c8c54	update the entityList update with newly added Entities.getMultipleEntities function	2018-09-20 22:48:56 +02:00
Ryan Huffman	8805ce49e3	Remove verbose logging of keyboard messages in edit.js and gridTool.js	2018-09-19 15:06:58 -07:00
Ryan Huffman	431daecd8e	Fix shifting of yaw rotation handle	2018-09-19 14:33:51 -07:00
Seth Alves	f86075b2dd	Revert "Fix for angularVelocity zeroing out on duplication or undo" ... This reverts commit 9c96a10f6c.	2018-09-15 09:21:12 -07:00
David Back	7768e08510	rename func	2018-09-12 16:06:14 -07:00
David Back	1b8e9ed906	get controller position from avatar frame	2018-09-12 16:02:43 -07:00
David Back	55a4c55f78	remove unused and rename var	2018-09-12 14:48:27 -07:00
David Back	3da442a8f9	allow highlights in hmd, fix center scale hmd math	2018-09-12 14:44:04 -07:00
David Back	cf1c1296a7	fix center scale cube in hmd	2018-09-12 11:44:26 -07:00
Ryan Huffman	530fa5aee9	Merge pull request #13865 from dback2/editHandleScaleImprovements ... Edit handle scale improvements	2018-09-11 12:57:47 -07:00
Ryan Huffman	4b8f5ea6b9	Fix syntax and duplicate event handlers in entityList.js	2018-09-10 16:44:13 -07:00
unknown	1ad3a09984	CR changes	2018-09-10 16:09:21 -07:00
Ryan Huffman	5aa5552727	Fix PROFILE not forwarding calls when disabled	2018-09-10 14:07:25 -07:00
Ryan Huffman	3cc90d3c80	Disable profiling in entityList.js	2018-09-07 12:07:19 -07:00
David Back	3d75d4726a	scale invertly once passing minimum	2018-09-06 16:04:59 -07:00
David Back	6ac38190c1	tweak scaling multiple	2018-09-06 12:23:38 -07:00
David Back	92ff522862	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleScaleImprovements	2018-09-06 11:54:05 -07:00
Ryan Huffman	739530cb85	Limit Entity List to only getting the properties it needs	2018-09-05 14:30:36 -07:00
Ryan Huffman	a9a5bf1e97	Replace entity list UI with custom, brute-force solution	2018-09-05 14:30:19 -07:00
Ryan Huffman	f6ac755bae	Add profiling to edit.js fof the entity list	2018-09-05 14:30:19 -07:00
Ryan Huffman	133ac0662a	Move entity list qml to scripts dir	2018-09-05 14:30:19 -07:00
Seth Alves	52bbb4d2ab	fix ray-pick results on entities with non-default registration point. clean up grab scripts to correctly use this fix.	2018-08-27 16:21:01 -07:00
David Back	30c6975198	maintain stretch cube position vs mouse when stretching	2018-08-24 11:53:03 -07:00
David Back	8eddb36c82	resize scale cube	2018-08-22 17:29:40 -07:00
David Back	8c422cb0eb	change corner cubes to center cube, replace spheres with cubes	2018-08-22 16:54:59 -07:00
Ryan Huffman	24af22a52f	Fix edit orbit camera getting stuck zooming	2018-08-15 13:56:44 -07:00
Seth Alves	3623590e90	Merge pull request #13784 from sethalves/far-point-joints ... Far point joints	2018-08-14 15:40:07 -07:00
John Conklin II	8c5344ad1a	Merge pull request #13781 from thoys/fix/localAngularVelocityZeroesOut ... MS17380: Create App fix for angularVelocity zeroing out on duplication or undo	2018-08-14 11:37:33 -07:00
Seth Alves	527b27da96	pseudo-joints for far-grab positions	2018-08-14 08:55:20 -07:00
John Conklin II	73ef2ff09c	Merge pull request #13804 from thoys/fix/create/cantMoveFocusCameraOutPastLowLimit ... MS17291: Create-app increase focus distance limit	2018-08-13 14:58:17 -07:00
Thijs Wenker	f26188d5b8	added comment for limit choice	2018-08-11 01:54:13 +02:00
Thijs Wenker	876079bb81	deactivate Create App when desktop windows are closed	2018-08-11 00:41:50 +02:00
Ryan Huffman	c0ac76bf4a	Merge pull request #13797 from dback2/rotationRingSize ... Edit handle rotation ring size	2018-08-10 13:53:10 -07:00
John Conklin II	de0cdf6d8d	Merge pull request #13793 from wayne-chen/fixWebTabletJSBug ... Fixing web tablet JavaScript error	2018-08-10 09:31:17 -07:00
Thijs Wenker	925cfc9b23	Set a max focus distance value of 14km to not lose the edit handles by far-clipping	2018-08-10 16:45:27 +02:00
David Back	e36e9aa68f	tweak rotation ring size	2018-08-09 13:35:55 -07:00
Wayne Chen	2a6ff90a2c	fixing web tablet error	2018-08-09 11:30:10 -07:00
David Back	a6d944e034	use alpha 1 for edit handles	2018-08-09 10:32:34 -07:00
John Conklin II	34697b6b07	Merge pull request #13770 from huffman/fix/edit-duplicate-fix ... Fix duplicating multiple entities causing infinite looping	2018-08-09 09:07:37 -07:00
Anthony Thibault	90b0bd333f	Merge pull request #13774 from danteruiz/revert-tablet-material-entity ... Revert to using overlays instead of material entities for button highlighting.	2018-08-08 17:33:26 -07:00
David Back	3c5c5d8552	Merge pull request #13750 from dback2/editLogSpamFix ... Fix edit log spam with -1 hand	2018-08-07 13:51:39 -07:00
Dante Ruiz	269afb9a49	remove tablet material entities code remove create	2018-08-07 11:19:22 -07:00
Dante Ruiz	8c5eefcc95	some file and code cleanup	2018-08-07 10:58:45 -07:00