6491 commits

Author	SHA1	Message	Date
SamGondelman	d988de4a17	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-11 10:27:12 -08:00
Brad Hefta-Gaub	8faff57033	Merge pull request #14830 from thoys/fix/create/zoneShapeVisualizersIgnorePickray ... MS20909: ignore pickRay for zone shape visualizers	2019-02-08 19:12:58 -08:00
John Conklin II	b46fb7cfe7	Merge pull request #14860 from thoys/fix/create/entityListUnderscoreFirstSorting ... Case 19385: local compare in entity list sorting	2019-02-08 14:56:32 -08:00
SamGondelman	e74ff18bef	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-07 09:49:27 -08:00
Sam Gateau	632d6e8a73	Merge pull request #14863 from danteruiz/android-apps-directories ... Case 20877: Support CMake time configuration of QmlFileSelectors	2019-02-07 09:30:49 -08:00
Dante Ruiz	f07b5c8490	update urls	2019-02-06 14:25:25 -08:00
danteruiz	d0fecac0d8	+android -> +android_interface	2019-02-06 11:37:52 -08:00
Thijs Wenker	2247dd3471	local compare in entity list sorting	2019-02-06 18:24:40 +01:00
Roxanne Skelly	78aa1783a0	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-02-04 15:04:55 -08:00
Roxanne Skelly	e23c589de7	QmlMarketplace - fix issue with footer not appearing in marketplaces list	2019-02-04 15:04:18 -08:00
Roxanne Skelly	39ad36a4d0	QmlMarketplace - bugfixes and Markup rendering of descriptions ... * Render markup in descriptions (bold, italic, quote, etc.) * Back button from marketplaces list now works properly * Layout fixes	2019-02-01 15:27:17 -08:00
SamGondelman	c6080d0795	fix edit selection + log problem	2019-02-01 14:37:42 -08:00
SamGondelman	ba8320f561	fix 2d overlay deletion	2019-02-01 14:31:26 -08:00
SamGondelman	b80d2a9b06	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-01 13:33:04 -08:00
Thijs Wenker	80f5cbc8ab	also ignore picking on the material entity	2019-01-31 22:14:15 +01:00
Thijs Wenker	ca4695377f	also ignore picking on the material entity	2019-01-31 22:12:35 +01:00
Thijs Wenker	15066faaf7	ignore pickRay for zone shape visualizers	2019-01-31 19:45:29 +01:00
Thijs Wenker	fbdae18245	ignore pickRay for zone shape visualizers	2019-01-31 19:38:20 +01:00
SamGondelman	7d47bfa2e4	david's comments	2019-01-30 11:50:32 -08:00
SamGondelman	834e44dd3a	make polyline's with faceCamera not depend on normal	2019-01-30 11:02:24 -08:00
Thijs Wenker	132d293c3c	skip child entities of mismatching entityHostType when copy/delete/duplication of entities	2019-01-30 03:15:32 +01:00
r3tk0n	1751864042	Fix this references in module run function.	2019-01-29 16:13:11 -08:00
Roxanne Skelly	0fdbca8ade	QmlMarketplace Bugfixes ... * Fix upgrades * Certificate 'View in Marketplace' wasn't working * command-line hifiapp:MARKET wasn't launching * Home link wasn't disappearing where it should * Log In button on marketplace wasn't working * Other minor UI bugfixes	2019-01-29 16:07:27 -08:00
r3tk0n	4d2ee07512	Change deactivation criteria as per conversation between Joshua and Mukul.	2019-01-29 12:02:23 -08:00
SamGondelman	9aae9d13f6	fix tablet home button	2019-01-28 22:19:31 -08:00
SamGondelman	a8dbe5e761	working on build errors	2019-01-28 21:10:24 -08:00
SamGondelman	6ad0b3412a	showKeyboardFocusHighlight + fixes	2019-01-28 20:43:47 -08:00
SamGondelman	0d1e4bed66	merge with master	2019-01-28 18:13:05 -08:00
SamGondelman	445608e163	fix entity selection tool	2019-01-28 15:30:19 -08:00
Roxanne Skelly	a4d105f24f	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-01-28 15:17:08 -08:00
Roxanne Skelly	2fe78383ed	QmlMarketplace - Fix issues found during test ... * command line --url hifiapp:MARKET was not bringing up correct marketplace * Search field was not being cleared when 'home' button was clicked after a search * tablet button was not lit when marketplace was launched	2019-01-28 15:14:49 -08:00
Shannon Romano	1aa6221f57	Merge pull request #14779 from thoys/fix/create/AddMissingMaterialTooltips ... MS20333: [CreateApp] add missing Material Entity tooltips	2019-01-28 14:18:46 -08:00
John Conklin II	c95b681092	Merge pull request #14696 from thoys/feat/create/showZonesInCreate ... MS20292 - [CreateApp] Make it easier to see zones while you're editing them	2019-01-28 11:41:42 -08:00
Jeff Clinton	9d09c777d2	Merge pull request #14778 from thoys/fix/create/ignoreScriptedKeyEventsFromJSONEditor ... MS20501 [CreateApp/Properties] ignore scripted key events from the JSON Editors	2019-01-28 11:40:48 -08:00
Thijs Wenker	b75c4ae3b6	fix spelling	2019-01-28 20:26:04 +01:00
Roxanne Skelly	d3cffa50d6	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-01-28 11:11:28 -08:00
Jeff Clinton	a80d842107	Merge pull request #14777 from thoys/fix/create/entityListColumnSortOrder ... MS19766: [CreateApp/Entity List] Default column order, always move empty values to bottom on initial sort of column	2019-01-28 09:25:33 -08:00
Thijs Wenker	bfb93e67b7	materialRepeat will clamp when disabled.	2019-01-28 16:46:35 +01:00
Thijs Wenker	ef1018c49b	- EntityShapeVisualizer.updateSelection -> EntityShapeVisualizer.setEntities (for a more generic use) ... - GridPattern -> Material - Replaced stringified compare with deep compare - Copied+modified zone icon (consistent color, removed sharp edges)	2019-01-28 16:10:29 +01:00
Thijs Wenker	c1eeab6542	Merge branch 'master' of github.com:highfidelity/hifi into feat/create/showZonesInCreate	2019-01-28 14:32:27 +01:00
Shannon Romano	f084021fdf	Merge pull request #14678 from hyperlogic/feature/hmd-avatar-alignment-type ... Added HMD Avatar Alignment Type	2019-01-25 17:32:41 -08:00
Roxanne Skelly	dfac0d88a2	QmlMarketplace - Add 'logged out' behavior, fix issue with search scope ... display	2019-01-25 16:41:13 -08:00
Roxanne Skelly	6123c4ec96	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-01-25 13:45:04 -08:00
Jeff Clinton	efb278b258	Merge pull request #14707 from thoys/fix/create/activeColorPickerDoesNotUpdateOnEntitySwitch ... fix for continuous color picker update loop	2019-01-25 10:38:14 -08:00
Thijs Wenker	e2dc86261e	add missing Material Entity tooltips	2019-01-25 05:16:04 +01:00
Thijs Wenker	992ce9f875	ignore scripted key events from the JSON Editors	2019-01-25 04:41:36 +01:00
Thijs Wenker	85e26e949b	fix issue where empty values are always on bottom on default ascending columns	2019-01-25 04:02:19 +01:00
Thijs Wenker	ae2e85d802	entity list, default column sort orders, when in default order always move empty values to bottom	2019-01-25 03:22:27 +01:00
Roxanne Skelly	cfaf01b22a	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-01-24 17:21:16 -08:00
Roxanne Skelly	c1ff51a02d	QML Marketplace ... Checkpoint full functionality	2019-01-24 17:20:42 -08:00
r3tk0n	80abfbab5e	Modify teleport to 'superpower' spec.	2019-01-24 14:22:01 -08:00
r3tk0n	690f67c9d9	Add variable for teleport deadzone on y-axis.	2019-01-24 14:21:18 -08:00
Anthony Thibault	a7a71e4286	Merge branch 'master' into feature/hmd-avatar-alignment-type	2019-01-23 15:52:20 -08:00
Thijs Wenker	b2f1657096	grid pattern	2019-01-23 19:28:34 +01:00
David Back	89032698eb	newline	2019-01-22 18:24:09 -08:00
David Back	ea5705907b	fix shape type and compound shape URL properties/tooltips	2019-01-22 18:22:13 -08:00
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
r3tk0n	d3c1843d45	Disable toggleAdvancedMovementForHandControllers.js until such time the Controller.Standard.RY binding can be fixed.	2019-01-21 15:40:12 -08:00
Roxanne Skelly	8010d86210	QML Marketplace support ... Support QML UI for the Marketplace as some devices do not handle web on 3d surfaces. Checkpoint code	2019-01-21 13:39:16 -08:00
Thijs Wenker	93516423bb	zone visualizer prototype	2019-01-21 17:25:06 +01: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	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
Seth Alves	e8676f63c6	release grab if scripts are reloaded before grab is released	2019-01-15 13:44:03 -08:00
Seth Alves	2515c7f73e	remove old-style grabbing scripts	2019-01-15 13:43:52 -08:00
Seth Alves	174c79d66d	use new-style far-grabbing code for mouse grabs	2019-01-15 13:43:51 -08:00
SamGondelman	68e15c6c07	fixes from 78	2019-01-14 13:36:21 -08:00
Thijs Wenker	6cabc86130	fix for continuous color picker update spam / only update color picker from properties when entity selection has changed	2019-01-14 18:54:28 +01:00
Anthony Thibault	5d606981de	Added HMD Avatar Alignment Type ... Adds a new API to set this type, and an option to the Avatar App. * "eye" - Match the user eyes with the avatar eyes. The previous default behavior. If the avatar skull is larger then the user, it can cause the avatars body to lift off of the ground when the user looks down. * "head" - Match the user head with the avatar head. The new default behavior. This prevents the body from lifting off of the ground while wearing a large headed avatar. But can cause an offset between the users eyes and the avatars eyes.	2019-01-08 18:35:28 -08:00
Thijs Wenker	24022f0ccc	add missing Text properties to Create App	2019-01-08 20:38:31 +01:00
John Conklin II	00a9367f14	Merge pull request #14662 from dback2/addGridEntitiesToCreate ... Add grid entities to create	2019-01-08 10:12:34 -08:00
Jamil Akram	4c6b14bf72	Merge pull request #14642 from dback2/propertyRangeAudit ... Entity property range/step audit	2019-01-08 09:42:59 -08:00
John Conklin II	ed4f2d9c10	Merge pull request #14439 from AndrewMeadows/shaped-zones ... Case 15518: shaped zones	2019-01-08 09:06:45 -08:00
David Back	d9e229d38e	remove add Grid entity button, fix color	2019-01-07 18:20:20 -08:00
David Back	90e2feb977	replace placeholder icon with real icon from Alan	2019-01-07 18:20:20 -08:00
David Back	7581c77be8	update tooltips, use Cube icon for now	2019-01-07 18:20:20 -08:00
David Back	e0e9a7de15	tabs	2019-01-07 18:20:20 -08:00
David Back	9013eee352	add grid entities to create - icons pending	2019-01-07 18:20:19 -08:00
David Back	3aa245036b	Merge branch 'master' into propertyRangeAudit	2019-01-07 15:36:18 -08:00
Thijs Wenker	7823b3d4a3	clarifying comments	2019-01-07 21:08:41 +01:00
Thijs Wenker	7d9cad3e8e	CreateApp - Fix active colorPicker to update on selection update	2019-01-07 20:35:09 +01:00
David Back	5aa5b997fe	remove logs	2019-01-07 11:33:08 -08:00
David Back	2f99729905	add rect case, fix step rounding	2019-01-07 11:31:04 -08:00
David Back	56007c8512	Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit	2019-01-07 10:50:45 -08:00
Shannon Romano	8acae02203	Merge pull request #14660 from thoys/feat/create/newFirstClassImageProperties ... MS20170: Update Image/Text Entity properties in Create with new properties	2019-01-07 10:45:15 -08:00
David Back	d25948fbd3	Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit	2019-01-07 10:36:27 -08:00
Thijs Wenker	26f46e87a3	new property tooltips	2019-01-05 02:16:12 +01:00
Thijs Wenker	48dc7ee938	New color/text entity properties	2019-01-05 01:56:28 +01:00
David Back	5ea84fb952	CR fixes	2019-01-04 15:39:27 -08:00
luiscuenca	d630fe9dbd	Add menu checkbox to toggle collisions with other avatars	2019-01-04 16:38:48 -07:00
Andrew Meadows	a642af23b7	enable shapeType=ellipsoid and expose zone shapeType to UI	2019-01-04 12:37:23 -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	b2f25629eb	don't allow scaling of others' equipped entities	2019-01-03 08:19:18 -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	9bf9e379a3	fix far-grab initial rotation and entity-method call	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	0967a94557	get grabbing and scaling to get along better	2019-01-03 08:17:52 -08:00
Seth Alves	905af34564	disable traits-based grabbing by default	2019-01-03 08:17:52 -08:00
Seth Alves	6a547d042c	port over PR-14276	2019-01-03 08:17:52 -08:00
Seth Alves	1c1e648b8b	port over PR-14429	2019-01-03 08:17:52 -08:00
Seth Alves	9900040ece	enable trait-based grabbing by default	2019-01-03 08:17:52 -08:00
Seth Alves	70b68294ff	port over PR-14464	2019-01-03 08:17:52 -08:00
Seth Alves	6f25c59a0c	turn-off nearEntityGrab when scaleEntity is active	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
David Back	937aa718ae	remove selected particle property defaults	2019-01-02 18:22:55 -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
Ryan Huffman	9c60b09c6b	Fix texture MB column not sorting correctly in entity list	2018-12-27 14:50:12 -08:00
Shannon Romano	21ec4e0c53	Merge pull request #14524 from SamGondelman/NOverlays3 ... Case 20132, Case 16928: First class Image Entities	2018-12-20 21:20:49 +00:00
Wayne Chen	c36b3a4b07	fix	2018-12-19 12:46:41 -08:00
Sam Gondelman	e890fc6980	Merge branch 'master' into NOverlays3	2018-12-19 11:37:10 -08:00
Wayne Chen	4116f6ca9a	Merge branch 'master' into loginInitiative2	2018-12-12 18:00:07 -08:00
Jeff Clinton	5a81d8c093	Merge pull request #14453 from danteruiz/keyboard-menus ... Keyboard interaction menus	2018-12-12 17:53:59 -08:00
Wayne Chen	0a0b7bf1ad	removing onUsernameChanged signal to alter login settings	2018-12-12 16:26:35 -08:00
Dante Ruiz	089a223c2d	more CR changes	2018-12-12 15:29:01 -08:00
Dante Ruiz	f3fad52e1d	make CR changes	2018-12-12 13:29:32 -08:00
Dante Ruiz	51bdf1bf78	adding keyboards settings	2018-12-12 11:55:13 -08:00
Wayne Chen	2f07a0eb5d	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-11 20:01:19 -08:00
Shannon Romano	efedc1f0b5	Merge pull request #14563 from danteruiz/teleport-settings ... Adding menu settings to disable teleporting	2018-12-11 21:08:23 +00:00
Zach Fox	826644ef08	Merge pull request #14559 from zfox23/MS20161_updatesDot ... Fix MS20161: Fix INVENTORY notification dot state	2018-12-11 13:03:26 -08:00
Jeff Clinton	e88e15fd94	Merge pull request #14560 from zfox23/MS4382_handshakeSparkles ... Fix MS4382: Add a lifetime to handshake particle effects to prevent persistence	2018-12-11 11:51:54 -08:00
Dante Ruiz	deaf3e8e44	adding option to disable teleportring	2018-12-11 11:06:13 -08:00
Zach Fox	75ba1cb3c7	I forgot to clear dot immediately	2018-12-11 10:30:12 -08:00
Zach Fox	3b9777d5d5	Fix MS4382: Add a lifetime to handshake particle effects to prevent persistence	2018-12-10 14:08:38 -08:00
Zach Fox	ab6aeae91a	Fix MS20161: Fix INVENTORY notification dot state	2018-12-10 13:01:28 -08:00
Zach Fox	ed99da2165	Fix MS20215: Fix incorrect display of unavailable items on Marketplace main page	2018-12-10 11:15:27 -08:00
Wayne Chen	4c9c785c24	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-10 07:57:44 -08:00
Brad Hefta-Gaub	26ccfb2533	Merge pull request #14329 from ctrlaltdavid/mini-tablet-tuning ... Mini tablet tuning	2018-12-09 17:23:59 -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
Brad Hefta-Gaub	0425ae1231	Merge pull request #14239 from ElderOrb/FB19219 ... FB19219 - Make avatarapp to handle wearables update via drag&drop	2018-12-09 17:20:13 -08:00
Sam Gondelman	4c5ff0dc3e	Merge branch 'master' into NOverlays3	2018-12-07 14:26:59 -08:00
John Conklin II	2d52fffa4b	Merge pull request #14460 from huffman/fix/lifetime-slider-alt ... Change lifetime back to a regular input field	2018-12-07 13:43:08 -08:00
Ryan Huffman	a42a771df5	Merge pull request #14540 from huffman/feat/hide-certified-urls ... Add hiding of certified properties in Create	2018-12-07 13:42:23 -08:00
Thijs Wenker	3a259d8525	Merge branch 'master' of github.com:highfidelity/hifi into fix/create/missingStartMiddleFinishTooltips2 ... # Conflicts: # scripts/system/html/js/entityProperties.js	2018-12-07 20:24:21 +01:00
Ryan Huffman	bf844e0472	Add hiding of certified properties in Create	2018-12-07 11:05:52 -08:00
Ryan Huffman	f42c31ca36	Update number property to reuse numberdraggable emit function	2018-12-07 11:02:31 -08:00
Ryan Huffman	c9ab5c23ea	Add support for min/max/step/defaultValue on number field	2018-12-07 11:02:31 -08:00
Ryan Huffman	818339823c	Add new number type in Create	2018-12-07 11:02:31 -08:00
John Conklin II	55f59a720f	Merge pull request #14501 from thoys/fix/create/userDataErrorMessagePopupInfiniteLoopFix ... MS19567 [CreateApp]: userData error message continues popup fix	2018-12-07 10:59:34 -08:00
John Conklin II	d7e3935d57	Merge pull request #14421 from dback2/entityListReorderColumns ... Entity list - reorder columns	2018-12-07 10:59:02 -08:00
John Conklin II	3a22299503	Merge pull request #14441 from dback2/preventDragDrop ... Prevent dragging and dropping files onto Create windows	2018-12-07 10:58:42 -08:00
Wayne Chen	4e6f162e01	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-07 10:12:46 -08:00
Alexander Ivash	72a91668a5	FB19219 Make avatarapp to handle wearables update via drag&drop	2018-12-07 11:23:17 +03:00
John Conklin II	88efaaa4c7	Merge pull request #14544 from huffman/fix/particle-property-layout ... Improve Create properties for particles + materials	2018-12-06 16:45:44 -08:00
David Back	1a3708c49d	better drag drop fix	2018-12-06 16:14:28 -08:00
Thijs Wenker	4f2289b347	CR fixes	2018-12-06 23:42:37 +01:00
Thijs Wenker	2771e2862e	add missing material data json error clear on delete	2018-12-06 23:42:36 +01:00
Thijs Wenker	6d40bc9c2f	userData error message continues popup fix	2018-12-06 23:42:36 +01:00
David Back	6a11766dbf	Merge branch 'master' of https://github.com/highfidelity/hifi into preventDragDrop	2018-12-06 14:02:42 -08:00
David Back	8620a5a4c3	CR changes	2018-12-06 13:07:59 -08:00
David Back	a247e14f3d	Merge branch 'entityListReorderColumns' of github.com:dback2/hifi into entityListReorderColumns	2018-12-06 13:06:49 -08:00
David Back	9fab86d972	Merge branch 'master' of https://github.com/highfidelity/hifi into entityListReorderColumns	2018-12-06 13:05:11 -08:00
David Back	e4efc90605	Merge branch 'master' of https://github.com/highfidelity/hifi into entityListReorderColumns	2018-12-06 13:04:53 -08:00
Sam Gondelman	2291c7e5fb	Merge branch 'master' into NOverlays3	2018-12-06 12:37:18 -08:00
Thijs Wenker	d25b5f054b	Merge branch 'master' into fix/create/missingStartMiddleFinishTooltips	2018-12-06 20:48:42 +01: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
Adam Smith	08d6e35d4d	Merge pull request #14372 from SamGondelman/decals ... Case 19798: 3D projected Material Entities and materialRepeat option	2018-12-06 11:13:46 -08:00
Wayne Chen	30f1016f1c	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-06 09:55:00 -08:00
Ryan Huffman	13c3b410d8	Merge pull request #14495 from dback2/draggableNumberFixes76-master ... Draggable numbers - RC76 fixes to master	2018-12-06 09:47:38 -08:00
Jeff Clinton	e65e8d29a1	Merge pull request #14442 from hyperlogic/bug-fix/hand-grasp-during-desktop-handshake ... Ensure that hand is in grasp pose during desktop handshake animation	2018-12-06 09:41:29 -08:00
Ryan Huffman	3160339551	Improve Create properties for particles + materials ... Sizing of input fields is now flexible. Material scale field labels are no longer obscured. Material tooltips are corrected.	2018-12-06 09:41:10 -08:00
Jeff Clinton	7f242b8c0e	Merge pull request #14522 from thoys/fix/create/ignoreTextareaShortcuts-master ... [RC77] MS20114 [CreateApp] ignore createApp shortcut keys while TEXTAREA elements are in focus	2018-12-06 09:11:49 -08:00
David Rowe	aa952e9142	Fix mini tablet visibility angle calculations	2018-12-06 15:24:03 +13:00
David Rowe	363e3ca32d	Merge branch 'master' into mini-tablet-tuning	2018-12-06 13:55:24 +13:00
Wayne Chen	1375e85f2c	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-04 10:21:12 -08:00
SamGondelman	3ce6f7f3d6	real image entities	2018-12-03 11:50:59 -08:00
Thijs Wenker	f38f39c84d	ignore shortcuts in TEXTAREA elements	2018-12-03 19:42:57 +01:00
Zach Fox	2776839dff	Merge pull request #14513 from zfox23/MS20117_rawHtmlRemoval ... Fix MS20117: Prevent HTML link from appearing in Wallet notification	2018-12-03 10:27:32 -08:00
David Back	a05e831333	Merge branch 'master' into draggableNumberFixes76-master	2018-12-03 09:42:58 -08:00
Wayne Chen	ef12b1128b	Merge branch 'master' of git://github.com/highfidelity/hifi into loginInitiative2	2018-11-30 20:18:04 -08:00
Shannon Romano	3c43f44119	Merge pull request #14462 from huffman/fix/key-light-angle ... Swap key light directions in Create	2018-11-30 19:28:53 -08:00
Shannon Romano	0d2b0903d8	Merge pull request #14469 from huffman/fix/draggable-input-tabbable ... Fix draggable inputs not being tabbable	2018-11-30 19:28:11 -08:00
Shannon Romano	5afff69b78	Merge pull request #14505 from huffman/fix/create-empty-rgb-field ... Fix empty rgb field in Create going black	2018-11-30 18:19:44 -08:00
Zach Fox	051b7cfbb8	Fix MS20117: Prevent HTML link from appearing in Wallet notification	2018-11-30 16:12:21 -08:00
Wayne Chen	09bc886c20	Merge branch 'master' into loginInitiative2	2018-11-30 13:05:17 -08:00
Ryan Huffman	59b7cdf318	Fix empty rgb field in Create going black	2018-11-29 14:10:22 -08:00
David Rowe	dc05cdee5a	Merge branch 'master' into M17406 ... # Conflicts: # scripts/system/controllers/controllerModules/nearParentGrabEntity.js	2018-11-30 09:44:09 +13:00
David Back	ec4726ad15	fix subproperty updates	2018-11-29 10:42:26 -08:00
David Back	859c0f3389	Merge branch 'master' of https://github.com/highfidelity/hifi into draggableNumberFixes76-master	2018-11-29 10:41:56 -08:00
David Back	006ba33352	Merge branch 'master' into entityListReorderColumns	2018-11-29 10:29:44 -08:00
Seth Alves	87e4c17194	Merge pull request #14429 from danteruiz/disable-highlighting ... Remove entity highlighting	2018-11-29 09:04:56 -08:00
Wayne Chen	9deb15b9f6	Merge branch 'master' into loginInitiative2	2018-11-28 19:10:20 -08:00
David Back	e5f4f67c10	RC76 draggable number fixes	2018-11-28 17:30:18 -08:00
Ryan Huffman	ec19d2f119	Fix Create tooltips getting pushed down for tall rows	2018-11-27 19:07:04 +01:00
Thijs Wenker	e193dcbc60	- add missing start/middle/finish tooltips ... - style updates	2018-11-27 19:07:04 +01:00
Zach Fox	31f7d747c8	Bugfixes; enable purchase asset from marketplace screen raise	2018-11-26 15:48:49 -08:00
Zach Fox	8df5db4239	Allow scripts to open SendAsset screen with pre-filled info	2018-11-26 13:26:17 -08:00
Ryan Huffman	a6e203e3e5	Fix draggable inputs not being tabbable	2018-11-26 11:12:14 -08:00
Wayne Chen	68834cb29f	Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2	2018-11-26 10:11:41 -08:00
Wayne Chen	0d52566315	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-26 09:13:35 -08:00
David Rowe	c96cd422e1	Fix near parent grab tear away calc for avatar scale	2018-11-24 11:58:40 +13:00
David Rowe	f2abf8e398	Debounce haptic pulses at start of near parent grab	2018-11-24 11:43:05 +13:00
David Rowe	29c268df5a	Remove extraneous grab entity haptic pulses	2018-11-24 11:38:54 +13:00
David Rowe	f1dad3c465	Add hystersis between near parent grabbing and tearing away	2018-11-24 08:35:02 +13:00
David Rowe	1362e7f361	Fix near parent grab entity tear away distance calc	2018-11-24 08:26:54 +13:00
Ryan Huffman	1e746e1b1c	Swap key light directions in Create	2018-11-21 16:43:54 -08:00
David Rowe	5e51ba051a	Improve code responsibilities	2018-11-22 11:12:22 +13:00
Wayne Chen	51f5942a7f	adding sound to login screen	2018-11-21 13:36:36 -08:00
David Rowe	c3a0805db1	Make far grab ignore tablet while grabbing an entity	2018-11-21 10:28:46 +13:00
David Rowe	44efd18882	Make Create and Shapes lasers ignore tablet while editing	2018-11-21 08:38:30 +13:00
John Conklin II	87cac67c75	Merge pull request #14280 from ElderOrb/FB17381 ... FB17381 - Reticle.setVisible isn't working	2018-11-20 09:53:52 -08:00
John Conklin II	04ccf9a257	Merge pull request #14435 from dback2/draggableNumberDelay2 ... Entity list - prevent draggable number updates while dragging	2018-11-20 09:16:14 -08:00
Anthony Thibault	0f7afb133a	Ensure that hand is in grasp pose during desktop handshake animation	2018-11-19 17:59:50 -08:00
David Back	a94fec75b4	prevent drag drop onto edit	2018-11-19 17:59:42 -08:00
David Back	dff4e34e7b	CR changes	2018-11-19 16:59:33 -08:00
David Back	249ebb2389	remove unneeded	2018-11-19 16:21:52 -08:00
Ryan Huffman	b7fe3d47be	Merge pull request #14433 from huffman/fix/entity-properties-styling ... Fix several entity tool window styling issues	2018-11-19 16:17:50 -08:00
David Back	ff6d43d0e4	block updates during dragging	2018-11-19 16:15:11 -08:00
Ryan Huffman	007396346c	Fix grid tool styling	2018-11-19 14:07:24 -08:00
Ryan Huffman	7694aa8e66	Fix draggable number going into edit too often	2018-11-19 13:51:25 -08:00
Ryan Huffman	193b9752b8	Fix styling of properties window when narrow	2018-11-19 13:50:56 -08:00
Dante Ruiz	d6fbcb1668	remove entity highlighting	2018-11-19 11:04:09 -08:00
Wayne Chen	b8d8710604	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-19 09:02:16 -08:00
David Rowe	eb8c6c8974	Merge branch 'master' into M19345	2018-11-19 09:47:05 +13:00
Ryan Huffman	7701be0742	Merge pull request #14410 from thoys/fix/create/entityListDoubleClick ... CreateApp Fix entity list double click rename / highlight and virtual keyboard issue	2018-11-16 18:41:47 -08:00
unknown	20cb64ead2	Merge branch 'master' of https://github.com/highfidelity/hifi into entityListReorderColumns	2018-11-16 17:14:42 -08:00
unknown	a0f79f9881	entity list reordering columns	2018-11-16 17:14:30 -08:00
Thijs Wenker	ba790ae470	fix behavior after merge.	2018-11-17 01:20:36 +01:00
Shannon Romano	6425a474ac	Merge pull request #14378 from danteruiz/fix-case-of-infinate-loading ... Fixing case of interstitial not finishing loading	2018-11-16 14:53:01 -08:00
unknown	e9fb9b1f4d	Merge branch 'master' of https://github.com/highfidelity/hifi into entityListReorderColumns	2018-11-16 14:51:48 -08:00
Thijs Wenker	7b3d2bed15	CR fixes	2018-11-16 22:10:15 +01:00
Thijs Wenker	e89346c146	making rename functionality list refresh proof	2018-11-16 22:10:14 +01:00
Thijs Wenker	31d37e7e75	Fix entity list double click rename / highlight issue	2018-11-16 22:08:58 +01:00
David Rowe	b24c482743	Terminate Create far grab etc. upon laser intersecting tablet	2018-11-16 16:29:57 +13:00
David Back	17404863e7	entity list reordering WIP	2018-11-15 17:42:51 -08:00
Ryan Huffman	556aec9412	Fix hiding of properties in Create	2018-11-15 15:27:30 -08:00
David Back	de7f4a4a4d	fix entity list resizing	2018-11-15 15:23:18 -08:00
David Rowe	f2868fec3f	Merge branch 'master' into M19345	2018-11-16 09:11:11 +13:00
Brad Hefta-Gaub	20766da624	Merge pull request #14382 from dback2/newPropertySliders ... Entity properties - new draggable numbers	2018-11-15 10:01:07 -08:00
David Back	dfed797682	set more min/max/steps	2018-11-14 15:44:30 -08:00
Wayne Chen	c85b840db0	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-14 14:47:56 -08:00
David Back	76d2519205	Merge pull request #14400 from dback2/missingTypeFilters ... Add PolyLine/PolyVox to entity list/properties types	2018-11-14 14:39:26 -08:00
David Back	d8f5e0f708	add min/max/step for some properties, remove duplicate createProperty, improve switch between states	2018-11-14 14:32:17 -08:00
David Back	70493e3f29	add polyline/polyvox to entity list/properties types	2018-11-14 12:23:16 -08:00
SamGondelman	079d1dcbd6	convert clientOnly to entityHost and add local entities	2018-11-14 11:25:37 -08:00
Thijs Wenker	cd12dd8f6d	fix OSX shortcut inconsistencies	2018-11-14 19:28:57 +01:00
David Back	1aa048f4d6	style and decimal fixes	2018-11-13 17:56:31 -08:00
David Back	a349bac01c	Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders	2018-11-13 16:32:15 -08:00
Thijs Wenker	2c715bf592	make window shortcuts work on OSX	2018-11-14 01:05:39 +01: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
David Back	8db81d9ce6	restructure draggable numbers to be more like blender	2018-11-13 16:04:08 -08:00
John Conklin II	d7dd593a97	Merge pull request #14369 from dback2/entityListColumns ... Entity list - dynamic columns	2018-11-13 16:01:06 -08:00
David Back	91db81cd94	merge fix	2018-11-13 15:10:53 -08:00
David Back	c73e737552	Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders	2018-11-13 15:04:12 -08:00
David Back	e88e131dca	Merge branch 'feat/ui-updates' of github.com:huffman/hifi into newPropertySliders	2018-11-13 15:04:02 -08:00
Jamil Akram	d65a79e815	Merge pull request #14377 from huffman/feat/ui-updates ... Update the styling for the Entity Properties window	2018-11-13 14:39:57 -08:00
Jeff Clinton	18bf6bf975	Merge pull request #14143 from ElderOrb/FB18673 ... FB18673 - Last line of GOTO desktop notification text cropped off on …	2018-11-13 14:05:21 -08:00
Ryan Huffman	aecbccc058	Remove dead code and cleanup JS styling for entity properties redesign	2018-11-13 13:45:27 -08:00
Ryan Huffman	8c9015b224	Remove redundant dimensions in default entity properties	2018-11-13 13:45:27 -08:00
Ryan Huffman	536ba645b1	Update the styling for the Entity Properties window	2018-11-13 13:45:27 -08:00
Brad Hefta-Gaub	bb2239c0bd	Merge pull request #14359 from howard-stearns/no-url-logging ... remove urls from logs in Interface	2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub	07f94030ce	Merge pull request #14357 from ctrlaltdavid/M19761 ... Fix mini tablet JavaScript crash	2018-11-13 12:15:56 -08:00
Brad Hefta-Gaub	41d8220cbd	Merge pull request #14362 from ctrlaltdavid/M19768 ... Add option to enable/disable the mini tablet	2018-11-13 11:59:24 -08:00
David Back	0b0614c84a	CR fixes	2018-11-13 11:13:00 -08:00
Dante Ruiz	812373cdab	fixing loading bar visual	2018-11-13 11:11:18 -08:00
Dante Ruiz	1a95ee2b31	making requested changes	2018-11-13 11:11:18 -08:00
Dante Ruiz	10d045b11b	fix infinate loading if entity server is not running	2018-11-13 11:07:26 -08:00
Brad Hefta-Gaub	63e52ba8bd	Merge pull request #14284 from ctrlaltdavid/M19404 ... Fix interstitial page not displaying at Interface start-up	2018-11-13 10:38:38 -08:00
David Back	b5ec04a534	Merge branch 'master' of https://github.com/highfidelity/hifi into entityListColumns	2018-11-13 10:35:57 -08:00
David Back	047708bedb	Merge branch 'master' of github.com:dback2/hifi into entityListColumns	2018-11-13 10:24:02 -08:00
Howard Stearns	545b85bc9d	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-13 09:55:54 -08:00
Seth Alves	7ffba9d987	Merge pull request #14204 from ctrlaltdavid/M12661 ... Fixes for collisionless entities	2018-11-13 09:42:07 -08:00
David Back	b3ccce9a3f	merge follow-up	2018-11-12 17:30:21 -08:00
David Back	c5023b1086	Merge branch 'feat/ui-updates' of github.com:huffman/hifi into newPropertySliders	2018-11-12 17:03:07 -08:00
Ryan Huffman	a787f55506	Remove dead code and cleanup JS styling for entity properties redesign	2018-11-12 16:50:45 -08:00
Ryan Huffman	a020a09e8c	Remove redundant dimensions in default entity properties	2018-11-12 16:50:45 -08:00
Ryan Huffman	25df605459	Update the styling for the Entity Properties window	2018-11-12 16:50:45 -08:00
John Conklin II	0370c60398	Merge pull request #14358 from AndrewMeadows/fix-capsuleY ... Case 18436: consistent handling of CapsuleShape dimensions	2018-11-12 15:25:42 -08:00
Howard Stearns	66ae01e0c3	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-12 12:55:20 -08:00
David Back	0781171912	Merge branch 'newPropertySliders' of github.com:dback2/hifi into newPropertySliders	2018-11-12 12:20:05 -08:00
David Back	a0d5b1117a	Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders	2018-11-12 11:41:00 -08:00
Ryan Huffman	5e6d0c0f94	Merge pull request #14376 from thoys/feat/create/localGlobalToggle ... [CreateApp] Local/World toggle	2018-11-12 10:37:55 -08:00
Wayne Chen	ea325acef9	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-12 10:28:03 -08:00
David Back	eeb8ede8ff	Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders	2018-11-12 10:10:38 -08:00
unknown	4eab623fd8	remove debugPrint function	2018-11-09 17:25:48 -08:00
unknown	0160ab23ab	fix color pickers	2018-11-09 17:23:51 -08:00
unknown	08d9eda7d7	fix property bugs / style issues	2018-11-09 17:08:10 -08:00
Jeff Clinton	12b833d121	Merge pull request #14167 from ElderOrb/FB18859 ... Make material entities to be presented in avatarapp	2018-11-09 15:32:27 -08:00
David Back	615ffebb2c	new draggable numbers WIP	2018-11-09 13:14:05 -08:00
Jeff Clinton	ee9154a801	Merge pull request #14341 from sethalves/fix-mouse-equip ... only equip an entity to a hand-controller joint if the hand-controllers are in use, else use avatar hand	2018-11-09 12:54:36 -08:00
SamGondelman	b3abd97707	projected materials and repeat property	2018-11-09 10:47:07 -08:00
Jeff Clinton	3d01949e43	Merge pull request #14305 from AndrewMeadows/zero-vel-neargrab-nondynamic ... Case 19495: zero velocities of non-dynamic entities on nearGrab release	2018-11-09 10:10:49 -08:00
Thijs Wenker	99fcef105f	spaceMode / desiredSpaceMode explanation	2018-11-09 17:59:00 +01:00
David Rowe	a34e1f69e0	Merge branch 'master' into M19345 ... # Conflicts: # scripts/system/controllers/controllerModules/nearParentGrabOverlay.js	2018-11-09 14:26:29 +13:00
David Rowe	c9b3fda724	Merge branch 'master' into M19768 ... # Conflicts: # interface/src/scripting/HMDScriptingInterface.h	2018-11-09 13:56:44 +13:00
Thijs Wenker	e483b1342c	CR fixes	2018-11-09 01:56:17 +01:00
David Rowe	aca7143449	Fix interstitial music not playing at Interface start-up	2018-11-09 13:41:07 +13:00
Ryan Huffman	3b57e45fdd	Remove redundant dimensions in default entity properties	2018-11-08 16:36:55 -08:00
Ryan Huffman	44d0a7254c	Update the styling for the Entity Properties window	2018-11-08 16:36:55 -08:00
David Rowe	5c97954e66	Merge branch 'master' into M19404 ... # Conflicts: # scripts/system/interstitialPage.js	2018-11-09 13:35:11 +13: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
Wayne Chen	f66326fc4d	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-08 15:51:24 -08:00
David Rowe	cdae5cd03d	Front-load interstitial scripts and resources	2018-11-09 10:53:34 +13:00
John Conklin II	3fabe557c2	Merge pull request #13948 from danteruiz/3d-keyboard ... 3D Keyboard.	2018-11-08 13:35:13 -08:00
Jeff Clinton	d349c1e672	Merge pull request #14336 from huffman/fix/horizontal-vertical-angle-particles ... Fix horizontal and vertical props in entity properties being swapped	2018-11-08 12:42:48 -08:00
Jeff Clinton	ea8dc8ae68	Merge pull request #14334 from danteruiz/interstitial-bug-fixes ... Interstitial bug fixes	2018-11-08 11:43:38 -08:00
Wayne Chen	e266532888	Merge branch 'master' into loginInitiative2	2018-11-08 11:17:24 -08:00
Jeff Clinton	62e3e87ba6	Merge pull request #14325 from huffman/fix/new-model-dynamic ... Fix new models not obeying dynamic checkbox	2018-11-08 10:22:12 -08:00
Jeff Clinton	30ff3f676a	Merge pull request #14310 from thoys/fix/create/tooltips-refinement ... Create APP tooltip / Adressed CR comments / Regression	2018-11-08 10:03:17 -08:00
Dante Ruiz	501746b156	3D Keyboard	2018-11-08 09:58:53 -08:00
Zach Fox	1ab1cb95d8	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-08 09:57:10 -08:00
Jeff Clinton	49bf01294a	Merge pull request #14320 from huffman/fix/default-collision-values ... Update the default edit.js collidesWith to include myAvatar	2018-11-08 09:17:40 -08:00
David Rowe	371919b923	Fix mini tablet always displaying if start up in HMD mode	2018-11-08 17:47:02 +13:00
David Back	0597d15771	tabs	2018-11-07 16:06:18 -08:00
David Back	f0c2ec1fa4	entity list data-driven resizable addable/removable columns	2018-11-07 16:02:15 -08:00
Wayne Chen	bd11825f3d	removing debug print statement	2018-11-07 09:40:01 -08:00
Wayne Chen	fc32ba9ce3	fixing create app window on desktop	2018-11-07 09:26:34 -08:00
David Rowe	28097933ed	Add setting to enable/disable the mini tablet	2018-11-07 14:39:06 +13:00
Zach Fox	e80468e423	Remove URL logging from JS and QML	2018-11-06 15:09:24 -08:00
Andrew Meadows	b38c263e60	use correct capsule dimensions in teleport.js	2018-11-06 12:44:14 -08:00
David Rowe	629559e78c	Add extra ()s	2018-11-07 09:20:54 +13:00
David Rowe	f47f77b181	Fix mini tablet JavaScript crash	2018-11-07 09:11:43 +13:00
Howard Stearns	5e01314d85	Merge pull request #14319 from howard-stearns/tabless ... Remove tabs from oculus store inventory, and rename to match	2018-11-05 18:05:02 -08:00
Howard Stearns	89656ea3f6	activity notifications also change ASSETS to INVENTORY	2018-11-05 16:43:06 -08:00
Howard Stearns	03ac18ab74	Merge pull request #14299 from davidkelly/dk/19591 ... Don't attempt purchase of sold out items	2018-11-05 16:20:02 -08:00
Zach Fox	f10b9ae30c	Squashed commit of the following: ... commit 515ff016a4 Author: Zach Fox <fox@highfidelity.io> Date: Mon Nov 5 13:03:34 2018 -0800 Fix seven bugs commit a4d36b3845 Merge: 8906b909eb d0181283dd Author: Zach Fox <fox@highfidelity.io> Date: Mon Nov 5 10:25:58 2018 -0800 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce commit d0181283dd Merge: be17ed0910 643026abd6 Author: Brad Hefta-Gaub <brad@highfidelity.io> Date: Fri Nov 2 16:44:31 2018 -0700 Merge pull request #14308 from sabrina-shanman/fbx2hfm (case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes commit 643026abd6 Author: sabrina-shanman <sabrina@highfidelity.io> Date: Wed Oct 31 14:15:30 2018 -0700 Change local variable in TestFbx for clarity commit 0b7ddca5f6 Author: sabrina-shanman <sabrina@highfidelity.io> Date: Wed Oct 31 14:03:20 2018 -0700 Change naming for straggler names in model loading debug dumps commit becee7f010 Author: sabrina-shanman <sabrina@highfidelity.io> Date: Tue Oct 30 17:28:42 2018 -0700 Re-name FBXGeometry to HFMGeometry and do the same for related classes	2018-11-05 13:12:43 -08:00
Zach Fox	515ff016a4	Fix seven bugs	2018-11-05 13:03:34 -08:00
howard-stearns	7115f0e688	update notification refs inventory, not assets	2018-11-04 12:17:41 -08:00
howard-stearns	4f713b038e	Merge branch 'oculus-store-commerce' into tabless	2018-11-04 12:17:21 -08:00
howard-stearns	8906b909eb	close wallet app during login so that it doesn't tell to login after ... login	2018-11-04 12:08:29 -08:00
howard-stearns	100a17a2b9	remove wallet reference in update notification	2018-11-04 11:25:40 -08:00
howard-stearns	8ad8398ef3	remove 'purchase' from login notice.	2018-11-04 11:17:56 -08:00
Seth Alves	a94fd2a1c9	only equip an entity to a hand-controller joint if the hand-controllers are in use, else use avatar hand	2018-11-03 13:14:08 -07:00
Zach Fox	a87142b8b7	Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce	2018-11-02 16:49:20 -07:00
Ryan Huffman	c22df4dd94	Fix horizontal and vertical props in entity properties being swapped	2018-11-02 16:22:10 -07:00
Zach Fox	402c23e359	Use useragent instead of queryparam to determine limitedCommerce	2018-11-02 16:07:29 -07:00
Dante Ruiz	b33934ec46	fixing Image3DOverlay scaling	2018-11-02 14:24:14 -07:00
Zach Fox	2b50c40224	Minor changes found by Chang	2018-11-02 09:33:06 -07:00
David Rowe	55d0822b1a	Delay showing mini tablet	2018-11-02 18:18:41 +13:00
David Rowe	8924f0832a	Use half angles relative to palm normal for mini tablet visibility	2018-11-02 18:06:00 +13:00
Ryan Huffman	4593b33435	Fix new models not obeying dynamic checkbox	2018-11-01 14:38:55 -07:00
David Rowe	1e3549d263	Increase delay in shrinking the mini tablet after start of trigger	2018-11-02 08:33:14 +13:00
Ryan Huffman	01b29185ca	Update the default edit.js collidesWith to include myAvatar	2018-11-01 12:04:20 -07:00
Howard Stearns	8f2f27f468	Merge branch 'oculus-store-commerce' into tabless	2018-11-01 11:22:28 -07:00
Zach Fox	4a56f769e5	Re-add some code I shouldn't have removed	2018-11-01 11:04:59 -07:00
Zach Fox	d481f081bb	Fix four bugs; truncate some logs	2018-11-01 10:29:38 -07:00
Alexander Ivash	dcf20d2a15	FB17381 - Reticle.setVisible isn't working	2018-11-01 22:39:02 +05:30
Zach Fox	41a0d09389	First pass	2018-10-31 15:31:51 -07:00
Howard Stearns	ce0ad48a28	tabless wallet	2018-10-31 13:58:26 -07:00
Zach Fox	34fb849536	Cleanup FIXME	2018-10-31 13:53:18 -07:00
Zach Fox	a1276ba899	Don't poll for history notifs if limitedCommerce is true	2018-10-31 13:31:29 -07:00
Zach Fox	448be8847f	Notifications are working!	2018-10-31 13:23:58 -07:00
Dante Ruiz	b3539b101b	faster loading bar interpolation once physics is enabled	2018-10-31 11:33:53 -07:00
Thijs Wenker	92888e9d3e	tooltip CR changes	2018-10-31 18:26:23 +01:00
Andrew Meadows	225e8e0556	always zero velocity on far-grab release of non-dynamic	2018-10-31 10:20:21 -07:00
Dante Ruiz	0279eef3a4	improving interstitial loading bar	2018-10-31 10:13:32 -07:00
Andrew Meadows	90e944f130	always zero velocity on near-grab release of non-dynamic	2018-10-30 16:20:33 -07:00
Zach Fox	b6344acc1d	Big checkpoint. be aware - things may be broken	2018-10-30 15:08:13 -07:00
David Kelly	015b5fa681	Don't attempt purchase of sold out items	2018-10-30 08:01:22 -07:00
David Rowe	791ee04aea	Merge branch 'master' into M12661	2018-10-30 13:33:53 +13:00
Zach Fox	d47fd44a47	Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce	2018-10-29 14:57:23 -07:00
Ryan Huffman	c6403a44cb	Merge pull request #14281 from dback2/collidesPropertyFix ... Fix Collides With subproperties	2018-10-26 13:46:52 -07:00
John Conklin II	fa2fb3a87a	Merge pull request #14246 from sethalves/sync-grab-props ... keep userData and new grab properties in sync	2018-10-26 11:52:47 -07:00
David Rowe	2fdb114e4b	Fix interstitial page not displaying at Interface start-up	2018-10-26 19:21:37 +13:00
David Back	13acfb325a	fix collides with properties, fix ordering for start/finish/spread properties	2018-10-25 15:06:15 -07:00
John Conklin II	2dfd63f4e7	Merge pull request #14229 from thoys/feat/create/tooltips ... MS19052 [CreateApp]: Tooltips	2018-10-25 14:52:16 -07:00
John Conklin II	7227547b6a	Merge pull request #14279 from dback2/removeParticleExplorer ... Remove particle explorer	2018-10-25 13:37:22 -07:00
Howard Stearns	8b79795247	nix the word "purchase" where possible	2018-10-25 12:31:01 -07:00
David Back	eb347c5596	remove particle explorer	2018-10-25 11:30:18 -07:00
Howard Stearns	6284c902be	use the switch	2018-10-25 11:29:10 -07:00
SamGondelman	faff5f11e8	Merge remote-tracking branch 'upstream/master' into particleLoad	2018-10-25 10:56:11 -07:00
Seth Alves	b8f1c96685	rats	2018-10-25 07:47:16 -07:00
Seth Alves	b93807b1a7	remove conversion code from equipEntity.js	2018-10-25 07:47:16 -07:00
David Rowe	1460e43f6e	Make tablet highlight not display if editing an entity with hand	2018-10-25 15:04:59 +13:00
David Rowe	0eead13fb9	Make Create not grab tablet if editing an entity with hand	2018-10-25 15:03:47 +13:00
Thijs Wenker	13cad17793	better style js attributes	2018-10-25 02:46:16 +02:00
Thijs Wenker	bb7d1f8afb	fix broken and missing tooltips	2018-10-25 02:46:16 +02:00
Thijs Wenker	83051940a8	Fix QA feedback	2018-10-25 02:46:15 +02:00
Thijs Wenker	358b0b76d1	tooltip delay of 500ms	2018-10-25 02:46:15 +02:00
Thijs Wenker	a3b874f9aa	property tooltips	2018-10-25 02:46:14 +02:00
David Back	a88678fb70	fix bad css merge, add particle property debounce	2018-10-24 15:07:47 -07:00
Howard Stearns	1ff50bc05e	updates notification applies to assets, and there is no wallet activity ... notification	2018-10-24 12:45:17 -07:00
David Back	5c1972e3f4	fix fallback properties	2018-10-24 12:40:44 -07:00
Howard Stearns	e1e9b78427	filter priced items from marketplace	2018-10-24 12:22:03 -07:00
David Back	b3e0d51260	Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor	2018-10-24 11:48:56 -07:00
Howard Stearns	8ee6a0ceff	disable priced items	2018-10-24 11:37:02 -07:00
Howard Stearns	ce20b82408	fix view this item in my purchases	2018-10-24 10:41:14 -07:00
David Back	073040d1fc	Merge branch 'master' into entityListTypeFilter	2018-10-24 10:39:30 -07: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
Brad Hefta-Gaub	f8e38e98e1	Merge pull request #14214 from huffman/feat/edit-defaults ... Update default entity properties in Create	2018-10-24 10:00:46 -07:00
Brad Hefta-Gaub	5e27a5930e	Merge pull request #14186 from thoys/feat/create/entityList-contextMenu ... MS19056: [CreateApp/Entity List] Context Menu	2018-10-24 09:58:32 -07:00
Howard Stearns	c1cb41875a	Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce	2018-10-24 09:56:37 -07:00
Thijs Wenker	5f35a32480	remove duplicate calls to refresh footer	2018-10-24 17:58:07 +02:00
Thijs Wenker	8e1cfb5a06	fix double click selection	2018-10-24 17:58:07 +02: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
unknown	c7ba386be1	darn prints somehow slipping past me	2018-10-23 20:56:53 -07:00
unknown	06aff231a3	Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor	2018-10-23 20:19:06 -07:00
David Back	2b9dcd0875	fix particle properties and keylight direction, remove columns, fix orderings, fix sliders	2018-10-23 18:38:05 -07:00
Kerry Ivan Kurian	3cf000a71b	Merge pull request #14232 from kkurian/log-resource-requests-2 ... Display resource-access events in marketplace item tester	2018-10-23 15:18:30 -07:00
Brad Hefta-Gaub	04d251c321	Merge pull request #14249 from wayne-chen/mergedInterstitialBugFixes ... Merged interstitial bug fixes	2018-10-23 14:30:55 -07:00
Kerry Ivan Kurian	e7d1c2873a	Merge branch 'master' into log-resource-requests-2	2018-10-23 13:46:59 -07: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	4069ca2e0c	CR feedback	2018-10-23 22:42:55 +02:00
Thijs Wenker	e5ef589a3c	style	2018-10-23 22:42:54 +02:00
Thijs Wenker	4c3f5b3bbc	Entity List Context Menu	2018-10-23 22:42:54 +02:00
SamGondelman	8807b90474	fix emitRadiusStart	2018-10-23 13:33:14 -07:00
Howard Stearns	97bc84ed87	Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce	2018-10-23 13:32:35 -07:00
David Back	9df8ea35bb	Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor	2018-10-23 13:28:35 -07:00
tapalisa	7a684081f0	Merge pull request #14235 from huffman/feat/edit-copy-paste ... Add copy/paste functionality to edit.js	2018-10-23 13:18:12 -07:00
Howard Stearns	a79fe4df79	Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce	2018-10-23 13:09:33 -07:00
Howard Stearns	95b86bf5b7	initial limited commerce for oculus store prototype	2018-10-23 13:08:39 -07:00
Brad Hefta-Gaub	447bfae828	Merge pull request #13884 from ctrlaltdavid/M17853 ... Highlight tablet when it is near-grabbable	2018-10-23 12:31:41 -07:00
David Back	9afb111fbe	add link, fix group order	2018-10-22 18:42:06 -07:00
David Back	d5dc93e800	QA fixes and reset server script status	2018-10-22 18:31:21 -07:00
Ryan Huffman	d7dce456b2	Fix incorrect default entity properties in Create	2018-10-22 18:29:27 -07:00
David Back	e8bda1793f	Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor	2018-10-22 15:12:45 -07:00
David Back	e5caf01681	CR change for body click event	2018-10-22 14:51:54 -07:00
Kerry Ivan Kurian	a1bb685176	Remove cruft	2018-10-22 14:00:08 -07:00
Zach Fox	f5a5c0dad3	Attempt to fix wearable bug?	2018-10-22 14:00:06 -07:00
Zach Fox	f9cc4f5a69	Count unique source and url pairs	2018-10-22 14:00:01 -07:00
Zach Fox	de93bbb08b	Only show unique resources	2018-10-22 13:59:59 -07:00
Zach Fox	d44f9e2ccc	Tons of improvements	2018-10-22 13:59:57 -07:00
Zach Fox	7be5d5674d	Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2	2018-10-22 13:59:35 -07: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
Ryan Huffman	65fdd16d90	Cleanup copy/paste changes	2018-10-22 13:56:07 -07:00
Ryan Huffman	9cc2add4a0	Add copy/paste functionality to edit.js	2018-10-22 13:56:07 -07:00
David Rowe	35c1241c98	Fix tablet highlighting not working if start up in HMD	2018-10-23 09:08:38 +13:00
Dante Ruiz	1ce1902fa8	remove magic numbers	2018-10-22 12:49:24 -07:00
David Back	ddbe02dd4e	CR changes and fix extra info toggle	2018-10-22 11:56:47 -07:00
John Conklin II	b3698388ea	Merge pull request #14245 from huffman/feat/default-grabbable-setting ... Add a 'grabbable' option to the new-model dialog	2018-10-22 11:42:40 -07:00
Wayne Chen	d008bfa523	partial requested code changes	2018-10-22 11:29:36 -07:00
David Back	f5616acba9	Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter	2018-10-22 11:21:27 -07:00
Wayne Chen	7284c3ad53	Merge branch 'intersttiial-do-not-intersect-web' of https://github.com/danteruiz/hifi into mergedInterstitialBugFixes	2018-10-22 10:28:35 -07:00
Wayne Chen	e2b90aac9d	Merge branch 'interstitialIgnoreFix' of https://github.com/wayne-chen/hifi into mergedInterstitialBugFixes	2018-10-22 10:28:12 -07:00
Wayne Chen	d12ee393d7	Merge branch 'fix-some-more-interstitial-issues' of https://github.com/danteruiz/hifi into mergedInterstitialBugFixes	2018-10-22 10:27:13 -07:00
Wayne Chen	4a8348e0d1	Merge branch 'interstitial-loading-imporvements' of https://github.com/danteruiz/hifi into mergedInterstitialBugFixes	2018-10-22 10:14:40 -07:00
Wayne Chen	27813d4948	Merge branch 'fix/loadingscreen-optimization' of https://github.com/FlameSoulis/hifi into mergedInterstitialBugFixes	2018-10-22 10:05:55 -07:00
Wayne Chen	afd8baca87	Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialIgnoreFix	2018-10-22 10:01:57 -07:00
Ryan Huffman	9d13902cd3	Improve paramater names in model dialog window	2018-10-20 11:26:12 -07:00
Ryan Huffman	f1258e4445	Add a 'grabbable' option to the new-model dialog	2018-10-19 16:42:45 -07:00
Brad Hefta-Gaub	1ff69844f2	Merge pull request #14225 from wayne-chen/interstitialHideProgressJS-RC75 ... hide progress overlays if interstitial mode	2018-10-19 16:35:42 -07:00
David Back	76dbee265e	Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter	2018-10-19 16:05:04 -07:00
David Back	e59f1516ef	CR changes	2018-10-19 16:01:53 -07:00
David Rowe	71ec5f3612	Fix tablet highlighting when using the Create and Shapes apps	2018-10-20 11:57:46 +13:00
David Rowe	eb179363f6	Merge branch 'master' into M17853 ... # Conflicts: # scripts/system/controllers/controllerDispatcher.js	2018-10-20 11:19:26 +13:00
Flame Soulis	5db7c7821e	Proper formatting (aka no spaces after anonymous funcs)	2018-10-19 08:51:13 -04:00
Flame Soulis	ba459eda9e	Removed duplicate backgroundAlpha	2018-10-19 08:41:04 -04:00
Flame Soulis	fcde53fc65	Include black-sphere.fbx and update linked url	2018-10-19 08:22:43 -04:00
Flame Soulis	014c1590dd	Made MP3 constistant 128kbps and fixed path resolving	2018-10-19 08:16:14 -04:00
Flame Soulis	e499309c8e	Upload interstitial page sound and update link	2018-10-19 06:49:48 -04:00
John Conklin II	37dce01dcb	Merge pull request #14099 from humbletim/fb18305-grabbable-menu-fix ... More reliable "Create Entities as Grabbable" settings persistence.	2018-10-18 18:26:48 -07:00
John Conklin II	bbccd0ff73	Merge pull request #14120 from zfox23/MS18609_snapShareBugs ... Fix MS18609: Various Snapshot sharing bugs	2018-10-18 18:21:23 -07:00
John Conklin II	5095a4e0eb	Merge pull request #14196 from sethalves/interstitial-domain-full ... go to error-room when failing to connect to a full domain	2018-10-18 17:49:35 -07:00
John Conklin II	addae51976	Merge pull request #14215 from ctrlaltdavid/M19308 ... Hide mini tablet immediately upon near grabbing an entity	2018-10-18 17:47:17 -07:00
Ryan Huffman	a4adf2c716	Fix name of Particles to ParticleEffect for default properties in edit.js	2018-10-18 17:39:24 -07:00
David Rowe	3e49d55dbf	Merge branch 'master' into M12661 ... # Conflicts: # scripts/system/controllers/controllerModules/farActionGrabEntity.js	2018-10-19 11:24:43 +13:00
David Back	45a92fd537	style tweaks	2018-10-18 15:12:38 -07:00
David Back	11add70ef2	style tweaks	2018-10-18 14:58:51 -07:00
Wayne Chen	6cf9608c97	adding fade in and fade outt in interstitial for progress	2018-10-18 13:12:04 -07:00
David Rowe	490c085eb8	Merge branch 'master' into M16440 ... # Conflicts: # scripts/system/controllers/controllerModules/hudOverlayPointer.js # scripts/system/controllers/controllerModules/inVREditMode.js	2018-10-19 09:06:33 +13:00
Seth Alves	7f150e6ed3	Move grab pseudo-properties (userData) into first-class EntityItemProperties.	2018-10-18 09:53:18 -07:00
Zach Fox	72b3777953	Merge branch 'master' of github.com:highfidelity/hifi into MS18609_snapShareBugs	2018-10-18 09:39:34 -07:00
Kerry Ivan Kurian	3b15548ea3	Display resource-access events in marketplace item tester ... Includes refactoring marketplace item tester into a single-page app.	2018-10-18 01:04:47 -07:00
David Back	f13008dbe9	tabs	2018-10-17 20:04:28 -07:00
David Back	6b5e616d2a	Merge branch 'master' into entityPropertiesRefactor	2018-10-17 20:01:15 -07:00
David Back	ad920ddc86	fix double min, unique collides subproperty ids	2018-10-17 19:44:38 -07:00
Thijs Wenker	b9cfa28c08	style fixes	2018-10-17 19:42:47 -07:00
Thijs Wenker	684f7d5689	move export selection button to bottom of the list	2018-10-17 19:37:56 -07:00
David Back	9e35af0c4a	remove space	2018-10-17 18:24:09 -07:00
David Back	9cd3c35cc6	style changes and fix hidden top row	2018-10-17 18:18:51 -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
David Back	001601d28f	Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter	2018-10-17 11:30:10 -07:00
Thijs Wenker	4ef2ad041b	Merge pull request #14136 from thoys/feat/create/exportSelection ... MS19053: [CreateApp/EntityList] Move export selection button to bottom of the list	2018-10-17 19:50:37 +02:00
David Back	a2aa63e9ed	adjust no entities message	2018-10-16 14:28:52 -07:00
David Back	5ae4425729	Merge branch 'entityListTypeFilter' of github.com:dback2/hifi into entityListTypeFilter	2018-10-16 14:20:48 -07:00
David Back	58e8d4071d	Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter	2018-10-16 13:52:27 -07:00
David Back	50becb5c37	merge particle explorer into properties, resurrect sliders, other tidying/fixes	2018-10-16 12:39:34 -07:00
Ryan Huffman	738ac30f1d	Update default entity properties in Create	2018-10-15 13:42:10 -07:00
David Rowe	c9919ff69d	Hide mini tablet immediately upon near grabbing an entity	2018-10-16 08:22:30 +13:00
Thijs Wenker	f1885159d2	style fixes	2018-10-15 21:17:41 +02:00
unknown	978cd4bb77	styling tweaks, fix X clear search not refreshing	2018-10-12 18:57:26 -07:00
unknown	a85336044f	add X to clear button to filter search	2018-10-12 18:03:47 -07:00
David Rowe	7d3eca57bb	Fix mouse pointer not recognizing or highlighting collisionless entities	2018-10-13 10:22:41 +13:00
David Rowe	3bc4581f82	Fix far grabbing collisionless entity removing collisionless property	2018-10-13 10:22:27 +13:00
David Rowe	ca4fe0682e	Fix collisionless entities not being able to be far grabbed	2018-10-13 10:22:05 +13:00
Howard Stearns	a92aa1f9da	new treatment for hmd/tablet login	2018-10-12 14:17:23 -07:00
Dante Ruiz	fa6b3019f6	fix js memory leak	2018-10-12 12:07:39 -07:00
Dante Ruiz	d7dc69129a	improve loading bar progress	2018-10-12 11:43:03 -07:00
unknown	6320f9bab7	tweaks	2018-10-12 11:39:54 -07:00
Seth Alves	47d3c9ba27	go to error-room when failing to connect to a full domain	2018-10-12 11:28:54 -07:00
unknown	97438a08d9	styling fixes, add icon, adjust Types text, click outside to close	2018-10-11 23:04:33 -07:00
David Back	4883a60afc	entity list type filter WIP - still some style issues	2018-10-11 18:55:14 -07:00
David Back	62c5fb8e2e	tweaks / dropdown fix	2018-10-11 14:25:06 -07:00
David Back	3f08400741	comment	2018-10-11 12:48:08 -07:00
David Back	5528050898	CR changes - propertyName vs propertyID, store name/elementID, return property element	2018-10-11 12:44:07 -07:00
Dante Ruiz	451142f9a3	fixing some more interstittial issues	2018-10-11 11:33:19 -07:00
David Back	ac0e999629	fix colors	2018-10-10 17:31:06 -07:00
David Back	31e665ab8b	CR changes - runtime property data rework	2018-10-10 16:49:20 -07:00
Dante Ruiz	a47a1c03e6	ignore web entities	2018-10-10 14:08:47 -07:00
Dante Ruiz	296ea8a5af	fix overlay issues during interstitial mode	2018-10-10 12:00:58 -07:00
David Back	60d102c9bf	styling fixes	2018-10-09 12:42:57 -07:00
David Back	7aba0a9082	cleanup	2018-10-09 10:17:39 -07:00
David Back	27d9e8bd23	initial pass refactored re-ordered data-driver entity properties	2018-10-09 10:11:30 -07:00
Wayne Chen	6f9593dabd	adding fix for far action grab	2018-10-08 16:59:39 -07:00
David Rowe	0b163ffaf8	Fix typos	2018-10-09 11:05:48 +13:00
Alexander Ivash	19c3f1516f	relax 'isWearable' conditions to treat entities like 'ghost.json' as wearables	2018-10-09 00:17:19 +03:00
Wayne Chen	ea8229fca4	adding fix for length check	2018-10-08 13:10:41 -07:00
divya	91df342ae9	Merge pull request #14094 from wayne-chen/interstitialMerged ... Merged interstitial page/redirect domain improvements	2018-10-08 10:32:29 -07:00
Wayne Chen	f758438dcc	Merge pull request #9 from danteruiz/interstitialMerged ... fix for failing to enter domain	2018-10-05 16:19:25 -07:00
Dante Ruiz	36c2cceb57	fix for failing to enter domain	2018-10-05 15:39:51 -07:00
Wayne Chen	8abbd51bb1	removing unused variable	2018-10-04 23:11:27 -07:00
Wayne Chen	89e2cf7153	Merge pull request #7 from danteruiz/interstitialMerged ... Interstitial merged	2018-10-04 17:10:27 -07:00
Wayne Chen	a2237aa48a	reverting click overlay behavior	2018-10-04 16:41:14 -07:00
Wayne Chen	c423305bd1	check overlay visibility before showing back up again	2018-10-04 16:30:48 -07:00
Dante Ruiz	651f37aceb	Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged	2018-10-04 15:01:39 -07:00
Dante Ruiz	bda9735b5d	fix loading progress	2018-10-04 15:01:16 -07:00
Wayne Chen	2e3566bc73	hide overlays after clicking on them	2018-10-04 14:24:43 -07:00
Alexander Ivash	f8285ab3d8	FB18673 - Last line of GOTO desktop notification text cropped off on bottom	2018-10-05 00:14:13 +03:00
Wayne Chen	0a7102b4d3	Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged	2018-10-04 08:59:26 -07:00
Wayne Chen	22a9030fb5	hiding text overlays when out of error state	2018-10-03 17:54:55 -07:00
Wayne Chen	d6af09ca62	ignoring entities in interstitial/saving address on 404 error	2018-10-03 17:40:42 -07:00
David Rowe	3bc1c2963d	Fix HUD laser while in Shapes app	2018-10-04 13:15:33 +13:00
David Rowe	209d1535c2	Fix HUD laser while in Create app	2018-10-04 10:42:17 +13:00
sabrina-shanman	2ef85dfdba	Merge branch 'master' into stt_parenting2	2018-10-03 11:39:00 -07:00
John Conklin II	4805d3564a	Merge pull request #14075 from ctrlaltdavid/M18586 ... Teleport with play area	2018-10-03 11:02:33 -07:00
Thijs Wenker	66c533b557	move export selection button to bottom of the list	2018-10-03 19:35:03 +02:00
Wayne Chen	efeb598495	fixing bug with hover overlay	2018-10-03 10:12:07 -07:00
John Conklin II	9a614d7523	Merge pull request #13977 from dback2/newEntityListView ... New optimized entity list view	2018-10-03 09:23:11 -07:00
John Conklin II	8bd8d05409	Merge pull request #14118 from luiscuenca/handTouchLMFix ... Disable Hand Touch when Leap Motion is running	2018-10-03 09:03:43 -07:00
David Rowe	2bdd8bfdc7	Update play area and sensor overlay models and raise a little	2018-10-03 11:09:04 +13:00
David Rowe	488599dbb0	Update teleport play area FBX model to be visible from below	2018-10-03 09:31:11 +13:00
David Rowe	c0231057f8	Revert foot calc scaling change	2018-10-03 09:28:19 +13: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
David Rowe	f7fd76b316	Merge branch 'master' into M18586 ... # Conflicts: # interface/src/scripting/HMDScriptingInterface.h	2018-10-02 16:49:16 +13:00
David Rowe	84a06fbe64	Don't immediately hide occlusion highlights after teleporting	2018-10-02 16:11:01 +13:00
sabrina-shanman	67dc526ee2	Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2	2018-10-01 17:17:32 -07:00
Brad Hefta-Gaub	7c9464572a	Merge pull request #14027 from huffman/feat/deprecate-undo-stack ... Remove UndoStack API	2018-10-01 17:13:48 -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
John Conklin II	3bbc01477e	Merge pull request #14055 from davidkelly/dk/18147 ... Do not have active buy button on invalidated items	2018-10-01 16:50:53 -07:00
John Conklin II	878d2a6f25	Merge pull request #14102 from howard-stearns/account-managed-wallet-punchlist2 ... Account-managed wallet flow improvements	2018-10-01 16:43:01 -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
Brad Hefta-Gaub	6eae178389	Merge pull request #13997 from gcalero/case_18057 ... Fix switch from Top View to My View	2018-10-01 16:13:07 -07:00
Wayne Chen	36dbcd41ba	Merge branch 'interstitialMerged' of https://github.com/wayne-chen/hifi into interstitialMerged	2018-10-01 16:11:40 -07:00
Wayne Chen	69b547a9fe	text overlays for consistency	2018-10-01 16:11:27 -07:00
Wayne Chen	8f36bc0850	Merge pull request #4 from danteruiz/interstitialMerged ... Interstitial screen updates	2018-10-01 15:43:04 -07:00
Dante Ruiz	66bb5f68d2	updating interstitialmode	2018-10-01 15:26:56 -07:00
David Rowe	87ff6dd56d	Fix play area sizing and positioning for different base avatar sizes	2018-10-02 10:53:31 +13:00
David Rowe	6ccd73ea47	Merge branch 'master' into M18586	2018-10-02 10:17:24 +13:00
Zach Fox	0081f9aac0	Also fix MS18512	2018-10-01 12:24:47 -07:00
Zach Fox	58f098577d	Fix MS18609: Various Snapshot sharing bugs	2018-10-01 12:09:49 -07:00
luiscuenca	5ccbc5c029	Disable Hand Touch when Leap Motion is running	2018-10-01 10:47:06 -07:00
Wayne Chen	eab57633a5	Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged	2018-10-01 09:21:26 -07:00
David Rowe	7560a2a923	Short circuit unnecessary repetition	2018-09-29 16:00:44 +12:00
David Rowe	2449868ea9	Fix mini tablet sizing for different sizes of avatar	2018-09-29 13:51:00 +12:00
David Rowe	8464a70c9e	Fix initial tablet scale	2018-09-29 12:42:41 +12:00
John Conklin II	130e8dfbe9	Merge pull request #14023 from dback2/selectEntityEveryFrameFix ... Only call selectEntity once triggered when using edit handles	2018-09-28 16:38:10 -07:00
Ryan Huffman	feb230b3bd	Remove old comment in entitySelectionTool.js	2018-09-28 16:17:52 -07:00
Howard Stearns	053f22182a	fix inspection case	2018-09-28 11:57:36 -07:00
Wayne Chen	a8b86bd555	removing debug statement	2018-09-28 08:44:49 -07:00
Wayne Chen	5c9094d81f	removing debug print statement	2018-09-27 21:24:04 -07:00
Wayne Chen	d5950db2a4	fix for showing the text overlay in mac	2018-09-27 21:20:06 -07:00
David Rowe	545c2591e3	Merge branch 'master' into M18586	2018-09-28 16:19:44 +12:00
David Rowe	7f518d0aa1	Make teleport parabolas semi-transparent	2018-09-28 16:13:25 +12:00
howard-stearns	b45677cd02	additionally handle item urls (marketplace links from cert inspections)	2018-09-27 19:42:01 -07:00
David Rowe	7b7447739a	Remove unused code noticed in passing	2018-09-28 14:23:20 +12:00
David Rowe	45993ba475	Provide mini tablet details via API instead of messages	2018-09-28 14:23:08 +12:00
howard-stearns	a6ef25f662	just whitespace and varname changes	2018-09-27 18:14:16 -07:00
sabrina-shanman	411dbbbad3	Make scripts use the default scaleWithParent when creating ray/parabola ... picks	2018-09-27 17:34:06 -07:00
Wayne Chen	5d27cddab5	consolidating getting oops message	2018-09-27 17:16:18 -07:00
Howard Stearns	f96c7f4db4	minimal time handshake	2018-09-27 17:05:18 -07:00
David Back	215e7e6da7	remove unneeded variable	2018-09-27 17:04:43 -07:00
David Back	b7c098c260	remove unneeded variable	2018-09-27 17:02:54 -07:00
David Back	4204adf60f	fix deselecting entity when re-clicking row, fix ctrl/shift selections	2018-09-27 16:59:23 -07:00
Wayne Chen	8b29f7c294	making text box smaller for no occlusion	2018-09-27 16:56:45 -07:00
Howard Stearns	7616639a40	Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2	2018-09-27 16:12:21 -07:00
David Rowe	d98e7cea4e	Fix not being able to grab tablet with other hand	2018-09-28 11:09:16 +12:00
Howard Stearns	ad676b14a1	doh - return with a newline (and no semicolon) does not continue. Don't ... need extra handler in marketplace any more.	2018-09-27 16:06:55 -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
Howard Stearns	4cf5b51124	works, using additional handler from wallet.js	2018-09-27 15:34:16 -07:00
David Rowe	1088a0f9ae	Fix invalid state transition in desktop mode	2018-09-28 10:19:17 +12:00
David Rowe	fc78d0582e	Tidying	2018-09-28 10:18:00 +12:00
humbletim	025bc19d62	save "Create Grabbable" in menuItemEvent, not scriptEnding	2018-09-27 17:08:49 -04:00
David Rowe	2456fd0e99	Merge branch 'master' into M17428-f	2018-09-28 08:41:57 +12:00
Wayne Chen	03d2fa2787	Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged	2018-09-27 09:47:08 -07:00
David Rowe	3284b2a90e	Immediately hide fading overlays if other hand starts teleporting	2018-09-27 15:20:43 +12:00
David Rowe	6ae206677d	Add Settings > Controls option for displaying play area	2018-09-27 14:55:53 +12:00
David Rowe	b9c6811fdc	Restructure post-teleport fading code	2018-09-27 14:44:30 +12:00
David Back	046a4e4041	ordering/comment tweak	2018-09-26 18:02:15 -07:00
David Back	7e7dc33acd	more CR changes + fix resizing	2018-09-26 17:57:44 -07:00
Wayne Chen	813defebfc	Merge branch 'update-interstitial' of https://github.com/danteruiz/hifi into interstitialMerged	2018-09-26 16:45:22 -07:00
Wayne Chen	33db8e1f24	only allow right-click for buttons	2018-09-26 16:40:43 -07:00
Wayne Chen	fda3ec87ce	removing lingering print statement	2018-09-26 15:57:57 -07:00
Wayne Chen	afae4f3b96	adding toolbar reappearing	2018-09-26 15:33:57 -07:00
Howard Stearns	da5f77afcd	Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2	2018-09-26 15:26:52 -07:00
Howard Stearns	6e2a7c280e	bottleneck opening our marketplace, and make sure it sets up wallet ... first	2018-09-26 15:21:53 -07:00
Wayne Chen	db77cbcbc1	new location drop - unparent overlays	2018-09-26 15:12:48 -07:00
Zach Fox	6a3fa28fad	Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps	2018-09-26 15:12:04 -07:00
Zach Fox	9a21354c27	Merge branch 'notificationsForFourApps' of github.com:zfox23/hifi into notificationsForFourApps	2018-09-26 15:08:20 -07:00
Howard Stearns	940db4f112	fix recently introduced bug	2018-09-26 15:01:30 -07:00
Zach Fox	6877af04f1	Fix GOTO notifs; fix WALLET notifs (pending backend change)	2018-09-26 14:57:32 -07:00
Ryan Huffman	09b2565e76	Remove UndoStack API ... edit.js shares a global undo stack through the UndoStack API. Because the stack is globally shared, disabling the feature while create is disabled doesn't make a lot of sense because it might disabling the ability to undo/redo with another feature. Because UndoStack is only used by edit.js, UndoStack is being removed in favor of a local undo stack implemented within edit.js.	2018-09-26 14:43:11 -07:00
Wayne Chen	db41a1c16b	error state signal for 404/interstitial	2018-09-26 13:48:15 -07:00
John Conklin II	7df90881cd	Merge pull request #14007 from kkurian/marketplace-item-tester ... Marketplace item tester interface	2018-09-26 11:25:53 -07:00
John Conklin II	d1771b2928	Merge pull request #14058 from danteruiz/fix-dispacther-module-order ... fix equip while keeping new functionality	2018-09-26 11:06:45 -07:00
Dante Ruiz	fa5dfb6e28	Merge branch 'master' of github.com:highfidelity/hifi into update-interstitial	2018-09-26 09:18:12 -07:00
Wayne Chen	4a87773986	fixing interstitial page, clearing up debug statements	2018-09-26 07:41:18 -07:00
David Rowe	496e0a6304	Update teleport FBX models	2018-09-26 17:20:56 +12:00
Wayne Chen	3e5e324c7e	parenting text to head	2018-09-25 20:39:22 -07:00
Wayne Chen	54f800fbda	including images/parent buttons to text	2018-09-25 20:21:05 -07:00
Kerry Ivan Kurian	28ec98be9e	Uninstall marketplace item tester on wallet shutdown	2018-09-25 19:24:46 -07:00
Wayne Chen	42579f3d16	fixing oops dialog text index lookups	2018-09-25 18:21:51 -07:00
Wayne Chen	26b6967ba6	adding overlays to redirect domain	2018-09-25 18:16:18 -07:00
Kerry Ivan Kurian	e6249e690e	Remove duplicate line	2018-09-25 15:52:26 -07:00
Kerry Ivan Kurian	ff83713365	Use persistent object id counter	2018-09-25 00:58:01 -07:00
Kerry Ivan Kurian	ca1da9c830	Implement delete-from-list functionality in marketplace item tester	2018-09-25 00:57:59 -07:00
Kerry Ivan Kurian	505e08b841	Resolve merge conflicts	2018-09-25 00:57:43 -07:00
David Rowe	a00cacc03e	Fix post-teleport display; hide immediately avatar moves	2018-09-25 16:02:19 +12:00
Zach Fox	1ac2800e18	Fix wallet dot logic	2018-09-24 17:50:37 -07:00
Zach Fox	be304ea975	Small bugfixes again	2018-09-24 17:33:23 -07:00
David Rowe	03f0b95a3f	Fix unwanted hexagonal occlusion artefact	2018-09-25 12:03:41 +12:00
David Rowe	7396bf0dbe	Immediately hide post-teleport play area if start teleporting again	2018-09-25 11:39:41 +12:00
David Rowe	06b4f51a08	Misc fixes	2018-09-25 11:33:08 +12:00
Kerry Ivan Kurian	697f556a60	Persist list of marketplace items in test ... The list of resources between runs of the marketplace item tester now persist between runs of the tester.	2018-09-24 16:30:49 -07:00
David Rowe	90ef109476	Remove superseded Pointers API functions	2018-09-25 11:11:53 +12:00
Dante Ruiz	57ae8ff8a1	update interstitial page stability count and loading bar	2018-09-24 16:09:53 -07:00
David Rowe	4927ffece3	Misc fixes	2018-09-25 10:33:49 +12:00
David Rowe	991ceb643c	Fix teleport not working after script reload in HMD mode	2018-09-25 10:18:52 +12:00
David Rowe	858abaf6fc	Fix sensor overlays not displaying after re-enter HMD mode	2018-09-25 09:49:11 +12:00
Zach Fox	a76c3f028d	Small bugfixes	2018-09-24 14:46:00 -07:00
Howard Stearns	71cff45fbb	Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2	2018-09-24 14:38:21 -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
Howard Stearns	d3391b9273	Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2	2018-09-24 13:50:52 -07:00
John Conklin II	1f6f51993d	Merge pull request #14029 from huffman/fix/keyboard-logging-in-edit ... Remove verbose logging of keyboard messages in edit.js and gridTool.js	2018-09-24 12:54:43 -07:00
John Conklin II	9916496118	Merge pull request #14041 from huffman/fix/entity-list-no-highlight-74 ... Fix entity list selection failing when selecting entities not in list	2018-09-24 11:02:36 -07:00
David Back	df48c60a8f	further improvements/fixes	2018-09-24 10:28:37 -07:00
Zach Fox	57c303440b	Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps	2018-09-24 09:32:53 -07:00
David Back	074c3f2c7c	Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView	2018-09-24 09:23:44 -07:00
Dante Ruiz	5a8ab61426	Merge branch 'master' of github.com:highfidelity/hifi into update-interstitial	2018-09-24 09:21:36 -07:00
David Rowe	5ff2c36917	Get play area displaying and working again	2018-09-24 15:53:47 +12:00
David Rowe	e29b403abc	Merge branch 'master' into M18586 ... # Conflicts: # interface/src/raypick/PointerScriptingInterface.cpp # interface/src/raypick/PointerScriptingInterface.h # interface/src/raypick/StylusPointer.h # libraries/pointers/src/Pointer.h # scripts/system/controllers/controllerModules/teleport.js	2018-09-24 11:44:28 +12:00
Dante Ruiz	d4450ac780	fix equip and keeping new functionallity	2018-09-21 15:59:00 -07:00
David Kelly	fe9b972c80	Do not have active buy button on invalidated items	2018-09-21 15:46:57 -07:00
John Conklin II	ea7bc26ad8	Merge pull request #14038 from wayne-chen/fixInterstitialButton ... Fix Interstitial GoTo button stretch	2018-09-21 11:44:48 -07:00
Dante Ruiz	d3368146ce	saving work	2018-09-21 11:42:26 -07:00
Zach Fox	6284074ff9	Don't show banner when app is open but continue updating data	2018-09-21 10:47:59 -07:00
David Back	506b9d8645	more fixes for deleting/selecting, potential optimizations	2018-09-21 10:02:41 -07:00
David Rowe	b1bbcb9e5e	Tidying	2018-09-21 13:48:28 +12:00
David Rowe	9426f72652	Make mini tablet disappear when using grip the same as the trigger	2018-09-21 13:45:10 +12:00
David Rowe	eac1666e01	Disable grabbing the mini tablet with the grip button	2018-09-21 12:44:55 +12:00
David Rowe	0ae7fdc7b1	Remove ability to grab the mini tablet with the other hand	2018-09-21 12:02:46 +12:00
David Rowe	5719b7020d	Merge branch 'master' into M17428-f	2018-09-21 10:47:56 +12:00
Zach Fox	33c04631ea	Comments on Confluence doc	2018-09-20 14:37:46 -07:00
Kerry Ivan Kurian	ae4352f450	Rez entity in marketplace item tester	2018-09-20 13:55:22 -07:00
Ryan Huffman	1ee655c8f8	Fix sorting of entity list not working as expected	2018-09-20 13:51:00 -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	72adfb7ff0	Fix entity list selection failing when selecting entities not in list	2018-09-20 13:46:22 -07:00
Zach Fox	87e91a4401	GOTO doesn't care about SINCE; reduce data for PEOPLE	2018-09-20 13:36:50 -07:00
Wayne Chen	8bd698b143	leaving button in natural dims	2018-09-20 11:13:27 -07:00
David Back	e1758c7974	CR changes	2018-09-20 11:08:01 -07:00
Zach Fox	ed84b49ece	Small bugfixes and using original endpoints	2018-09-19 16:15:59 -07:00
Howard Stearns	d644a63990	consistent/usefull checkout flow when you don't have enough money.	2018-09-19 16:00:40 -07: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
David Back	e701c79984	Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView	2018-09-19 14:06:28 -07:00
David Back	46c8083fb9	only call selectEntity one time per trigger	2018-09-19 10:13:15 -07:00
Zach Fox	f70ecdad16	Small bugfix	2018-09-18 17:00:53 -07:00
Zach Fox	9db11aeda7	Bugfixes and new algo for PAL notifs	2018-09-18 16:35:53 -07:00
Zach Fox	4987164706	Notifications for GOTO (using a cool algorithm)	2018-09-18 15:30:43 -07:00
Zach Fox	55a0f77697	Notifications for MARKET	2018-09-18 14:45:14 -07:00
Zach Fox	a97f9eb79a	Logic for Wallet notifications; some bugfixes	2018-09-18 12:28:03 -07:00
Zach Fox	d487914656	Prevent text notification from appearing when not necessary	2018-09-18 11:28:59 -07:00
Kerry Ivan Kurian	f2a046da91	Install marketplace item tester	2018-09-18 00:08:09 -07:00
Zach Fox	c453594eb7	Overhaul notification logic for PAL	2018-09-17 14:41:18 -07:00
Zach Fox	143a059b16	Small changes to AppUI and PAL	2018-09-17 11:11:36 -07:00
Zach Fox	23fab0985b	Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi	2018-09-17 11:11:21 -07:00
David Rowe	5b3d92e816	Persist showing mini tablet for a while after it would otherwise hide	2018-09-16 08:09:26 +12: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 Rowe	9d051b71bb	Fix mini tablet sometimes flipping when grabbed by other hand	2018-09-15 10:14:22 +12:00
John Conklin II	65ef04ae75	Merge pull request #13937 from luiscuenca/stt_teleport_wip ... Safe Teleport Target	2018-09-14 15:11:18 -07:00
Zach Fox	9c5544af39	Merge in big work from appui_notifications branch	2018-09-14 14:37:04 -07:00
Zach Fox	9e50904376	Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi	2018-09-14 14:36:22 -07:00
luiscuenca	04e6225a95	Threshold back	2018-09-14 11:22:47 -07:00
luiscuenca	8c9173b639	Safe landing for discrepancies	2018-09-14 11:06:30 -07:00
David Back	86972cf4fb	Merge pull request #13992 from dback2/entityListSearchCase ... Fix entity list search case-sensitivity and allow id search	2018-09-14 10:58:44 -07:00
Howard Stearns	4378f5bf1c	Merge pull request #13996 from howard-stearns/text-tuning-for-wallet-setup-cta ... Text tuning for wallet setup call to action	2018-09-14 10:17:22 -07:00
David Back	296e2ba488	lowercase search term at start	2018-09-14 09:57:27 -07:00
Gabriel Calero	cb49635627	Fix switch from Top View to My View	2018-09-14 13:34:04 -03:00
howard-stearns	685b2978ce	Text tuning for wallet setup call to action	2018-09-14 08:26:25 -07:00
David Rowe	45281960af	Don't display mini tablet if user is away	2018-09-14 20:30:17 +12:00
David Rowe	80aa74600f	Fix mini tablet sometimes remaining parented when it shouldn't be	2018-09-14 20:15:08 +12:00
David Rowe	ba56457663	Smooth the transition between expanded mini tablet and tablet proper	2018-09-14 20:14:54 +12:00
David Rowe	f01ebe57ea	Trial hiding the UI when it's expanding to become the tablet proper	2018-09-14 18:55:29 +12:00
unknown	f9480c24a5	store search term lower	2018-09-13 20:07:49 -07:00
unknown	ae2005b8c4	Merge branch 'master' of https://github.com/highfidelity/hifi into entityListSearchCase	2018-09-13 19:37:16 -07:00
luiscuenca	fb37e13aae	fix hat stand fail	2018-09-13 18:21:22 -07:00
David Back	b65bd6736f	also allow search using entity id	2018-09-13 18:20:11 -07:00
Wayne Chen	53582bddcd	pushing more changes	2018-09-13 17:26:08 -07:00
Wayne Chen	bf7dd94db7	button was clipped; adding higher res img	2018-09-13 17:25:33 -07:00
Wayne Chen	2b8aebdb6b	Revert "Merge branch 'master' into fixGoToButtonInterstitial" ... This reverts commit b4b0c519f3, reversing changes made to aef3ed3e01.	2018-09-13 17:21:29 -07:00
Wayne Chen	40451a1fc1	Revert "Revert "Merge branch 'master' into fixGoToButtonInterstitial"" ... This reverts commit c5468fd8e9.	2018-09-13 17:21:07 -07:00
Wayne Chen	c5468fd8e9	Revert "Merge branch 'master' into fixGoToButtonInterstitial" ... This reverts commit b4b0c519f3, reversing changes made to 77d5ebf34f.	2018-09-13 17:18:49 -07:00
Wayne Chen	b4b0c519f3	Merge branch 'master' into fixGoToButtonInterstitial	2018-09-13 17:11:34 -07:00
David Rowe	fe8c237d64	Don't display mini tablet in peripheral vision	2018-09-14 11:22:31 +12:00
David Rowe	c27bb04596	Display mini tablet when it or palm is facing the camera	2018-09-14 11:10:26 +12:00
Wayne Chen	77d5ebf34f	changing button URL - typo	2018-09-13 15:47:25 -07:00
Wayne Chen	db1acb87b8	button was clipped; adding higher res img	2018-09-13 15:38:24 -07:00
David Rowe	bbfb2b1374	Merge branch 'master' into M17428-f	2018-09-14 10:36:49 +12:00
David Back	4bc046187a	fix searching case-sensitivity	2018-09-13 15:06:14 -07:00
David Back	34afe7a69a	remove fixing search cases (for separate PR)	2018-09-13 15:01:49 -07:00
David Back	56ddafed26	fix deleting scroll-away items, fix searching case sensitivity, comments	2018-09-13 14:56:12 -07:00
luiscuenca	b517808bc2	Fix smaller size avatar capsule and land on detailed mesh	2018-09-12 21:24:19 -07:00
David Rowe	4978f80f43	Don't turn on laser when mini tablet is expanding	2018-09-13 12:27:30 +12:00
David Rowe	0437c50c06	Fix mini tablet not reliably being grabbed	2018-09-13 12:20:00 +12:00
David Rowe	54dd868b3c	Rotate mini tablet to keep it "vertical"	2018-09-13 11:54:59 +12:00
David Back	430ad87c20	Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView	2018-09-12 16:17:41 -07:00
David Back	7768e08510	rename func	2018-09-12 16:06:14 -07:00
Zach Fox	5a1d074e2f	Goto now uses AppUi; lint	2018-09-12 16:04:37 -07:00
David Back	06504ade88	Merge branch 'master' of https://github.com/highfidelity/hifi into centerScaleCubeHMD	2018-09-12 16:04:22 -07:00
David Back	1b8e9ed906	get controller position from avatar frame	2018-09-12 16:02:43 -07:00
Zach Fox	01073ca18d	Lots of changes; marketplaces.js working now	2018-09-12 15:46:17 -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
John Conklin II	e243792cac	Merge pull request #13623 from wayne-chen/fixGrabWebSurface-case-16192 ... MS16192: Fix Near Grabbing After Using Web Entity	2018-09-12 12:50:44 -07:00
David Back	cf1c1296a7	fix center scale cube in hmd	2018-09-12 11:44:26 -07:00
Wayne Chen	521361293a	moving comment locations inside conditionals	2018-09-12 11:03:00 -07:00
Wayne Chen	acf34dcfdf	one more unused variable	2018-09-12 10:58:05 -07:00
Wayne Chen	8bef0d0de4	removing unused variables	2018-09-12 10:55:40 -07:00
Wayne Chen	a96e78c72d	removing debug	2018-09-12 10:54:38 -07:00
Wayne Chen	b9f0af63e1	changing check for near grabbing modules - fixes grabbing for dynamic	2018-09-12 10:38:21 -07:00
David Back	70d427f852	more fixes for resizing, deleting, selecting etc	2018-09-12 09:43:14 -07:00
Zach Fox	de2548d926	Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi	2018-09-12 09:30:00 -07:00
David Back	e191fe53ba	Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView	2018-09-12 08:58:02 -07:00
Zach Fox	6d345e506b	Marketplaces.js WIP	2018-09-11 19:42:12 -07:00
Wayne Chen	045ac4cb0d	allowing grip button for interrupting web scroll	2018-09-11 17:43:03 -07:00
Wayne Chen	63ad85215b	Merge branch 'master' into interstitalMerged	2018-09-11 17:17:33 -07:00
David Back	ac04c501cb	Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView	2018-09-11 17:13:02 -07:00
David Back	7eb05a3cc8	merge changes, fix various issues	2018-09-11 16:34:21 -07:00
David Rowe	a1c49bd2b6	Hide mini tablet if lasering or grabbing something else	2018-09-12 11:18:26 +12:00
Wayne Chen	b6c5ae2a68	staging changes	2018-09-11 15:23:40 -07:00
David Rowe	de95ee0a18	Merge branch 'master' into M17428-f	2018-09-12 09:49:29 +12:00
Dante Ruiz	b665dbe13e	finished requested changes	2018-09-11 14:18:12 -07:00
Ryan Huffman	530fa5aee9	Merge pull request #13865 from dback2/editHandleScaleImprovements ... Edit handle scale improvements	2018-09-11 12:57:47 -07:00
Zach Fox	ea04ee6d35	Wallet now uses AppUi	2018-09-11 12:37:53 -07:00
luiscuenca	fedea6e84d	Comply with review comments	2018-09-11 12:23:25 -07:00
Zach Fox	3dabd392ef	HELP app now uses AppUi	2018-09-11 12:21:02 -07:00
Zach Fox	1aaa90675c	Snapshot.js now uses AppUi	2018-09-11 12:04:39 -07:00
Wayne Chen	0a145fbe2e	Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192	2018-09-11 11:47:23 -07:00
Wayne Chen	d9e0352028	removing debug comments	2018-09-11 11:44:32 -07:00
Wayne Chen	7aae536624	adding fix to allow web scroll	2018-09-11 11:41:24 -07:00
David Back	50fed873d1	Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView	2018-09-11 09:52:25 -07:00
luiscuenca	82b662d08e	Add pick offset	2018-09-11 09:34:36 -07:00
Ryan Huffman	c7f6bf181b	Merge pull request #13943 from huffman/perf/create-profile-no-listjs ... Improvements to entity list loading times	2018-09-11 09:33:28 -07:00
luiscuenca	13de22adb3	Fix radius scale	2018-09-11 07:22:59 -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
unknown	17c3163264	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleScaleImprovements	2018-09-10 15:31:58 -07:00
Wayne Chen	1aa8b7c81b	Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192	2018-09-10 15:07:12 -07:00
John Conklin II	5a1485a4f5	Merge pull request #13968 from thoys/fix/create/reloadCrash ... MS18269: Fix Reloading Scripts with Create open crashes system	2018-09-10 15:01:43 -07:00
David Rowe	992b9f847c	Reduce near grab distance of tablet so that stylus works on tablet	2018-09-11 09:58:19 +12:00
David Rowe	16a94f827d	Fix tablet highlight not working with stylus	2018-09-11 09:51:28 +12:00
John Conklin II	29c80fc075	Merge pull request #13959 from thoys/bug/create/createPosNewEntities ... MS17841: CreateApp - Adjust default position of new entities	2018-09-10 14:45:56 -07:00
Ryan Huffman	5aa5552727	Fix PROFILE not forwarding calls when disabled	2018-09-10 14:07:25 -07:00
Ryan Huffman	0fadfd2f4c	Remove list.js in entityList.html	2018-09-10 12:14:07 -07:00
Thijs Wenker	2000954ad2	Temporary fix for reload crash MS18269	2018-09-10 20:13:06 +02:00
luiscuenca	a9f676354b	Only invisible pointers and scale fix	2018-09-10 08:54:53 -07:00
David Rowe	1faef9db8c	Fix tablet ending upside down if it expands into other grabbing hand	2018-09-09 12:07:33 +12:00
David Rowe	baf1e80445	Code tidying	2018-09-09 11:37:05 +12:00
David Rowe	5fd3f563d6	Move mini tablet down in the palm a little.	2018-09-09 10:55:05 +12:00
David Rowe	66f75e856e	Fix goto and expand displaying as hovered when redisplay mini tablet	2018-09-08 16:41:36 +12:00
David Rowe	5fcb69c724	Remove extraneous CSS	2018-09-08 16:13:36 +12:00
David Rowe	7dba2e6a2e	Merge branch 'master' into M17428-f	2018-09-08 12:45:11 +12:00
David Rowe	8eeed772eb	Update button layout	2018-09-08 12:40:36 +12:00
David Rowe	c0a153482a	Update mini tablet model	2018-09-08 11:55:47 +12:00
luiscuenca	d09391faa5	Fix invisible error	2018-09-07 12:17:40 -07:00
Ryan Huffman	3cc90d3c80	Disable profiling in entityList.js	2018-09-07 12:07:19 -07:00
Ryan Huffman	9b9785d250	Fix entity list not handling deleted entities	2018-09-07 12:04:14 -07:00
Thijs Wenker	dd6801219b	Create entities from avatar a bit lower to be able to transform them away from the user easier	2018-09-07 19:54:26 +02:00
Wayne Chen	fc4c728181	Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192	2018-09-07 10:11:34 -07:00
David Rowe	f206a8f158	Display mini tablet on hand being gazed at if there is a choice	2018-09-07 19:43:51 +12:00
David Rowe	12454d7ec7	Increase mini tablet grow/shrink time	2018-09-07 16:48:36 +12:00
David Rowe	f3cbca6cee	Change "bubble" button to "goto"	2018-09-07 16:43:21 +12:00
David Rowe	d0e73b00f7	Restructure mini tablet code	2018-09-07 15:41:30 +12:00
Dante Ruiz	45a99a9244	fixing some bugs	2018-09-06 17:55:10 -07:00
Dante Ruiz	2f9119529a	editing the interstitial page	2018-09-06 17:06:17 -07:00
David Back	b82f6d0bad	lines/spacing	2018-09-06 16:54:58 -07:00
David Back	14a3eb4c97	lines/spacing	2018-09-06 16:52:58 -07:00
David Back	0a67c49ef9	remove separate new entity list with option, fix row clicking	2018-09-06 16:50:36 -07:00
David Back	3d75d4726a	scale invertly once passing minimum	2018-09-06 16:04:59 -07:00
Dante Ruiz	98dafa3b67	fix overlayParentID	2018-09-06 14:31:49 -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
Dante Ruiz	ec2d89fd25	fixing toolbar disappering	2018-09-06 11:16:58 -07:00
Roxanne Skelly	8a20969103	Fix typo	2018-09-06 10:38:10 -07:00
Dante Ruiz	200f6d540a	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-09-06 09:59:51 -07:00
luiscuenca	01424b8179	Head Collision Pick added	2018-09-06 09:39:33 -07:00
David Back	82ed57e41f	triple list structure, added columns, sorting	2018-09-05 17:59:03 -07:00
luiscuenca	abb632afda	Update capsule when scale/load and teleport without safe landing	2018-09-05 16:51:34 -07:00
Roxanne Skelly	bb8d9c5cf0	For stories, base the notification popups off of the action_string instead of a hard-coded value.	2018-09-05 16:50:08 -07:00
Ryan Huffman	335f66d165	Add filtering support to entity list	2018-09-05 14:30:48 -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	f2cc2f1485	Update entity list UI to be updated in a single batch	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
David Rowe	f23d93add3	Fix grabbing tablet with grip not working	2018-09-06 09:17:00 +12:00
David Rowe	daae3f50c8	Increase tablet highlight outline width	2018-09-06 09:09:30 +12:00
David Back	40d4f581f5	working scrolling	2018-09-05 13:16:23 -07:00
unknown	f941026a62	new entity list view wip	2018-09-04 19:11:09 -07:00
luiscuenca	99e6e3d112	Collision Pick added to teleport.js	2018-09-04 17:18:26 -07:00
David Rowe	c41d74621e	Merge branch 'master' into M17217-b ... # Conflicts: # interface/src/raypick/PathPointer.cpp	2018-08-31 14:26:24 +12:00
David Rowe	9203bbc5d8	Don't highlight tablet when it is grabbed	2018-08-31 11:02:36 +12:00
David Rowe	f84f3b20cd	Disable near and far lasers when tablet is grabbable	2018-08-31 10:25:12 +12:00
David Rowe	ecb58a9629	Merge branch 'master' into M17853	2018-08-31 08:36:54 +12:00
Dante Ruiz	93b0f15116	addressing some feedback	2018-08-30 13:22:17 -07:00
John Conklin II	f5ebdfa233	Merge pull request #13905 from zfox23/fixPr13870 ... Fixup PR13870: Make the feature work in Master	2018-08-30 11:08:23 -07:00
Dante Ruiz	8c77820e30	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-30 09:45:41 -07:00
David Rowe	73253977fe	Merge branch 'M17428-c' into M17428-d ... # Conflicts: # scripts/system/miniTablet.js	2018-08-30 16:21:31 +12:00
David Rowe	ec20fb7edb	Reorient and reposition mini tablet	2018-08-30 16:16:49 +12:00
David Rowe	a01a5e3b39	Merge branch 'M17428-c' into M17428-d	2018-08-30 13:44:02 +12:00
David Rowe	a5c3450bfc	Tweak mini tablet UI layout	2018-08-30 13:43:31 +12:00
Zach Fox	b8cd5dd8b9	Fixup PR13870: Make the feature work in Master	2018-08-29 16:58:19 -07:00
John Conklin II	7298cb4654	Merge pull request #13888 from dback2/editControllerMapping ... Edit mode controller mapping using new platform state variables	2018-08-29 16:06:47 -07:00
John Conklin II	47ce8be526	Merge pull request #13854 from wayne-chen/fixTabletButton-case-16847 ... MS16847: Tablet button doesn't load in HMD mode	2018-08-29 13:20:04 -07:00
David Back	96d2ba660c	Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping	2018-08-29 12:05:51 -07:00
David Back	0e53fa3f8b	only focus with selection	2018-08-29 12:05:46 -07:00
David Back	dcf2074d7e	remove [ camera key, allow F to enter camera without selection	2018-08-29 11:56:37 -07:00
David Rowe	c6d0ad39c0	Merge branch 'M17428-c' into M17428-d	2018-08-29 22:13:43 +12:00
David Rowe	15fcafa2f5	Use SVGs for buttons	2018-08-29 22:13:09 +12:00
David Rowe	b338c9f6fa	Updated tiny table model and layout	2018-08-29 22:10:24 +12:00
David Rowe	91c1e1b276	Different expansion points and delta rotations if grabbed by other hand	2018-08-29 09:59:04 +12:00
David Rowe	f5c49026ab	Expand tablet after it's been released from grab by other hand	2018-08-29 09:49:42 +12:00
David Rowe	49f5d5f2b7	Display mini tablet rotated in palm	2018-08-29 08:55:46 +12:00
David Rowe	e5c733e7f2	Merge branch 'master' into M17428-c	2018-08-29 08:20:00 +12:00
David Back	511478a563	use not Mac instead of Windows	2018-08-27 18:11:19 -07:00
David Back	f81fe6b29f	add more inputs to controller mapping	2018-08-27 16:35:36 -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 Rowe	4830ba24ae	Highlight tablet when it is near-grabbable	2018-08-28 09:53:54 +12:00
David Back	b6edb2c9d6	platform states, edit controller mapping, separate mac/win delete	2018-08-27 14:53:13 -07:00
danteruiz	e4293d9ad5	fixing some entity visual problems	2018-08-26 21:50:01 -07:00
Dante Ruiz	af19849a75	fixing merge conflict	2018-08-24 15:48:42 -07:00
Dante Ruiz	3796675123	script update and visuallyReady entities	2018-08-24 15:46:39 -07:00
John Conklin II	fcdbc6c6d2	Merge pull request #13778 from SamGondelman/bloom ... Enable bloom in zone properties	2018-08-24 14:46:31 -07:00
David Back	30c6975198	maintain stretch cube position vs mouse when stretching	2018-08-24 11:53:03 -07:00
David Back	5e4e255e94	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleScaleImprovements	2018-08-24 10:15:17 -07:00
Howard Stearns	9a472fa388	Merge pull request #13870 from zfox23/wallet_autologout ... Implement Wallet Security feature - Auto Logout checkbox	2018-08-23 18:04:38 -07:00
Zach Fox	dddb2141f0	Implement Wallet Security feature - Auto Logout checkbox	2018-08-23 15:45:29 -07:00