2989 commits

Author	SHA1	Message	Date
Seth Alves	de2dd7383d	didn't need invis flag, after all	2017-03-08 15:30:49 -08:00
Dante Ruiz	ce105e0329	fix double tablets when reloading scripts	2017-03-08 22:21:57 +00:00
Dante Ruiz	881213259d	Merge branch 'master' of github.com:highfidelity/hifi into toolbar-window-dont-close	2017-03-08 21:44:20 +00:00
Dante Ruiz	59b4fa5fd7	Close toolbar windows when scripts are reloaded	2017-03-08 21:44:04 +00:00
Seth Alves	371c20ee25	hide tablet by making it not visible rather than destroying it	2017-03-08 10:33:59 -08:00
Seth Alves	66d44ac6f0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-08 09:26:51 -08:00
Seth Alves	a67f8ac0ed	Merge pull request #9807 from Menithal/21166-remove-limit ... #9761 Cloneable Improvement	2017-03-08 07:15:06 -08:00
David Rowe	950f91965d	Merge branch 'tablet-ui-edit-js' into 21197	2017-03-08 17:35:58 +13:00
Anthony J. Thibault	836c701cb3	More accurate and responsive stylus and finger touching. ... The algorithm used to detect when and where the stylus or finger is touching the tablet has been improved. * hovering the finger/stylus over the surface of the tablet should cause buttons to highlight. * flicking or using the stylus like a drum stick, should more accurately click buttons on the tablet. * stabbing the tablet quickly, should also more accurately trigger button presses. * moving the hand/stylus from behind the tablet should be less likely to cause press events.	2017-03-07 18:19:32 -08:00
Thijs Wenker	b21bd3afa9	Make the time and slider follow the record.js toolbar	2017-03-08 01:14:11 +01:00
Seth Alves	b938579598	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 11:42:44 -08:00
Andrew Meadows	1e9623e2f2	Merge pull request #9813 from druiz17/multipule-audio-fix ... removed duplicated audio devices	2017-03-07 10:00:48 -08:00
Seth Alves	f594689fa8	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 09:24:50 -08:00
Dante Ruiz	fc65723d68	corrected removing duplicate devices	2017-03-06 22:14:20 +00:00
Seth Alves	4886f1cbfc	don't run stylus-on-overlay code unless the overlay is a web3d overlay	2017-03-06 12:38:19 -08:00
Brad Hefta-Gaub	38668b6ce5	Merge pull request #9812 from sethalves/dont-auto-ungrab-overlays ... don't automatically unhook overlays from hands unless they were grabbable overlays	2017-03-06 12:32:18 -08:00
Thijs Wenker	6ded937b25	Merge pull request #9809 from Menithal/21201 ... WL#21201 Snap-together Magnetic blocks	2017-03-06 21:30:53 +01:00
David Rowe	09ecb12510	Merge branch 'tablet-ui-edit-js' into 21197 ... # Conflicts: # interface/src/ui/overlays/Web3DOverlay.cpp	2017-03-07 08:59:40 +13:00
Seth Alves	27066e89a6	Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-06 11:46:19 -08:00
Seth Alves	a2d2c41f02	remove debug print	2017-03-06 11:45:49 -08:00
Seth Alves	08e2e421e4	Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js	2017-03-06 11:08:27 -08:00
Seth Alves	eb47db4441	Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-06 11:07:22 -08:00
Dante Ruiz	b6671d92c8	removed duplicated audio devices	2017-03-06 18:46:57 +00:00
Seth Alves	6ac576c9e6	Merge branch 'master' of github.com:highfidelity/hifi into dont-auto-ungrab-overlays	2017-03-06 10:43:43 -08:00
Seth Alves	19a31d7630	don't automatically unhook overlays from hands unless they were grabbable overlays	2017-03-06 10:15:53 -08:00
Seth Alves	93246b24b0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-06 08:54:49 -08:00
Brad Hefta-Gaub	781e0be0e3	Merge pull request #9806 from howard-stearns/preserve-audio-data-during-pal-refresh ... preserve audio data during pal refresh	2017-03-06 08:45:46 -08:00
Seth Alves	c677326025	Merge pull request #9754 from hyperlogic/feature/fingers-on-tablet ... Touch the tablet with your finger	2017-03-04 11:58:47 -08:00
Menithal	ea3f7f0274	Initial Magnetic block	2017-03-04 18:50:30 +02:00
Menithal	d85cb645b0	Changed limit logic, default limit is now 0 ... Clones now have a named based on the original entity id Limit is now calculated from the source instance, instead of just clone name to avoid a single box being calculated as something else Default limit is now 0, which disables limit	2017-03-04 11:42:43 +02:00
howard-stearns	15d680d4f9	preserve audio data during pal refresh	2017-03-03 16:56:12 -08:00
Anthony J. Thibault	e56f02d94f	Changed default for preferFingerOverStylus to false.	2017-03-03 14:12:04 -08:00
Seth Alves	bccfa79e8b	Merge pull request #9749 from ctrlaltdavid/21176 ... If someone else is grabbing entity you want to grab show their grab beam	2017-03-03 13:43:28 -08:00
David Rowe	6403e51d20	Merge branch 'tablet-ui-edit-js' into 21199	2017-03-04 09:00:49 +13:00
David Rowe	48ee661f02	Merge branch 'tablet-ui-edit-js' into 21197	2017-03-04 08:58:48 +13:00
Anthony J. Thibault	45febe8565	Merge branch 'master' into feature/fingers-on-tablet	2017-03-03 09:04:43 -08:00
Seth Alves	40caa1ea49	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-03 09:01:57 -08:00
David Rowe	388a144af1	Tidying after merge	2017-03-03 18:44:50 +13:00
David Rowe	482c23ead5	Merge branch 'master' into 21186 ... # Conflicts: # scripts/system/controllers/handControllerGrab.js	2017-03-03 18:38:42 +13:00
David Rowe	9384dfd89c	Merge branch 'tablet-ui-edit-js' into 21197	2017-03-03 18:05:18 +13:00
David Rowe	854292b193	Merge branch 'tablet-ui-edit-js' into 21199	2017-03-03 17:51:12 +13:00
Brad Hefta-Gaub	e655e442a0	Merge pull request #9799 from sethalves/steady-hand-lasers ... Steady hand lasers	2017-03-02 18:27:39 -08:00
Seth Alves	3b581a8dfe	merge from upstream	2017-03-02 16:35:44 -08:00
Seth Alves	155a310852	Merge pull request #9761 from Menithal/21166 ... WL#21166 Cloneable Equipment	2017-03-02 16:33:13 -08:00
Seth Alves	10cb7aab06	Merge pull request #9684 from Menithal/parent-hotkey ... WL#20856 Added Parenting Hotkeys to Edit.js Among Visual tweaks	2017-03-02 16:30:43 -08:00
ZappoMan	6400bb6319	CR feedback	2017-03-02 14:34:14 -08:00
Anthony J. Thibault	644e29a43d	disable WANT_STATE_DEBUG in handControllerGrab.js	2017-03-02 14:15:05 -08:00
Seth Alves	f321ffdf91	don't clear EDIT_SETTING flag when creating new entities	2017-03-02 13:00:52 -08:00
Seth Alves	bbfd373887	Merge branch 'steady-hand-lasers' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-02 12:51:52 -08:00
Seth Alves	9b3c16d489	get handControllerGrab overlay lines working again	2017-03-02 12:48:37 -08:00
Seth Alves	2047e0194d	Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers	2017-03-02 12:44:10 -08:00
David Rowe	b985b348ec	Merge branch 'tablet-ui-edit-js' into 21199	2017-03-03 09:43:49 +13:00
David Rowe	4d624ad256	Merge branch 'menuFix' into 21199	2017-03-03 09:42:16 +13:00
Menithal	91fa871d55	Merge branch 'parent-hotkey' of mgit:Menithal/hifi into parent-hotkey	2017-03-02 21:40:45 +02:00
Menithal	9c31f66b75	Addressed CR of 9684	2017-03-02 21:39:56 +02:00
Seth Alves	94b5e6333c	get handControllerGrab overlay lines working again	2017-03-02 11:02:06 -08:00
Ryan Huffman	1564c76ab4	Merge pull request #9792 from huffman/feat/hand-controller-drop ... Add Hifi-Hand-Drop so scripts can cause grabbed items to be dropped	2017-03-02 10:51:35 -08:00
Seth Alves	9d4445fd61	Merge branch 'steady-hand-lasers' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-02 10:07:37 -08:00
Seth Alves	cf37845f9e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-02 10:06:38 -08:00
Seth Alves	8893c4770e	Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers	2017-03-02 10:02:33 -08:00
Seth Alves	93055a67a8	use new-style hand-lasers for both hands	2017-03-02 10:01:08 -08:00
ZappoMan	9e71801ae1	remove properties from RayToEntityIntersectionResult	2017-03-01 18:21:04 -08:00
Anthony J. Thibault	4f03c06a94	Added General Preference to control stylus vs finger usage ... By default the finger is preferred over the stylus.	2017-03-01 18:07:53 -08:00
Seth Alves	7f6b803652	3d-line-overlays can now have an endParentID and endParentJointIndex	2017-03-01 17:27:32 -08:00
Dante Ruiz	58c1a2fb99	Merge branch 'master' into menuFix	2017-03-02 00:55:18 +00:00
Seth Alves	7c4869eb73	fix up parenting for 3d line overlays, have handControllerGrab use a child overlay for search/far-grab so the updates are smoother	2017-03-01 16:10:07 -08:00
David Rowe	9f56d2f6f6	Make tablet general settings dialog naming more consistent with desktop	2017-03-02 12:30:36 +13:00
Menithal	231ebef117	Removed stray debugPrint	2017-03-02 01:01:57 +02:00
Menithal	fd1fded276	Fixed Clone instancing issues	2017-03-02 00:59:45 +02:00
Anthony J. Thibault	d142c3d69b	eslint fix	2017-03-01 13:29:24 -08:00
Anthony J. Thibault	f418457100	Index finger touch support for the tablet-ui.	2017-03-01 13:28:17 -08:00
David Rowe	6fafc829e1	Merge branch 'menuFix' into tablet-ui	2017-03-02 09:28:35 +13:00
David Rowe	f60c2f8ec9	Merge branch 'tablet-ui-edit-js' into tablet-ui	2017-03-02 09:27:09 +13:00
Menithal	82236bdcb9	Merge remote-tracking branch 'upstream/master' into 21166	2017-03-01 22:09:29 +02:00
Menithal	f538ac24f3	Various Properties	2017-03-01 22:07:02 +02:00
David Kelly	45293ab130	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-03-01 12:55:54 -07:00
Ryan Huffman	1c3840dc78	Add Hifi-Hand-Drop so scripts can cause grabbed items to be dropped	2017-03-01 10:25:16 -08:00
David Kelly	efe44425a6	cr feedback, plus something I missed	2017-03-01 09:26:03 -07:00
Dante Ruiz	e2479a78bd	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-03-01 16:04:12 +00:00
Seth Alves	c2085ebb6e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-28 13:33:51 -08:00
David Kelly	1fc57ce9a6	alan's feedback	2017-02-28 11:51:40 -07:00
Clément Brisset	7f9437dcc5	Merge pull request #9690 from Atlante45/feat/sit ... Add hips pinning / Sit script	2017-02-28 10:41:22 -08:00
Dante Ruiz	d5714bfa6e	Merge branch 'master' into menuFix	2017-02-28 16:55:44 +00:00
Matti Lahtinen	d0c2c26a8e	One last gotcha from the conflict resolution.	2017-02-28 16:37:08 +02:00
Matti Lahtinen	e21785d5ec	Merge branch 'master' into 21166	2017-02-28 16:34:28 +02:00
David Rowe	d8d17be0e0	Rotate about translation grab position	2017-02-28 23:22:07 +13:00
David Rowe	e3f2f3c5bc	Tidying	2017-02-28 23:04:23 +13:00
David Rowe	28768d4a78	Rotate the entity by twice the rotating controller's rotation	2017-02-28 22:22:34 +13:00
David Rowe	5b6f953ac2	Add hand controller state of distance-rotating for second grab hand	2017-02-28 17:35:13 +13:00
Seth Alves	117be16c31	pull from upstream	2017-02-27 16:48:23 -08:00
Ryan Huffman	f5f7cc5266	Fix teleport seat beam color to match model	2017-02-27 16:38:55 -08:00
Ryan Huffman	aa94106229	Update teleport to sit in invisible seats	2017-02-27 16:38:55 -08:00
Ryan Huffman	40b238c12e	Add new teleport seat model + beam	2017-02-27 16:38:53 -08:00
Ryan Huffman	c632884aac	Update teleport script to handle detecting seats	2017-02-27 16:38:53 -08:00
Ryan Huffman	9197819291	Cleanup teleport to make use of new TARGET	2017-02-27 16:38:53 -08:00
Ryan Huffman	b8c7905fa4	Cleanup some duplication of code in teleport.js	2017-02-27 16:38:53 -08:00
Matti Lahtinen	b1639ee3aa	Removed a Stray Print json that would spam logs.	2017-02-27 23:40:06 +02:00
Menithal	9fbde41dc4	Styling formating and Rebuild attempt	2017-02-27 23:27:48 +02:00
David Rowe	6fcc096bcf	Fix JavaScript error	2017-02-28 10:14:38 +13:00
David Rowe	08cae1d3f2	Make other avatar's grab beam finish at entity's centroid	2017-02-28 10:02:06 +13:00
David Rowe	f4a3627b76	Make other avatar's grab beam start at more natural position	2017-02-28 09:47:36 +13:00
Dante Ruiz	21c15927cf	Homebutton dimension and position scales with tablet	2017-02-27 19:33:52 +00:00
David Rowe	31b6d528df	Merge branch 'master' into 21176	2017-02-28 08:29:44 +13:00
Dante Ruiz	19110ecfee	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-27 16:00:08 +00:00
Seth Alves	34c5d480c4	Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-02-27 06:35:50 -08:00
Seth Alves	1864975c51	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-27 06:35:22 -08:00
Menithal	1d8be2aeaa	Added missing dynamic	2017-02-26 19:17:46 +02:00
Menithal	69949cd6b5	Finalized Grab-Clone action	2017-02-26 18:49:13 +02:00
Philip Rosedale	4925b3c47c	Merge pull request #9756 from ctrlaltdavid/21122 ... Point index finger and raise thumb if not touching controller	2017-02-25 14:59:48 -08:00
David Kelly	baa7f81d79	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-02-24 18:38:57 -08:00
David Rowe	0cc499b08b	Point index fingers and raise thumbs if not touching controls	2017-02-25 14:20:23 +13:00
Dante Ruiz	73c337efd0	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-25 00:42:22 +00:00
Dante Ruiz	835b23832f	some modal clean up	2017-02-25 00:40:38 +00:00
David Rowe	a205d2a00c	Use animation for pointing index finger instead of setting joint angles	2017-02-25 11:36:06 +13:00
Seth Alves	fcd3c09404	Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js-tablet-as-overlay	2017-02-24 14:27:30 -08:00
Seth Alves	b2a35f45db	when tablet is an overlay, use the model-fbx from the distribution (local disk copy) rather than the one on s3	2017-02-24 13:04:43 -08:00
Seth Alves	eedc5c1647	don't allow tablet to get stuck to a hand when passing it back and forth between hands	2017-02-24 12:10:52 -08:00
Seth Alves	71ab6a1a84	fix a couple of problems related to grabbing tablet while edit.js is active ... Conflicts: scripts/system/controllers/handControllerGrab.js	2017-02-24 11:38:42 -08:00
Seth Alves	70060eb464	in 2d mode, clicks on tablet don't get used for other things ... Conflicts: scripts/system/libraries/entitySelectionTool.js	2017-02-24 11:37:04 -08:00
Seth Alves	73774a6590	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-24 11:34:59 -08:00
Seth Alves	f208f5e2d1	fix a couple of problems related to grabbing tablet while edit.js is active	2017-02-24 11:34:10 -08:00
David Rowe	a98824f483	Code review	2017-02-25 08:13:15 +13:00
David Kelly	d399f648d5	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-02-24 10:32:43 -08:00
David Kelly	2458f95c42	more of a peak loudness with decay, now	2017-02-24 10:31:55 -08:00
Menithal	10151c3f5b	Added Multi-userdata field updater	2017-02-24 08:04:03 +02:00
David Rowe	d9a716bf3d	If someone else is grabbing entity you want to grab show their grab beam	2017-02-24 18:42:52 +13:00
Seth Alves	e43c4c17f5	in 2d mode, clicks on tablet don't get used for other things	2017-02-23 21:27:25 -08:00
David Kelly	4a4c914ca8	First cut at new styling	2017-02-23 18:53:22 -08:00
Seth Alves	ce717d04e9	merge in tablet-as-overlay code	2017-02-23 18:40:20 -08:00
Seth Alves	610c20e01a	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-23 17:41:38 -08:00
Seth Alves	d6428ee98c	Merge pull request #6 from fayeli/tablet-edit-layout-fix ... fix overlapping issue with the delete button	2017-02-23 17:40:15 -08:00
Seth Alves	0a2a1b1637	include visible_to_others in UserActivityLoggerScriptingInterface::openedTablet	2017-02-23 15:25:09 -08:00
Seth Alves	9c0104a060	don't use Entities.getEntityProperties on tablet when it's an overlay	2017-02-23 14:55:52 -08:00
Menithal	4d98cc436b	Finished up Edit.js	2017-02-23 23:20:21 +02:00
Howard Stearns	cddba43837	Merge branch 'master' into filter-pal-by-view-distance	2017-02-23 08:25:16 -08:00
Seth Alves	37004e4347	steps toward making mouse work on tablet	2017-02-23 08:11:31 -08:00
Menithal	5c0bf690fb	Merge branch 'master' into grab-clone	2017-02-23 10:35:24 +02:00
Menithal	e95e50ad6e	Preliminary work on edit.js to allow for new param	2017-02-23 10:34:04 +02:00
Seth Alves	4a778b9113	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-22 20:39:47 -08:00
Seth Alves	84f95e6776	oops	2017-02-22 19:18:42 -08:00
Seth Alves	b4be942348	trying to get tablet overlay to show up in the right place	2017-02-22 19:18:03 -08:00
Chris Collins	b295a146e0	Merge pull request #9715 from hyperlogic/bug-fix/tablet-ui-toolbar-highlight ... More consistent highlights/toggle for toolbar buttons	2017-02-22 18:07:38 -08:00
Seth Alves	273f0130f3	fix sphere vs box check for grabbing overlays. fix newly introduced equipping bug.	2017-02-22 17:43:09 -08:00
Seth Alves	bcf1f9ab4c	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-22 16:50:29 -08:00
Seth Alves	bfc4853947	make overlays near-grabbable. make tablet be an overlay	2017-02-22 16:50:02 -08:00
Anthony Thibault	44136e550c	Merge pull request #9729 from sethalves/tablet-ui-no-haptics-for-tablet ... don't do a haptic pulse when av's hand goes near grabbable tablet	2017-02-22 15:55:01 -08:00
Chris Collins	94517057d6	Merge pull request #9721 from hyperlogic/bug-fix/tablet-ui-tablet-placement ... More consistent tablet angle when first creating the tablet.	2017-02-22 15:00:17 -08:00
Seth Alves	aed1d69377	don't do a haptic pulse when av's hand goes near grabbable tablet	2017-02-22 14:14:10 -08:00
howard-stearns	023a32563c	work around .qml settings issues	2017-02-22 12:59:40 -08:00
Seth Alves	5bff2034c3	cleanups, attempt to get particle explorer to work right	2017-02-22 12:07:18 -08:00
Anthony J. Thibault	4866be1f52	More consistent tablet angle when first creating the tablet. ... The tablet should more constantly be placed above your hand, while facing your head. It fixes the issue where the tablet would appear almost horizontal when your hand was close to your HMD and at eye level.	2017-02-21 16:01:46 -08:00
howard-stearns	2b9c69926b	Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance	2017-02-21 15:42:00 -08:00
howard-stearns	1ddc7de581	remove debugging (and fix missing brace)	2017-02-21 15:41:17 -08:00
Seth Alves	8cf71ebc65	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-21 13:54:21 -08:00
howard-stearns	aff44d682e	Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance	2017-02-21 13:45:25 -08:00
howard-stearns	15d8041683	snapshot working, before button change	2017-02-21 13:14:45 -08:00
Anthony J. Thibault	7564b6f0f5	More consistent highlights/toggle for toolbar buttons ... When the "app" for a button is visible the button should become active. Also clicking on a highlighted/active button should close the associated "app". This should be noticeable on the following tablet apps. * audio * menu * people * market * users	2017-02-21 10:59:36 -08:00
David Kelly	76229905f2	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-02-21 09:24:22 -08:00
Menithal	3d8c389879	Merge branch 'master' into grab-clone	2017-02-21 07:45:36 +02:00
Seth Alves	92580a977b	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-20 13:54:12 -08:00
Philip Rosedale	5c782deb4d	Merge pull request #9701 from ctrlaltdavid/21175 ... Fix laser beam jumping upon grabbing entity	2017-02-20 13:37:11 -08:00
Seth Alves	43f47c1106	merge from upstream	2017-02-20 12:45:39 -08:00
Seth Alves	70c9853189	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-20 12:38:13 -08:00
Menithal	d9f86612de	Fixed view toggle, Added new Notifications ... - View Toggle now only toggles if no other modifiers are pressed - More notification, and cases for notification - Parenting to existing parent - Unparenting when there is no parent - Unparenting single entities	2017-02-19 20:18:11 +02:00
Menithal	2a4b493de5	Changed order on Menu	2017-02-19 18:24:56 +02:00
Menithal	9b8503eba5	Initial Grab Clone	2017-02-19 18:18:38 +02:00
Menithal	f3c806e910	Revert of hotkey detection, removed menu hotkeys ... - Holding hotkeys will no longer spam parent events rapidly, detects only the release	2017-02-18 18:33:00 +02:00
Menithal	0df6305f90	Revert removal of hotkey from js event	2017-02-18 18:22:01 +02:00
Menithal	dcbe3c622d	Added Hotkey Listening to the webview ... Ctrl + P and Ctrl + Shift + P are now available even if the edit window has been selected	2017-02-18 11:51:19 +02:00
David Rowe	71ba38afb0	Process controller and script updates only when finger painting is on	2017-02-18 21:28:30 +13:00
David Rowe	05c63e16ca	Send messages local only	2017-02-18 20:40:27 +13:00
David Rowe	6827a28807	Fix grab position	2017-02-18 16:36:14 +13:00
David Rowe	692fa52aca	Disable drawing pointer lasers while painting	2017-02-18 15:21:48 +13:00
David Rowe	2c02b42c96	Finger paint button icon files	2017-02-18 14:21:54 +13:00
David Rowe	0689557ba5	Draw smoother lines	2017-02-18 13:39:59 +13:00
David Rowe	777a0b51c1	Ignore spurious finger tip position values	2017-02-18 13:35:16 +13:00
David Rowe	784009a9fa	Merge branch 'master' into 21168	2017-02-18 13:20:39 +13:00
Seth Alves	def669364b	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-17 15:45:19 -08:00
Menithal	f5d266a562	Updated	2017-02-17 23:28:28 +02:00
Seth Alves	39e1edafd2	merge from upstream	2017-02-17 13:16:12 -08:00
David Rowe	2c5782e4bb	Fix laser beam jumping upon grabbing entity	2017-02-18 09:11:04 +13:00
Seth Alves	5ddcbae934	save tablet web-overlay ID in HMD interface. don't trigger edit affordances if the click was intented for the tablet	2017-02-17 11:51:23 -08:00
Seth Alves	47cdade1e9	fix home-button on tablet	2017-02-17 11:47:37 -08:00
Seth Alves	0d10667bb4	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-17 09:58:33 -08:00
David Kelly	51246a2e45	first cut, pretty ugly	2017-02-17 10:24:01 -07:00
Menithal	f211f015d7	Merge branch 'master' into parent-hotkey	2017-02-17 19:22:28 +02:00
David Rowe	3712aea861	Handle trigger values of 1.0 not repeating	2017-02-17 19:31:53 +13:00
David Rowe	bdfc9fd418	Tidying	2017-02-17 19:31:40 +13:00
David Rowe	25761adf6c	Erase closest line	2017-02-17 19:31:25 +13:00
David Rowe	9c1bb37a34	Paint lines	2017-02-17 19:31:11 +13:00
David Rowe	5236f123c1	Interpret trigger and grip values	2017-02-17 19:30:57 +13:00
David Rowe	7b36669d80	Point index finger while painting if tablet not displayed	2017-02-17 19:30:40 +13:00
David Rowe	867e24762b	Disable lasers and grabbing while painting if tablet not displayed	2017-02-17 19:30:23 +13:00
David Rowe	bad57fa03f	Controller and painting code framework	2017-02-17 19:30:04 +13:00
David Rowe	585691f71c	Add finger painting button to tablet	2017-02-17 19:29:11 +13:00
Anthony J. Thibault	47e87e1ad4	Bug fix for clara.io marketplace	2017-02-16 17:41:36 -08:00
Anthony J. Thibault	2ea88012f9	Remove toolbar from tablet-goto.js	2017-02-16 17:36:16 -08:00
Anthony J. Thibault	345f0519ef	Removed use of Toolbar API for most default scripts.	2017-02-16 17:29:35 -08:00
Seth Alves	b6b6ad780d	allow isSpotlight to be 0 or 1	2017-02-16 17:15:52 -08:00
Anthony J. Thibault	cffdecbf68	Merge branch 'master' into feature/toolbar-tablet-switcheroo	2017-02-16 16:28:43 -08:00
Anthony J. Thibault	7f95753a1e	Prevent tablet from being open while in toolbarMode	2017-02-16 16:18:51 -08:00
howard-stearns	6e3ae1fe4f	cleanup some accumulated cruft in pal code	2017-02-16 10:53:02 -08:00
Menithal	afbf4bc30f	Fixed Parenting/Unparenting Menu Removal and Binding	2017-02-16 10:52:42 +02:00
Menithal	d96f95a7e9	Updated edit.js and selection tool ... Last selected entity will now be yellow instead of orange	2017-02-16 10:05:59 +02:00
Seth Alves	12b8a77488	in edit.js, convert entity property ID to be a text-field so the data can be copied	2017-02-15 16:29:50 -08:00
Seth Alves	3d7733219c	edit's open-asset-browser button works, again	2017-02-15 16:15:18 -08:00
Seth Alves	e030a4a518	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-15 15:20:14 -08:00
Seth Alves	33c1c3ac11	when a new particle-entity is created, hook the particle explorer to it	2017-02-15 15:19:49 -08:00
Seth Alves	076b0ed3ab	get particle explorer working, again	2017-02-15 15:00:25 -08:00
Menithal	856cdcbd28	Merge remote-tracking branch 'origin' into parent-hotkey	2017-02-16 00:38:01 +02:00
Menithal	c3021ae60d	Fixing Menu Items for Parenting / Unparenting	2017-02-15 22:21:29 +02:00
Seth Alves	3ea0f6d2d2	allow lasers to scroll tablet while in edit-mode	2017-02-15 11:34:48 -08:00
David Kelly	5184cbe615	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2	2017-02-15 12:08:55 -07:00
Seth Alves	a19bc31a78	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-15 10:51:22 -08:00
Seth Alves	792c7ff51f	PointerEvent will now relay keyboard modifiers	2017-02-15 10:41:56 -08:00
Faye Li	2388ec65fe	Merge pull request #9659 from fayeli/users-fix ... Tablet Users Fixes	2017-02-15 10:25:06 -08:00
Faye Li	8aae2aa5f0	simpler filter code	2017-02-15 10:23:36 -08:00
Faye Li	5ece3f1e1a	use new users icon	2017-02-15 10:16:20 -08:00
Menithal	655c49d9c0	edit.js: started to work on Parenting via hotkey	2017-02-15 19:50:15 +02:00
Menithal	7b02d1073a	Added a generic Window Notification for Feedback ... This allows to use the existing Pop-up notifications for generic notification messages	2017-02-15 19:49:31 +02:00
Seth Alves	219e569014	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-15 07:25:39 -08:00
Philip Rosedale	01bdac49d0	Merge pull request #9672 from ctrlaltdavid/21121 ... Fix far grabbing making entity jump upon grab	2017-02-14 17:02:42 -08:00
Anthony J. Thibault	912e8aa04a	Tablet buttons now work in toolbar. ... Switching between tablet and toolbar is not as dynamic as I'd like but it's a start.	2017-02-14 15:37:24 -08:00
Anthony J. Thibault	f8055a027e	Refactor of pal.js to dynamically switch between toolbar and tablet.	2017-02-14 15:34:24 -08:00
Seth Alves	838d7f6f10	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-14 13:58:18 -08:00
Seth Alves	3a23ec86d5	handles etc work better	2017-02-14 13:57:48 -08:00
David Rowe	625f5efdf8	Merge branch 'master' into 21164 ... # Conflicts: # scripts/system/audio.js	2017-02-15 10:00:52 +13:00
Chris Collins	442e8d68ef	Merge pull request #9650 from kunalgosar/browserFix ... Added isAway (paused) property to myAvatar	2017-02-14 11:16:07 -08:00
Dante Ruiz	46cfa7cf13	saving work	2017-02-14 07:46:31 -08:00
Dante Ruiz	61912b6ff0	saving work	2017-02-14 07:46:31 -08:00
Seth Alves	d40402faae	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-14 06:53:34 -08:00
Seth Alves	4393bc3c2e	Merge pull request #9656 from humbletim/21114-part1 ... CR-1 21114 -- ScriptCache/ScriptEngine cleanup, loader states, accessible load errors	2017-02-14 06:49:05 -08:00
Seth Alves	30c46b89a0	Merge pull request #9668 from hyperlogic/feature/remove-tablet-color-effect ... Removed ColorOverlay from TabletButton, added more icon & text states	2017-02-14 06:16:59 -08:00
David Rowe	2672b8d10a	Fix tabs	2017-02-14 17:30:56 +13:00
David Rowe	61f8631a2b	Fix far grabbing making entity jump upon grab	2017-02-14 17:30:20 +13:00
Faye Li	a57a0435c1	fix overlapping issue with the delete button	2017-02-13 15:13:10 -08:00
Anthony J. Thibault	1c783031b1	Removed ColorOverlay from TabletButton, added more icon & text states ... Now uses separate images for each state. Now tabletButtonProxy has 4 state properties, one for icon and images. * icon * hoverIcon * activeIcon * activeHoverIcon * text * hoverText * activeText * activeHoverText Updated scripts to set new button states, if necessary.	2017-02-13 15:09:46 -08:00
Faye Li	f981f21aa4	fix for ozan's domain	2017-02-13 11:47:58 -08:00
Atlante45	512bb4765f	Add entity clicks capture capabilities	2017-02-13 11:34:30 -08:00
Faye Li	27057190ce	display users even if they dont have a domain name	2017-02-13 11:01:37 -08:00
Faye Li	8cc8f2c7fd	highlight current visibility option	2017-02-13 10:51:01 -08:00
Faye Li	6e0d7bb3cf	make visibility settings into a modal for better readability	2017-02-13 10:42:07 -08:00
humbletim	831bf93500	* refactor ScriptCache per FIXMEs ... * include error details in BatchLoader results * update EntityServerScript properties in edtior to reflect more granular statuses * ScriptEngine plumbing in prep for require/module integration	2017-02-11 04:47:31 -05:00
David Rowe	77f0fb1491	Change the "Mute" tablet button to "Audio"	2017-02-11 22:40:19 +13:00
kunalgosar	a8f223518c	modified away script to use MyAvatar.isAway property	2017-02-10 17:28:12 -08:00
Faye Li	65ca0c7e4a	sticky header bar	2017-02-10 17:27:02 -08:00
Seth Alves	44aa3e044b	make it so near grabbing while edit is active doesn't select a new entity	2017-02-10 16:56:53 -08:00
Faye Li	e28e16ea5e	make drop down text a little bit bigger	2017-02-10 16:56:13 -08:00
Faye Li	0ba934f543	sort online users array alphabetically	2017-02-10 16:39:14 -08:00
Faye Li	8f43ceed9d	filter out yourself from users online list	2017-02-10 16:22:30 -08:00
Seth Alves	fead52f626	put new-entity buttons in a tab of the edit app	2017-02-10 15:18:01 -08:00
Seth Alves	0b358a2ac7	finish hooking up new-model dialog	2017-02-10 13:29:06 -08:00
David Rowe	b5b92c1508	Make the tablet's mic icon reflect the current mute state	2017-02-11 09:53:02 +13:00
Seth Alves	3171ce1602	hook up more of new-model dialog	2017-02-10 12:03:26 -08:00
David Rowe	8a995cc1d2	Display list of audio input devices before list of audio output devices	2017-02-10 20:14:52 +13:00
David Rowe	9e3d8b0b6d	Move the audio devices list into the root audio dialog	2017-02-10 20:11:20 +13:00
David Kelly	5ca80803c0	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2	2017-02-09 20:01:43 -07:00
Seth Alves	7a63b07462	attempting to handle new-model dialog	2017-02-09 17:14:10 -08:00
Seth Alves	24fc9bbe67	honor HUDUIEnabled setting	2017-02-09 15:12:01 -08:00
Seth Alves	e12c77e576	move the edit tabs into tablet	2017-02-09 14:43:44 -08:00
Seth Alves	c4ac719d2c	merge from upstream + cleanups	2017-02-09 14:26:29 -08:00
Seth Alves	4c3a6842a5	start on moving edit.js to tablet	2017-02-09 14:03:01 -08:00
Dante Ruiz	0e83e5da06	minimize diff	2017-02-09 07:13:30 -08:00
Dante Ruiz	580216c3d2	adding tablet-goto.js	2017-02-09 07:13:30 -08:00
Dante Ruiz	5c5ace7c7b	goto in tablet	2017-02-09 07:13:29 -08:00
Philip Rosedale	c9c04a9afc	Merge pull request #9638 from PhilipRosedale/fixRescale ... Fix rescale avatar bug	2017-02-08 22:09:41 -08:00
Seth Alves	2ec4f118fd	Merge pull request #9639 from hyperlogic/feature/tablet-pal ... Ported PAL to tablet	2017-02-08 21:17:38 -08:00
Anthony J. Thibault	c2b832fb9c	removed debug prints from pal.js	2017-02-08 18:55:22 -08:00
Philip Rosedale	e94e41698e	remove debug	2017-02-08 18:04:55 -08:00
Anthony J. Thibault	a209d0372a	First cut of pal on tablet.	2017-02-08 17:34:03 -08:00
Philip Rosedale	dc957d09d8	remove comment	2017-02-08 15:45:29 -08:00
Philip Rosedale	fe92d38b60	Fixed scaling of self	2017-02-08 15:42:10 -08:00
Clément Brisset	91bfa65fe2	Merge pull request #9586 from Triplelexx/21146 ... 21146	2017-02-08 11:07:27 -08:00
David Kelly	61e558e568	Entity Edit Filters for zones ... Part 1 - just put them in the zones entities. Next I'll hook them up and actually filter...	2017-02-08 09:53:25 -07:00
Seth Alves	47976406fc	Merge pull request #9607 from hyperlogic/bug-fix/better-haptics ... More consistent haptics on web overlays and entities	2017-02-08 05:47:05 -08:00
Anthony J. Thibault	244437d971	set WANT_DEBUG_STATE back to false	2017-02-07 23:50:06 -08:00
Seth Alves	e1a3b0c551	Merge pull request #9629 from hyperlogic/feature/tablet-2d-window-pos ... In desktop mode create tablet near mouse click location.	2017-02-07 19:51:05 -08:00
Anthony J. Thibault	cb58c567b8	In desktop mode create tablet near mouse click location. ... But prevent the tablet from being displayed off screen.	2017-02-07 18:18:34 -08:00
howard-stearns	2e88f1ab1f	conserving audio interval	2017-02-07 16:21:14 -08:00
howard-stearns	23fc9b6fb3	Merge branch 'master' of https://github.com/highfidelity/hifi into pal-performance	2017-02-07 16:00:08 -08:00
howard-stearns	3bd11978aa	low-hanging fruit on pal performance	2017-02-07 15:59:38 -08:00
Seth Alves	90fa8bf572	Merge pull request #9612 from druiz17/users ... some tweaks to users and menus got tablet	2017-02-07 15:38:43 -08:00
Triplelexx	e7244b47a9	increase LETTER_OFFSET value ... allow more room for characters, could be improved by detecting each one	2017-02-07 21:55:55 +00:00
Chris Collins	d2feb4202b	Merge pull request #9621 from sethalves/tablet-ui-track-opens-and-closes ... send UserActivityLogger events when tablet is opened or closed	2017-02-07 08:23:09 -08:00
Anthony Thibault	2f09be5ead	Merge pull request #9605 from druiz17/tabletClicking ... enforce more button clicking logic	2017-02-06 20:23:16 -08:00
Seth Alves	e3af5032c0	send UserActivityLogger events when tablet is opened or closed	2017-02-06 16:49:26 -08:00
Seth Alves	68de18a3bb	Merge pull request #9610 from sethalves/tablet-ui-use-models-from-s3-again ... use tablet models from s3 until relative model urls work	2017-02-03 18:34:28 -08:00
Dante Ruiz	0c28776ea2	some tweaks to users and menus got tablet	2017-02-04 00:13:39 +00:00
Seth Alves	9f04a72a38	Merge pull request #9599 from hyperlogic/feature/tablet-ui-button-sort-order ... tablet-ui: Added sortOrder property to buttons	2017-02-03 15:20:53 -08:00
Seth Alves	f635cd8a07	use tablet models from s3 until relative model urls work	2017-02-03 15:17:33 -08:00
Anthony J. Thibault	6738c0eade	More consistent haptics on web overlays and entities	2017-02-03 12:05:30 -08:00
Dante Ruiz	2a3d0b6b17	enforce more button clicking logic	2017-02-03 19:13:57 +00:00
Chris Collins	bac5bd5c0e	Merge pull request #9595 from hyperlogic/bug-fix/tablet-ui-bugfixes ... tablet-ui: Bug fixes	2017-02-02 17:53:47 -08:00
Anthony J. Thibault	6bef9e888b	Merge branch 'master' into bug-fix/tablet-ui-no-domain	2017-02-02 17:21:20 -08:00
Anthony J. Thibault	85e01e3922	tablet-ui: Added sortOrder property to buttons ... By default user created buttons will appear after system buttons.	2017-02-02 17:18:22 -08:00
Seth Alves	f40285c688	Merge pull request #9597 from druiz17/tabletStylus ... better scrolling and fixed button touching	2017-02-02 16:56:13 -08:00
Anthony Thibault	be4fbb63cf	Merge pull request #9583 from sethalves/fix-post-tablet-edit-buttons ... fix the edit.js toolbar buttons so they don't vanish when moused-over or clicked	2017-02-02 16:01:56 -08:00
Anthony Thibault	59b33bbc53	Merge pull request #9585 from sethalves/use-local-tablet-model ... use tablet model from distribution rather than from s3	2017-02-02 16:01:15 -08:00
Dante Ruiz	0ec8071288	better scrolling and fixed button touching	2017-02-02 23:16:39 +00:00
Anthony J. Thibault	b44e5b5a1f	tablet-ui: preferences for tablet ui scaling ... One for the tablet in HMD mode, one for desktop mode. The default desktop mode scaling factor is now 75%, which should reduce the size of the for users with low resolution monitors, while still being somewhat readable.	2017-02-02 14:05:07 -08:00
Anthony J. Thibault	5890503ec0	Can now grab tablet in 2d mode even when it embedded in geometry	2017-02-02 10:56:56 -08:00
Anthony J. Thibault	9df887de2a	You can no longer scale the tablet with double-grab	2017-02-02 10:16:02 -08:00
Dante Ruiz	2af72f1a50	fixed tablet buliding up when flying fast	2017-02-02 17:03:53 +00:00
Seth Alves	4ae163ac60	hook pal audio meter up again	2017-02-01 19:01:55 -08:00
Triplelexx	05e3acf1a3	Merge remote-tracking branch 'upstream/master' into 21146	2017-02-02 01:16:51 +00:00
Triplelexx	1a58dad3ad	change age check ... check for equal to -1 instead of < 1, think this would be more suitable if undefined is returned.	2017-02-02 01:12:55 +00:00
Seth Alves	d9bdbb92ef	use tablet model from distribution rather than from s3	2017-02-01 16:55:29 -08:00
Seth Alves	6671324a33	fix the edit.js toolbar buttons so they don't vanish when moused-over or clicked	2017-02-01 16:29:12 -08:00
Faye Li	80c8748046	Revert "replace old user.js" ... This reverts commit 2340f56b53.	2017-02-01 15:37:01 -08:00
Faye Li	2340f56b53	replace old user.js	2017-02-01 15:26:40 -08:00
Faye Li	c24b6e5e5e	missing words	2017-02-01 15:13:52 -08:00
Faye Li	c16a9a955e	display correct username	2017-02-01 14:53:03 -08:00
Faye Li	9a22055c27	initialise the toggle button with correct info	2017-02-01 14:30:16 -08:00
Faye Li	3c3ff908b4	handling the visibility toggle event	2017-02-01 14:22:13 -08:00
Faye Li	6d55b3c82d	visibility toggle drop down	2017-02-01 13:45:17 -08:00
Faye Li	378fdaec8b	the missing commit - fix typo and added user info	2017-02-01 11:27:48 -08:00
Faye Li	d78c274472	Merge branch 'master' into users-jump-to	2017-02-01 10:59:32 -08:00
Faye Li	4e209399da	fix conflict	2017-02-01 10:58:03 -08:00
Faye Li	5946339782	move my changes to a different file	2017-02-01 10:52:37 -08:00
Faye Li	3f84e5778c	jump to the selected user	2017-02-01 10:45:18 -08:00
Faye Li	fc1e588588	sending and recieving jump to event	2017-02-01 10:34:54 -08:00
Seth Alves	ab8be15ce0	Merge pull request #9570 from highfidelity/tablet-ui ... Tablet ui	2017-02-01 09:38:13 -08:00
Triplelexx	5bf29f4657	improve dimensionsFromName implementation	2017-02-01 12:59:40 +00:00
Triplelexx	b5d2926605	make text entity smaller and allow dynamic resizing based on name length	2017-02-01 12:49:41 +00:00
Anthony J. Thibault	3c04f54e75	more fixes to third person tablet usage.	2017-01-31 18:22:38 -08:00
Anthony J. Thibault	008a58f9d7	Only reposition the tablet when camera mode changes, in HMD mode.	2017-01-31 18:03:48 -08:00
Anthony J. Thibault	c147b9bec0	Fix for tablets in third-person HMD mode.	2017-01-31 18:00:18 -08:00
Faye Li	59aea60be0	fill confirmation modal with data of the selected user	2017-01-31 16:16:40 -08:00
Faye Li	fda20694b3	jump to user confimation modal	2017-01-31 15:47:51 -08:00
Seth Alves	3a6a7bcc8a	put tablet version of users.js into a different file	2017-01-31 14:44:09 -08:00
Faye Li	06d797bb3b	load bootstrao	2017-01-31 14:27:17 -08:00
Triplelexx	be68f84100	update nameTag.js comments	2017-01-31 22:14:39 +00:00
Anthony J. Thibault	e2e19884bb	Tablet should work even when not connected to any domain. ... handControllerGrab.js and WebTablet.js now parents objects to the AVATAR_SELF_ID parentID, instead of using MyAvatar.sessionUUID, which is unavailable when not connected to any domain. I removed several early returns handControllerGrab.js that prevented grabbing from working if MyAvatar.sessionUUID was invalid. There were places in the EntityItem.cpp and EntityScriptingInterface.cpp C++ that would log an error if parentID was set to AVATAR_SELF_ID. This was to prevent AVATAR_SELF_ID from ever going over the network. Instead, we now prevent this by replacing all outgoing references of AVATAR_SELF_ID with the sessionID of the current node.	2017-01-31 13:52:12 -08:00
Seth Alves	d835de2fec	Merge pull request #9547 from druiz17/tabletBug ... Grabbing tablet while in edit mode	2017-01-31 13:37:11 -08:00
Seth Alves	ec67cabaf5	Merge pull request #9540 from fayeli/new-users-js ... Rework Users.js for Tablet	2017-01-31 13:36:53 -08:00
Triplelexx	f159d4c91d	create nameTag.js script ... Running the script creates a text entity that will hover over the users head showing their display name.	2017-01-31 20:45:35 +00:00
Dante Ruiz	7a4a769015	fix more editing bugs	2017-01-31 16:53:57 +00:00
Dante Ruiz	b264d84385	minimize git diff	2017-01-30 13:27:25 -08:00
Dante Ruiz	57a9d34cda	minimize git diff	2017-01-30 13:27:25 -08:00
Dante Ruiz	8879727d88	ability to grab tablet in edit mode	2017-01-30 13:27:25 -08:00
Anthony J. Thibault	98b53d1d29	Don't allow mouse dragging the tablet in HMD mode.	2017-01-30 12:07:18 -08:00
Faye Li	8e64de26a9	Merge branch 'tablet-ui' into new-users-js	2017-01-30 11:25:58 -08:00
Anthony J. Thibault	39d68828ab	Disable FXAA on tablet overlay in desktop mode. ... This introduces the "isAA" property to 3d overlays. When false, the overlay is rendered after the "Antialiasing" render pass. Ironically, disabling FXAA makes the text more readable, which is essential in 2D desktop mode. Two new shaders were introduced. simple_opaque_web_browser_overlay.slf simple_transparent_web_browser_overlay.slf These are tailored to write into the main framebuffer instead of the g-buffer.	2017-01-30 11:24:59 -08:00
Faye Li	ff1c4995af	removed unused code	2017-01-27 15:44:07 -08:00
Faye Li	8091b0ced4	button style	2017-01-27 13:33:07 -08:00
Dante Ruiz	2c7cbb1bd9	close tablet with mouse in HMD	2017-01-27 20:58:36 +00:00
Faye Li	bf51ba7195	button brings up add/remove friends page	2017-01-27 11:34:38 -08:00
Faye Li	bfbee20f43	display friends	2017-01-27 10:19:20 -08:00
Seth Alves	95d5c64e83	put a schmitt trigger in place to de-bounce tablet clicks	2017-01-26 15:09:35 -08:00
Seth Alves	c0f169e242	allow tablet-stabbers to more easily click buttons	2017-01-26 14:54:32 -08:00
Seth Alves	e3d4cae515	avoid having the snapshot script be multi-activated by a single button-click	2017-01-26 14:29:49 -08:00
Seth Alves	d85d892057	Merge pull request #9522 from fayeli/PAL-to-PEOPLE ... Tablet Button name from PAL to PEOPLE	2017-01-26 12:58:16 -08:00
Faye Li	44fc8a5fbf	update button name	2017-01-26 11:23:06 -08:00
Seth Alves	0b51b1d566	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-26 11:00:02 -08:00
Brad Hefta-Gaub	5ada689ab7	Merge pull request #9497 from ctrlaltdavid/fix-clara-download ... Fix intermittent Clara.io download crashes	2017-01-26 10:58:27 -08:00
Seth Alves	68de5c9757	Users to USERS in button	2017-01-26 10:23:38 -08:00
Seth Alves	e2b1f4b2ab	include tablet fbx with interface distribution rather than get it from s3	2017-01-26 10:20:46 -08:00
Faye Li	6a4a9bcb32	end of day commit	2017-01-25 17:53:32 -08:00
Faye Li	0a3a0e817e	polling users and displaying user count	2017-01-25 17:36:50 -08:00
Seth Alves	9497b2b7c5	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui	2017-01-25 17:16:12 -08:00
Seth Alves	129fe6ea49	dammit, emacs	2017-01-25 17:15:54 -08:00
Faye Li	b5b781f4a5	tab content switching	2017-01-25 16:59:16 -08:00
Anthony J. Thibault	2af59630fb	Better legibility of tablet in 2D with small window sizes.	2017-01-25 16:43:36 -08:00
Seth Alves	204652514e	fix some fallout from toolbar changes	2017-01-25 16:29:36 -08:00
Faye Li	5ad522668a	tabs header for everyone and friends	2017-01-25 16:29:25 -08:00
Seth Alves	c317ba8054	merge from upstream	2017-01-25 15:57:53 -08:00
Seth Alves	f382b541c7	merge from upstream	2017-01-25 15:42:33 -08:00
Seth Alves	ff8d13ecc7	get button-states for toolbar buttons working again	2017-01-25 15:38:54 -08:00
Faye Li	49a8964c4e	reference new users icon art	2017-01-25 14:43:39 -08:00
Faye Li	ce0ee610ea	a test on polling friends	2017-01-25 14:32:36 -08:00
Seth Alves	98f1664a46	use a setting to decide which UI is enabled	2017-01-25 14:17:45 -08:00
Atlante45	f540c94113	Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr	2017-01-25 13:06:49 -08:00
Seth Alves	f18094f565	make use of tablet or HUD depend on a single variable. avoid some duplicated code	2017-01-25 12:00:34 -08:00
Faye Li	f02b2ef40a	auto poll users when page loads	2017-01-25 11:59:31 -08:00
Faye Li	c7a0e609fc	created a friends button for metaverse friends page	2017-01-25 11:41:07 -08:00
Seth Alves	11d01a0c00	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-HUD-ui	2017-01-25 09:42:59 -08:00
Ryan Huffman	2bb7a7a4a6	Remove entity server script status log spam from edit.js	2017-01-25 09:32:25 -08:00
Seth Alves	7d370fb791	Merge pull request #9507 from cozza13/tablet-ui ... Changes to tablet formatting	2017-01-25 09:29:16 -08:00
Dante Ruiz	c811839163	tablet is not selectable in edit mode	2017-01-25 16:46:17 +00:00
Dante Ruiz	bc75cf5bed	removed tabs	2017-01-25 16:11:37 +00:00
Dante Ruiz	bda8b65e79	fixing spaceing	2017-01-25 16:06:40 +00:00
Dante Ruiz	a147ce3f5f	fixed load script issue	2017-01-25 08:00:41 -08:00
Chris Collins	df9bfa6eff	Changes to tablet formating ... Changes to QML and .js formating to match style of mockup.	2017-01-25 07:41:04 -08:00
David Rowe	dcd632013f	Better variable name	2017-01-25 16:37:35 +13:00
David Rowe	7e56d0fae6	Fix up Clara.io error handling	2017-01-25 16:36:06 +13:00
Seth Alves	4335bbe4fe	provide a way to switch mostly back to HUD-based ui	2017-01-24 18:48:11 -08:00
Seth Alves	ced1b61b70	close rather than attempt to repair the tablet after a domain change	2017-01-24 16:03:22 -08:00
Seth Alves	827ae7ad4d	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto	2017-01-24 15:50:12 -08:00
Seth Alves	601a35a9b6	try a different way of repairing tablet after a domain change	2017-01-24 15:49:49 -08:00
Faye Li	71b6096644	toggle menu item	2017-01-24 15:12:46 -08:00
Faye Li	5bed68ac4c	button toggle	2017-01-24 14:56:58 -08:00
Faye Li	95a92fc5eb	added tablet button	2017-01-24 14:42:28 -08:00
David Rowe	1b05ae8a82	Make handling of Clara.io download-ready state transition more robust	2017-01-25 11:00:07 +13:00
Anthony J. Thibault	432bb27119	The tablet Help button should be active if window is visible	2017-01-23 18:37:08 -08:00
Anthony J. Thibault	e30d77eba1	Tablet goto button now properly tracks address bar shown state	2017-01-23 18:37:07 -08:00
Seth Alves	353b38286a	Merge pull request #9490 from hyperlogic/tablet-ui ... For for Tablet Tilt and Oculus Touch A B buttons sending UINav events	2017-01-23 18:14:53 -08:00
Seth Alves	3496e4cc7a	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-23 16:50:41 -08:00
Anthony J. Thibault	3db8c5b4a7	Fix tilt on tablet for HMD users without hand controllers	2017-01-23 16:36:04 -08:00
Seth Alves	f2ff6fd9e7	allow stylus to work when edit.js is running	2017-01-23 15:52:40 -08:00
Ryan Downe Karpf	3f151cb3d7	Merge pull request #9483 from Atlante45/fix/rescale ... Fix Edit.js rescale for decimal values	2017-01-23 15:44:10 -08:00
Faye Li Si Fi	f8162970ec	filter out yourself from user list	2017-01-23 15:24:33 -08:00
Ryan Downe Karpf	e080746990	Merge pull request #9481 from huffman/fix/edit-collision-names ... Update the name of the collision shapes used in edit.js properties	2017-01-23 15:10:01 -08:00
Seth Alves	9d77e9937c	only make the last cm of the stylus active to avoid accidently closing tablet when grabbing base	2017-01-23 14:38:48 -08:00
Atlante45	a1962e274d	Fix rescale for 0.x values	2017-01-23 14:35:16 -08:00
Ryan Huffman	f6d5a59c8a	Fix width of edit.js dropdown to accomodate collision options	2017-01-23 14:18:56 -08:00
Ryan Huffman	d108fabd0b	Update the name of the collision shapes used in edit.js properties ... Update the names to be consistent with what is shown on the add model dialog.	2017-01-23 13:56:48 -08:00
Seth Alves	c958314918	merge from upstream	2017-01-23 13:52:01 -08:00
Philip Rosedale	45a4ec349e	Merge pull request #9467 from humbletim/21139 ... Code Review for Job #21139 - Do not allow grab or far-grab or click while editing objects	2017-01-23 13:20:57 -08:00
Seth Alves	be8bc9652b	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-23 09:44:04 -08:00
Dante Ruiz	d5427f8722	close tablet bug fix	2017-01-23 17:33:33 +00:00
humbletim	d20ac20ff2	move isInEditMode guard to setState	2017-01-23 01:31:11 -05:00
humbletim	15394056eb	* add isInEditMode to utils.js ... * update grab.js to use the latest Settings edit mode detection approach * add edit guards to handControllerGrab.js and grab.js * update edit.js to consistently initialize Setting's edit flag	2017-01-20 22:29:40 -05:00
Dante Ruiz	5c55b86be6	fix bug	2017-01-21 01:56:06 +00:00
Dante Ruiz	41bf65ed5e	home button improvments	2017-01-20 16:35:41 -08:00
Ryan Huffman	ad70431c26	Fix edit.js server script status getting reset when changing properties	2017-01-20 15:34:38 -08:00
Seth Alves	87ea9161e4	avoid bad interaction between far-grab and equip	2017-01-20 14:49:49 -08:00
Faye Li Si Fi	afc85a3afe	Don't display users who aren't in a domain	2017-01-20 13:53:09 -08:00
Seth Alves	2f08972578	Merge pull request #9460 from druiz17/touchUp ... Tablet button clickable in desktop mode && correct icons for switch	2017-01-20 12:58:41 -08:00
Anthony J. Thibault	3ebf2ebc9b	Updated tablet dimensions to better reflect mockup and 3d model	2017-01-20 12:27:44 -08:00
Dante Ruiz	58e04f8e35	home button works in desktop mode	2017-01-20 19:43:13 +00:00
Seth Alves	7f25135633	try again on haptics from touching tablet overlay with stylus	2017-01-20 11:06:35 -08:00
Dante Ruiz	672deb903c	correct switch icons	2017-01-20 10:34:09 -08:00
Seth Alves	6641f9bafd	Merge pull request #9444 from druiz17/homeButtonFix ... Home button is now an overlay	2017-01-20 10:32:31 -08:00
Seth Alves	2d220a557f	unmangle merge	2017-01-20 10:29:18 -08:00
Zach Fox	c83cd4a94a	Complex checkpoint	2017-01-20 10:24:51 -08:00
Seth Alves	c492319be2	merge from upstream	2017-01-20 10:14:11 -08:00
Seth Alves	caae804318	re-enable haptic pulse when stylus touches tablet overlay	2017-01-20 10:12:15 -08:00
Ryan Downe Karpf	03851d4188	Merge pull request #9441 from davidkelly/dk/makeUsSomeAnalytics ... Some initial analytics for PAL usage	2017-01-20 08:30:46 -08:00
Anthony J. Thibault	4e4545ac00	Updated orientation of tablet when no hand controllers are present.	2017-01-19 20:27:06 -08:00
Anthony J. Thibault	8304aa7b19	Added ability to mouse move the tablet in 2d desktop mode.	2017-01-19 18:04:08 -08:00
David Kelly	5adc2cc593	Couple improvements ... Only send one message when gain is changed. Eliminated the bool and now just sending un-personalMute, etc...	2017-01-19 17:22:39 -08:00
Dante Ruiz	e1c2c73e5f	clean up	2017-01-20 01:04:14 +00:00
Dante Ruiz	a319db3cb4	removed duplicate code	2017-01-20 00:57:48 +00:00
Dante Ruiz	1e7e4576cc	comparing with ID instead of strings	2017-01-19 16:38:55 -08:00
Faye Li	763028dad4	refresh icon	2017-01-19 15:46:02 -08:00
Faye Li	5bc0030c8f	hook up event bridge	2017-01-19 15:24:56 -08:00
Ryan Huffman	7cd19192d9	Remove dead code in entityProperties.js	2017-01-19 15:00:30 -08:00
Faye Li	bbed26c8fa	display all online users	2017-01-19 14:34:28 -08:00
Anthony J. Thibault	2c3c96b600	Fix for broken entity scrolling introduced by 23ea65e2 ... this.grabbedEntity was being cleared before entityTouchingExit transition could send the release event.	2017-01-19 14:23:43 -08:00
Seth Alves	47b59ffae3	don't save tablet to Settings when logging out or switching domains	2017-01-19 14:10:48 -08:00
Zach Fox	64ef3d5665	Merge pull request #9426 from zfox23/PAL_AdminLabel ... PAL: Admin Labels, Updated Letterboxes	2017-01-19 13:48:05 -08:00
Faye Li	23269c2efb	move refresh button to top bar	2017-01-19 13:41:36 -08:00
Ryan Huffman	c015ac1bd5	Add display of server script status to edit.js	2017-01-19 13:27:44 -08:00
Faye Li	193251eb8d	background	2017-01-19 13:11:35 -08:00
Faye Li	450b94f641	load font	2017-01-19 12:55:06 -08:00
Seth Alves	18e9b476c5	Merge pull request #9439 from hyperlogic/tablet-ui ... Improved stylus and laser input deadspot	2017-01-19 12:43:02 -08:00
Faye Li	53404caccf	top bar css	2017-01-19 12:15:27 -08:00
David Kelly	d9fbf832e2	Some initial analytics for PAL usage	2017-01-19 11:35:17 -08:00
Seth Alves	41ddfbfd27	clean up grab.js. provide a way to delete old tablets that got saved into Settings on exit	2017-01-19 11:34:38 -08:00
Faye Li	10f512306e	successfully polling all online users	2017-01-19 10:58:29 -08:00
Zach Fox	534fcd9399	Potential fix	2017-01-19 10:20:36 -08:00
Seth Alves	0e9ff7f7fc	make tablet be an avatar-entity	2017-01-19 10:12:06 -08:00
Seth Alves	eb25e1c12d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-19 09:41:49 -08:00
Chris Collins	601223aa98	Merge pull request #9402 from ctrlaltdavid/clara-tidying ... Remove a line of old code in Clara.io download	2017-01-19 09:15:58 -08:00
Dante Ruiz	30b57b62da	toggle help	2017-01-19 08:12:49 -08:00
Anthony J. Thibault	2fd691d844	Improved stylus and laser input deadspot	2017-01-18 18:23:00 -08:00
Faye Li Si Fi	5ad1cc6f4d	end of day commit	2017-01-18 18:03:16 -08:00
Seth Alves	7c938728e5	don't do constant haptics if stylus touches tablet frame. home button triggers only once per click	2017-01-18 16:56:39 -08:00
Faye Li Si Fi	75b1eba84e	initial commit for users.html	2017-01-18 16:10:42 -08:00
Faye Li Si Fi	9865f134db	go to users.html on tablet button click	2017-01-18 16:09:12 -08:00
Seth Alves	c4d85c91d0	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui	2017-01-18 15:51:54 -08:00
Seth Alves	3517daaad2	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-18 15:49:12 -08:00
Anthony J. Thibault	56c897cc2f	Process the tablet stylus even when reticle is over 2d HUD overlay.	2017-01-18 15:36:09 -08:00
Anthony J. Thibault	fc5c2c8def	Fix for glitchy scrolling	2017-01-18 15:32:38 -08:00
Anthony J. Thibault	448e3fda0c	fix for JSON parse exception	2017-01-18 15:32:37 -08:00
Anthony J. Thibault	28dac9d802	Lasers now interact with the tablet in edit mode.	2017-01-18 15:32:36 -08:00
Zach Fox	7f57251a0e	Remove logs also removed in Master	2017-01-18 13:38:19 -08:00
Faye Li Si Fi	82e0ca2423	create users tablet button	2017-01-18 13:19:19 -08:00
Zach Fox	e9d3c36873	Final commit?	2017-01-18 12:55:25 -08:00
Zach Fox	346cfbfe02	First checkpoint	2017-01-18 12:55:24 -08:00
Seth Alves	02b708feaf	Merge pull request #9419 from druiz17/buttonsMissing ... Fixed pal on tablet	2017-01-18 11:04:10 -08:00
Seth Alves	a8038ce64e	cleanups	2017-01-18 10:50:02 -08:00
Seth Alves	1f92b57bf2	switch to model stylus	2017-01-18 10:46:18 -08:00
Dante Ruiz	8172329ec3	Fixed pal	2017-01-18 10:33:58 -08:00
Seth Alves	b57803057d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-18 06:38:44 -08:00
Seth Alves	0abb41ca2d	Merge pull request #9413 from hyperlogic/tablet-ui ... clara.io marketplace works on tablet	2017-01-18 06:37:55 -08:00
Anthony J. Thibault	03f8a310fc	Fix for exception on script ending	2017-01-17 18:17:41 -08:00
Anthony J. Thibault	c6f3eb138a	Adjusted tablet spawn position and orientation to be more natural	2017-01-17 18:16:40 -08:00
David Kelly	f5300d3862	Removing some PAL-related interface log spam ... Probably more, but these _seem_ to be the worst	2017-01-17 17:06:18 -08:00
Zach Fox	7a568ed8a7	Merge pull request #9401 from zfox23/PAL_DisplayName ... PAL: Editable Display Names & Immediate Update	2017-01-17 16:00:41 -08:00
Anthony J. Thibault	56fc42a2bd	clara.io marketplace works on tablet	2017-01-17 15:38:44 -08:00
Ryan Huffman	71e039951c	Add reload server scripts button to edit.js	2017-01-17 14:47:57 -08:00
Ryan Huffman	142c7da523	Add serverScripts property support to edit.js	2017-01-17 14:47:06 -08:00
Seth Alves	89d7b8bfc6	call releaseEquip when an equipped entity is dropped with a secondary press	2017-01-17 13:27:01 -08:00
Seth Alves	5c205f5800	avoid an unhook loop if two different hands have passed something back and forth more than once	2017-01-17 10:24:30 -08:00
David Kelly	2460e89a57	CR feedback	2017-01-17 09:53:04 -08:00
Seth Alves	1eb7b668bf	merge from upstream	2017-01-17 09:33:49 -08:00
Seth Alves	6bace4f451	merge from upstream	2017-01-17 09:29:30 -08:00
David Kelly	6c07a9aece	remove debuggng logspam	2017-01-16 19:06:36 -08:00
David Kelly	6c701bb0f0	remove ignored avatars from PAL when they disconnect	2017-01-16 18:22:53 -08:00
David Rowe	a1fe908380	Remove a lingering line of old code	2017-01-17 12:56:56 +13:00
howard-stearns	0a3236dcc9	handControllerGrab update loop change	2017-01-16 14:54:32 -08:00
David Kelly	95aad3140d	Merge pull request #9386 from davidkelly/dk/manageAudioIntervalInPal ... Manage audio interval timer in PAL	2017-01-16 11:29:05 -08:00
Zach Fox	32e330320e	Cleanup after rebase	2017-01-16 11:26:57 -08:00
Zach Fox	6e4a4da92a	Checkpoint	2017-01-16 10:42:29 -08:00
Seth Alves	23ea65e2b5	more changes to handle camera-relative-controller joints.	2017-01-16 10:26:16 -08:00
Seth Alves	b617b3a114	put code to delete prim-stylus tip back in	2017-01-16 07:50:36 -08:00
Seth Alves	756d96c368	fix search ray getting left on. started adding stylus models	2017-01-16 07:46:12 -08:00
Seth Alves	c2d6bf10d2	hard-code dimensions on home-button so that it doesn't sometimes show-up with the wrong size	2017-01-16 06:47:50 -08:00
Seth Alves	4a451e95dc	don't call release when off state is entered. don't attempt to unhook stylus as a stray child	2017-01-15 11:29:29 -08:00
Seth Alves	b8234ad75c	try a different way of keeping track of original parentIDs of grabbed entities	2017-01-15 10:16:28 -08:00
David Kelly	baed3bc3b3	Manage audio interval timer in PAL ... Now, it is only running when PAL is up. Was running (but doing nothing before. Somewhat more efficient this way.	2017-01-14 12:57:00 -07:00
Seth Alves	e46b40e729	adjust overlay position so that it shows up on new tablet fbx	2017-01-13 16:14:12 -08:00
Seth Alves	e00814dd53	auto-end a near-grab if the parentID is changed to something else	2017-01-13 14:21:44 -08:00
Zach Fox	b9cddc31a9	Checkpoint before implementing Ken's suggestions	2017-01-13 13:00:03 -08:00
Zach Fox	8bb200902f	First pass	2017-01-13 12:57:35 -08:00
Seth Alves	9430d2a58d	get marketplace-in-tablet working again	2017-01-13 11:03:02 -08:00
Seth Alves	9de8144f0d	merge from upstream	2017-01-13 10:17:03 -08:00
Seth Alves	f9a36d68ad	Merge pull request #9363 from ctrlaltdavid/21127 ... Make Clara.io downloads convert textures to PNG	2017-01-13 10:14:43 -08:00
Seth Alves	208c4686c4	merge from upstream	2017-01-12 15:44:27 -08:00
David Rowe	d7ab7316a8	Tidying	2017-01-13 12:28:53 +13:00
David Rowe	ad5822d96d	Fix first progress message box not closing	2017-01-13 12:26:42 +13:00
David Rowe	632989e031	Fix progress messages not displaying in HMD	2017-01-13 12:09:22 +13:00
Seth Alves	b4870a14fa	Merge pull request #9372 from druiz17/removeHud ... Completely removed HUD	2017-01-12 14:24:40 -08:00
David Rowe	6f2386eabd	Fix processing of Clara.io status messages	2017-01-13 11:20:00 +13:00
Seth Alves	9c148d2be0	Merge pull request #9370 from sethalves/tablet-ui-no-accidental-static-on-release ... make sure dynamic things are moving at least a little upon release	2017-01-12 13:46:50 -08:00
Seth Alves	611a926894	if something dynamic is release and it's not moving, give it a little velocity so that it doesn't end up non-active in bullet	2017-01-12 13:45:03 -08:00
Dante Ruiz	71083645e9	branch update	2017-01-12 20:51:25 +00:00
David Rowe	4dee0efdd3	Use more reliable Clara.io API parameters	2017-01-13 09:12:49 +13:00
Dante Ruiz	a16b229c65	begining to remove hud items	2017-01-12 10:49:45 -08:00
Dante Ruiz	7d84aae670	closing tablet when taking snapshot	2017-01-12 17:29:38 +00:00
David Kelly	e36f6b6521	Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover	2017-01-12 08:40:04 -07:00
David Rowe	d45e6f00cb	Prepare only one download at a time	2017-01-12 22:35:42 +13:00
David Rowe	288c069687	Make cancelling downloads more robust	2017-01-12 22:31:09 +13:00
David Rowe	6e622b3719	Don't request model be centered as work-around for downloads failing	2017-01-12 21:35:24 +13:00
David Rowe	cbe8ce0c19	Improve handling of zip file generation failing	2017-01-12 21:33:32 +13:00
David Rowe	9587b6a80e	Fix initial marketplace URL	2017-01-12 20:53:57 +13:00
David Rowe	37da800a14	Display Clara model preparation progress	2017-01-12 15:47:41 +13:00
howard-stearns	88c2c534ad	don't set bogus values	2017-01-11 17:01:46 -08:00
howard-stearns	9298bcf628	remove log spam	2017-01-11 16:32:15 -08:00
howard-stearns	5c06841732	use update signal instead of timer	2017-01-11 16:24:05 -08:00
howard-stearns	357b4db1db	fix mouse vs lasers, again	2017-01-11 14:24:24 -08:00
howard-stearns	a808a8c749	revert "fix competition between seek mouse and lasers"	2017-01-11 14:23:18 -08:00
David Kelly	1e3a00d1fb	Enable the LT and RT signals, use them ... A bit cleaner. Still have to keep track of which hand is the mouse, but this removes some of the hacky code.	2017-01-11 14:43:37 -07:00
David Rowe	9bdcdf73c1	User must be logged into Clara.io site to download	2017-01-12 09:15:01 +13:00
Seth Alves	c76987c179	Merge pull request #9351 from sethalves/tablet-ui-show-lasers-when-scrolling ... update lasers when distance-scrolling a web entity/overlay	2017-01-11 10:45:25 -08:00
Seth Alves	bacc796730	Merge branch 'master' of github.com:highfidelity/hifi into update-tablet-ui-again	2017-01-11 09:54:26 -08:00
Dante Ruiz	2d8d5401dc	updated tablet position	2017-01-11 08:41:07 -08:00
David Rowe	71d6a5cb1d	Implement model request and download	2017-01-11 21:33:03 +13:00
David Rowe	530b176d09	Replace Clara download button with own	2017-01-11 16:36:18 +13:00
David Kelly	0a018e133d	Blue laser should be enough to hover	2017-01-10 18:23:39 -07:00
Seth Alves	c93d83dadd	update lasers when distance-scrolling a web entity/overlay	2017-01-10 16:41:07 -08:00
Dante Ruiz	0b3a7d90f1	removed committed code	2017-01-10 23:26:37 +00:00
David Kelly	4fade3a53e	CR feedback	2017-01-10 16:12:02 -07:00
David Kelly	5fd11ade9c	minor tweak to hover color for glow effect	2017-01-10 16:00:19 -07:00
Dante Ruiz	d0baa0e303	home button works with the stylus	2017-01-10 14:51:46 -08:00
David Kelly	2d55ed2658	Fix hover - probably my merge didn't get this line	2017-01-10 15:51:24 -07:00
druiz17	ad48e79053	Merge pull request #9346 from hyperlogic/tablet-ui ... In desktop mode, tablet is in front of camera.	2017-01-10 14:48:15 -08:00
David Kelly	17333ee307	Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover	2017-01-10 15:24:31 -07:00
druiz17	85c143e64d	Merge pull request #9347 from sethalves/tablet-ui-grab-no-patch ... remember previous parentID in the script and try to put it back when releasing	2017-01-10 14:08:08 -08:00
David Kelly	5c6ae6fe95	HMD hover working now ... Had to hack a bit -- the trigger mappings were not firing so instead I just get the hand that is triggering (when HMD is active) and handle the hover almost as before, with mouse move events. Some thought about how to map a 'mouse move' event into something where 2 triggers can both be pressed at same time was in order.	2017-01-10 14:47:34 -07:00
Anthony J. Thibault	3f0860f9c3	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui	2017-01-10 13:35:29 -08:00
Anthony Thibault	e7a88b5a3c	Merge pull request #9343 from druiz17/menuApp ... Moved the context menu to the tablet	2017-01-10 13:34:44 -08:00
howard-stearns	e67675ac36	color nodes by audio level	2017-01-10 13:24:38 -08:00
howard-stearns	42b2b2154e	store audio level in overlay data object (so that they gc properly and we ... have the data to color with).	2017-01-10 13:08:07 -08:00
Seth Alves	0fc1abc068	remember previous parentID in the script and try to put it back when releasing	2017-01-10 13:00:49 -08:00
Anthony J. Thibault	9db6806026	In desktop mode, tablet is in front of camera. ... * added a new fauxJointIndex for the camera. CAMERA_MATRIX_INDEX = -7 this can be used to attach objects to the camera. * WebTablet.js has been changed to detect when entering and exiting HMD mode to move the tablet appropriately. There's a known bug with the tablet entity position lagging the camera by one frame.	2017-01-10 11:31:45 -08:00
Seth Alves	bff9e9be38	put back code that replaces previous parentID on release	2017-01-10 09:22:36 -08:00
Dante Ruiz	2fc76d64fd	clean up unused code and files	2017-01-10 09:13:46 -08:00
Dante Ruiz	6c51edec77	added context menu to tablet	2017-01-10 09:13:45 -08:00
Dante Ruiz	c99f897db1	first commit	2017-01-10 09:13:45 -08:00
Seth Alves	eb4a2b0af5	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-grab-no-patch	2017-01-10 09:13:34 -08:00
druiz17	28c8d527df	Merge pull request #9340 from fayeli/tablet-hide-yellow ... Ability to disable yellow highlight around Web Overlays	2017-01-10 09:11:51 -08:00
Seth Alves	61f0c56a36	remove code that remembers previous state in userData	2017-01-09 14:20:03 -08:00
Faye Li Si Fi	32eda3a49c	redo	2017-01-09 14:02:14 -08:00
Faye Li Si Fi	c39eb6294e	undo	2017-01-09 14:01:59 -08:00
Faye Li Si Fi	5323e7f34d	set showKeyboardHighlight to false when initialising tablet	2017-01-09 13:36:58 -08:00
Seth Alves	fa803aebe9	use /~/ style to reference includes	2017-01-09 10:21:07 -08:00
David Kelly	fef8c8900f	Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover	2017-01-09 08:51:42 -07:00
David Kelly	409e785aa3	fix un-hover, add some comments	2017-01-09 08:42:43 -07:00
David Kelly	5eff12af34	add hover effect to PAL	2017-01-06 18:09:23 -07:00
Dante Ruiz	7205215baa	coding standard fix	2017-01-07 00:38:39 +00:00
Dante Ruiz	07079ad78d	fixed bug	2017-01-07 00:22:55 +00:00
Dante Ruiz	4ef5c76a65	fixed issues 3.0	2017-01-07 00:08:53 +00:00
Dante Ruiz	55e7b46790	fixed issues 2.0	2017-01-07 00:07:38 +00:00
Dante Ruiz	cec2692c77	fixed issues	2017-01-07 00:06:42 +00:00
Dante Ruiz	32938861cd	indentation fix	2017-01-07 00:03:04 +00:00
Dante Ruiz	31e57a0dcd	update branch	2017-01-06 15:35:32 -08:00
Dante Ruiz	19c6a672d9	re-did tablet position	2017-01-06 15:35:32 -08:00
Seth Alves	20a84e7288	Merge pull request #9322 from sethalves/tablet-ui-reenable-web-lasers ... Tablet ui reenable web lasers	2017-01-06 15:23:16 -08:00
Seth Alves	ad6175857d	Merge pull request #9328 from hyperlogic/tablet-ui ... Allow Hifi.SoundEffect to be used in all qml	2017-01-06 15:21:08 -08:00
Anthony J. Thibault	0860c50a49	Allow Hifi.SoundEffect to be used in all qml ... Including webEntities, webOverlays and the system tablet. We might want to add this to enable spatial sound effects for the web keyboard.	2017-01-06 14:01:13 -08:00
Seth Alves	d32866c8cd	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-reenable-web-lasers	2017-01-06 13:32:47 -08:00
Seth Alves	668bc35227	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-merge	2017-01-06 13:31:13 -08:00
Howard Stearns	36c99a604b	Merge pull request #9319 from howard-stearns/edit-button-to-select-in-pal ... Edit button to select in pal	2017-01-06 13:17:29 -08:00
Clément Brisset	48459be13c	Merge pull request #9312 from ZappoMan/fixMouseLasers ... fix competition between seek mouse and lasers	2017-01-06 13:11:01 -08:00
howard-stearns	2f5f53c8e4	cr	2017-01-06 10:28:09 -08:00
howard-stearns	b149fa3d79	Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal	2017-01-06 10:21:22 -08:00
David Kelly	a107b2f06e	lost my - sign	2017-01-06 08:44:22 -07:00
David Kelly	88ed96918a	Merge branch 'master' of github.com:highfidelity/hifi into dk/prettierPAL	2017-01-05 18:30:28 -07:00
David Kelly	4504b31c1d	Bugfix, plus minor cr stuff ... Seems to solve the 'due north' issue - we now have the main overlay as the sphere, and it is the only thing clickable. The model is no longer clickable, so you cannot click clouds to select things. Prevents some confusion when opaque objects have ignoreRayIntersection, allowing you to select a cloud you cannot see (i.e clicking near but not on the sphere you can see).	2017-01-05 18:20:40 -07:00
howard-stearns	83685740c4	change wording for common case	2017-01-05 16:37:40 -08:00
howard-stearns	f5c4535115	Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal	2017-01-05 16:29:34 -08:00
Seth Alves	4b3a5171d3	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-reenable-web-lasers	2017-01-05 15:43:46 -08:00
Seth Alves	2bff5582bc	Merge pull request #9321 from hyperlogic/tablet-ui ... Made back button entity collisionless	2017-01-05 15:43:14 -08:00
David Kelly	1f3c2bb271	Merge branch 'master' of github.com:highfidelity/hifi into dk/prettierPAL	2017-01-05 16:35:47 -07:00
Anthony J. Thibault	baf2fce2c3	Made back button entity collisionless	2017-01-05 15:33:21 -08:00
Seth Alves	d072b1524a	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-05 15:27:11 -08:00
Anthony J. Thibault	f63ee4ffe0	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui	2017-01-05 15:06:35 -08:00
Seth Alves	bacaadc7ca	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-reenable-web-lasers	2017-01-05 14:35:14 -08:00
Seth Alves	195b92d05d	lasers on webpage work again	2017-01-05 14:35:02 -08:00
David Kelly	ef92a091b2	node overlay model now an asset	2017-01-05 15:19:09 -07:00
David Kelly	c95e880677	scale offsets to avatar height	2017-01-05 15:04:40 -07:00
Dante Ruiz	879fb93def	bug fixed	2017-01-05 22:00:09 +00:00
howard-stearns	0670a4689f	Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal	2017-01-05 13:57:44 -08:00
Anthony J. Thibault	85de0d3bbf	Added local only spatialized button click sounds to tablet	2017-01-05 13:54:06 -08:00
Howard Stearns	bbf7d16537	process consistent select message	2017-01-05 13:45:03 -08:00
David Kelly	2949560e90	Corrected lame math error ... so we are centered now, and put the overlay up a bit higher. Still need to make that scale properly with avatar size.	2017-01-05 14:22:35 -07:00
Seth Alves	5e9c37777c	Merge branch 'fixMouseLasers' of github.com:ZappoMan/hifi into tablet-ui-reenable-web-lasers	2017-01-05 12:50:07 -08:00
Seth Alves	52ef22770b	make showing of stylus be proximity based rather than raypick based	2017-01-05 12:49:50 -08:00
howard-stearns	47aa1e4f8e	add pal to defaultScripts	2017-01-05 12:23:17 -08:00
Brad Hefta-Gaub	cb69e70781	fix competition between seek mouse and lasers	2017-01-05 11:31:50 -08:00
David Kelly	75aa32ac6a	remove some debugging crap	2017-01-05 12:01:55 -07:00
David Kelly	d5e6afa15a	slightly further forward, a little bigger	2017-01-05 11:54:50 -07:00
Anthony Thibault	c972e9ac51	Merge pull request #9301 from fayeli/tablet-button-states ... Tablet Button Active State's Text and Icon	2017-01-05 10:00:10 -08:00
David Kelly	f1d6335a24	First stab at making PAL avatar highlighting a bit prettier ... Working around rendering issues with model-based overlays and the drawInFront, we use 2 overlays. One is the model, another is a sphere with drawInFront on. Still need to dial in colors and sizes but this should be close enough for iteration.	2017-01-05 10:18:58 -07:00
Howard Stearns	12fffe8530	messages	2017-01-04 20:37:56 -08:00
Brad Hefta-Gaub	368f48f0a7	Merge pull request #9247 from huffman/feat/tutorial-touch-grip ... Add support for new Touch grip mappings to tutorial	2017-01-04 17:58:05 -08:00
howard-stearns	9709bedca7	checkpoint	2017-01-04 16:55:58 -08:00
Seth Alves	a585d43a5e	attempt to get laser-based web scrolling to work, again	2017-01-04 16:51:47 -08:00
howard-stearns	97780ac97e	color, infront	2017-01-04 16:09:15 -08:00
Seth Alves	fb4263de93	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-reenable-web-lasers	2017-01-04 16:01:06 -08:00
howard-stearns	d78b7d9a28	Merge branch 'master' of https://github.com/highfidelity/hifi into pal-show-lastEditedBy	2017-01-04 15:48:45 -08:00
Seth Alves	ed934c37ae	put code that allows lasers vs web entities or overlays back in	2017-01-04 15:23:55 -08:00
Howard Stearns	3d8da683db	Merge pull request #9290 from zfox23/PersonalMute ... Personal mute; Quasi-ignore; Reversible PAL actions	2017-01-04 14:37:09 -08:00
Zach Fox	675159be45	Last commit to fix final bugs	2017-01-04 14:33:02 -08:00
Zach Fox	ac41e8abc4	Bugfix re: population; remove user image for now	2017-01-04 14:06:51 -08:00
Zach Fox	03fbfc85f9	Short delay before populating PAL when changing domains	2017-01-04 13:50:37 -08:00
Zach Fox	c695878025	Clear local ignored list upon domain change	2017-01-04 13:31:16 -08:00
Faye Li Si Fi	934b56bd50	replace redundant toggle logic	2017-01-04 12:41:49 -08:00
Zach Fox	dde5f69ac9	More CR & simplifications	2017-01-04 12:41:30 -08:00
Faye Li Si Fi	475430c1e0	testing new active state with mute.js	2017-01-04 12:25:27 -08:00
howard-stearns	c79c489002	selecting user in pal shows entities lastEditedBy user this session	2017-01-04 11:19:32 -08:00
Dante Ruiz	4dd8a8aa0d	added new model	2017-01-04 11:09:27 -08:00
Dante Ruiz	3f34cb863e	removed whitespace	2017-01-04 11:09:26 -08:00
Dante Ruiz	f81402fb0f	improved tablet position	2017-01-04 11:09:26 -08:00
Zach Fox	14def61eb8	More CR comments; 1 bug remaining re: sig slot	2017-01-03 17:32:47 -08:00
Anthony Thibault	9502a8b0c4	Merge pull request #9294 from fayeli/tablet-mic-level ... Audio level calculation in tabletUI.js	2017-01-03 16:12:04 -08:00
Faye Li	fc186a281f	update audio bar only when tablet is shown	2017-01-03 14:37:25 -08:00
Faye Li	4391e9eaee	send the mic level from js	2017-01-03 12:57:08 -08:00
Brad Hefta-Gaub	d440532cff	make sure RPC is timely	2017-01-03 11:10:07 -08:00
Anthony Thibault	c201b6a7f9	Merge pull request #9256 from druiz17/moreButtons ... all hub button now on tablet	2017-01-03 10:44:19 -08:00
Anthony J. Thibault	00980366d6	Merge branch 'master' into tablet-ui	2017-01-03 09:45:23 -08:00
Faye Li	656ddfe287	audio level calculation in tabletUI.js	2017-01-03 09:27:33 -08:00
Brad Hefta-Gaub	82ab8635d7	debugging	2016-12-30 12:02:48 -08:00
Zach Fox	f26b7c0134	Checkpoint	2016-12-30 09:51:43 -08:00
Brad Hefta-Gaub	7c7d239e00	first cut at using wait signals to improve RPC timing	2016-12-30 09:13:21 -08:00
Zach Fox	10b5b957f2	Ahh...It's beautiful and simple now.	2016-12-29 13:09:40 -08:00
Zach Fox	bb2b48d424	Getting very close.	2016-12-29 11:35:20 -08:00
Zach Fox	af1c67a252	Progress!	2016-12-28 17:23:56 -08:00
Zach Fox	e26d347682	It seems to be working, minus removing from list	2016-12-28 15:15:39 -08:00
Zach Fox	46e8bf5283	First steps, holding off til Howard finishes	2016-12-28 15:12:21 -08:00
howard-stearns	768b747b3a	Make avatar go away when ignored, even when pal is up. (But currently, it ... comes back!)	2016-12-27 10:17:39 -08:00
howard-stearns	0ad9786f6b	requestsDomainsListData	2016-12-27 10:14:20 -08:00
Zach Fox	72da05bb30	Merge pull request #9268 from zfox23/PalRefresh ... Add PAL refresh button	2016-12-23 15:16:51 -08:00
David Kelly	68fb81902b	Merge pull request #9261 from davidkelly/dk/workingVUMetersInPal ... Working VU meters in PAL	2016-12-23 13:24:38 -08:00
David Kelly	5065f027e7	whitespace	2016-12-23 13:11:42 -08:00
Zach Fox	5490dddbbf	Cool style changes!	2016-12-23 12:22:33 -08:00
David Kelly	9eed430f49	CR feedback	2016-12-22 18:09:19 -08:00
Zach Fox	f2bdbe051c	Halve the volume	2016-12-22 16:35:12 -08:00
David Kelly	2e897e0cc9	Working first pass ... Seems roughly same as mic meter. Works for other avatars, though using agent avatars (crowd-agent.js + summon.js), seems not to work. I'll investigate that...	2016-12-22 14:01:03 -08:00
Dante Ruiz	61277c0605	Stylus now works in edit mode	2016-12-22 17:33:25 +00:00
Dante Ruiz	bf6178f500	diff minimize	2016-12-21 23:48:45 +00:00
Dante Ruiz	1753508f53	diff minimize	2016-12-21 23:31:00 +00:00
Dante Ruiz	5ed8831bee	all hud buttons on tablet	2016-12-21 23:25:40 +00:00
Zach Fox	630fb8696f	Lots of progress today	2016-12-21 12:48:26 -08:00
Zach Fox	7999e14ecf	Kinda screwed things up by changing styles	2016-12-21 12:48:25 -08:00
Zach Fox	feafc16833	Frequent checkpoints are good.	2016-12-21 12:47:38 -08:00
Zach Fox	e7c2229b2c	More progress	2016-12-21 12:46:23 -08:00
Ryan Huffman	8b5a05c409	Fix right touch controller tip labels not showing up	2016-12-20 18:01:53 -08:00
Ryan Huffman	df0dfc761d	Add ability to disable avatar and object scaling in handController grab	2016-12-20 18:01:53 -08:00
Ryan Huffman	0b2f60fb27	Update tutorial to use new trigger configuration for touch	2016-12-20 18:01:53 -08:00
Dante Ruiz	fa761af1a6	update#2	2016-12-20 15:39:17 -08:00
Dante Ruiz	8698ee61cd	commit update	2016-12-20 15:39:17 -08:00
Stephen Birarda	ebd347fc15	only respect release of secondary for hold once pressed	2016-12-20 14:46:55 -08:00
Stephen Birarda	4fcccb5455	check for release of equip in this.nearGrabbing	2016-12-20 14:32:47 -08:00
Stephen Birarda	c3d736dd16	return after release, duh	2016-12-20 14:30:08 -08:00
Stephen Birarda	8cd13eaedf	always unequip on secondary release	2016-12-20 14:25:26 -08:00
Stephen Birarda	0a024616cc	add special equip for oculus style grab	2016-12-20 14:21:23 -08:00
Philip Rosedale	13e03b35cc	removed initial delay for seek beams	2016-12-20 14:11:52 -08:00
Philip Rosedale	250d071788	grip squeezes fingers too	2016-12-20 14:11:45 -08:00
Philip Rosedale	938734d3fc	Grip controllers can grab objects, slight delay on search beam	2016-12-20 14:11:33 -08:00
Anthony J. Thibault	ec38c4e319	Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui	2016-12-20 13:43:06 -08:00
Anthony Thibault	9d964042c9	Merge pull request #9243 from sethalves/tablet-ui-overlay-stylus-rebase ... use overlays for tablet-ui, use a stylus rather than lasers	2016-12-20 13:42:22 -08:00
Anthony J. Thibault	84db58dbc6	Make tablet.qml work on Web3DOverlay	2016-12-20 12:16:11 -08:00
Anthony Thibault	bb56701fdb	Merge pull request #9241 from druiz17/tabletMenu ... Moved some hud menus to tablet	2016-12-20 11:13:03 -08:00
Dante Ruiz	bee6e230ae	made requested changes	2016-12-20 18:28:07 +00:00
Howard Stearns	9aad93465d	Merge pull request #9227 from howard-stearns/sessionDisplayNames ... Session display names	2016-12-20 10:07:05 -08:00
Howard Stearns	9ff06e53d4	Merge pull request #9235 from davidkelly/dk/fingerprintInPAL ... Expose Machine Fingerprint in PAL	2016-12-20 10:06:36 -08:00
Seth Alves	ab3c833dd5	diff minimization	2016-12-20 09:23:21 -08:00
Seth Alves	36e843178a	diff minimization	2016-12-20 09:21:41 -08:00
Seth Alves	d8ee4d86b0	merge from upstream	2016-12-20 08:43:19 -08:00
Seth Alves	dc996bee95	merge from upstream	2016-12-20 08:06:01 -08:00
Dante Ruiz	fe4fa351d1	clean up 3	2016-12-20 16:04:18 +00:00
Dante Ruiz	31decffb31	clean up 2	2016-12-20 15:59:52 +00:00
Dante Ruiz	7251fa6c18	clean up	2016-12-20 15:54:14 +00:00
Dante Ruiz	74092d8714	removed commented code	2016-12-20 15:46:15 +00:00
Zach Fox	ba240854a7	Comments and clarity	2016-12-20 07:45:35 -08:00
Zach Fox	95e2f0687d	It's working! Untested on human avatars.	2016-12-20 07:45:35 -08:00
Zach Fox	54774950d2	Super close	2016-12-20 07:45:35 -08:00
Zach Fox	42127e4e0f	Another checkpoint, getting closer	2016-12-20 07:45:35 -08:00
Zach Fox	9c09ec6755	Checkpoint	2016-12-20 07:45:35 -08:00
Ryan Huffman	bf7066d4e3	Cleanup tutorial scripts	2016-12-20 07:45:35 -08:00
Ryan Huffman	e12ef0a187	Cleanup variable naming in touch controller config	2016-12-20 07:45:35 -08:00
Ryan Huffman	04efea7293	Cleanup implementation of touch controller config	2016-12-20 07:45:35 -08:00
Ryan Huffman	6e1459f4b3	Update Touch controller configuration	2016-12-20 07:45:35 -08:00
Ryan Huffman	3dfc3946ba	Fix positioning of Oculus Touch controller visual	2016-12-20 07:45:35 -08:00
Ryan Huffman	8aba8f7bf3	Remove cache buster from touchControllerConfiguration	2016-12-20 07:45:35 -08:00
Ryan Huffman	240dba5306	Fix oculus touch labels in tutorial	2016-12-20 07:45:35 -08:00
Ryan Huffman	74b07273d6	Update oculus touch labels to be emissive	2016-12-20 07:45:35 -08:00
Ryan Huffman	1ddc869c8e	Fix emissive channel on touch models	2016-12-20 07:45:35 -08:00
Ryan Huffman	ac33bf4d4a	Fix right touch joystick	2016-12-20 07:45:35 -08:00
Ryan Huffman	3879922e78	Reenable disabling of hand controllers	2016-12-20 07:45:35 -08:00
Ryan Huffman	53fb0a95fe	Update controller display to support non-string hardware resolution	2016-12-20 07:45:35 -08:00
Ryan Huffman	b835fc7ada	Add touch controller support to ControllerDisplay	2016-12-20 07:45:35 -08:00
David Rowe	8ef8de7891	Move Clara download button when displaying on tablet	2016-12-20 07:45:35 -08:00
David Rowe	2a2e8a424b	Fix flash of old desktop window content if reopen after closing with "x"	2016-12-20 07:45:35 -08:00
David Rowe	df5d115db7	Fix auto-downloads not happening after forced log in	2016-12-20 07:45:35 -08:00
David Rowe	0ddc1271b2	Continuously update Clara pages because content can change dynamically	2016-12-20 07:45:35 -08:00
howard-stearns	658ae48d3f	fix selection and hud-hiding issues	2016-12-20 07:45:35 -08:00
David Rowe	446a7c6a79	Reduce whitespace in Clara categories	2016-12-20 07:45:35 -08:00
howard-stearns	c60a78d727	clean up avatar nodes properly (and add some logging)	2016-12-20 07:45:35 -08:00
Howard Stearns	3ac10f5f79	deal with bubble-bounces (and comment the code a bit)	2016-12-20 07:43:48 -08:00
David Rowe	1f8323fb8f	Improve robustness of navigation footer	2016-12-20 07:43:48 -08:00
David Rowe	c4ff129f86	Inform user if can't do Clara.io download because can't write to ATP	2016-12-20 07:43:48 -08:00
howard-stearns	db68a6adcd	fix broken search for myself	2016-12-20 07:43:48 -08:00
Seth Alves	e5804dade0	get stylus working with web entities	2016-12-20 07:43:48 -08:00
howard-stearns	3610d5ddeb	people.svg	2016-12-20 07:43:48 -08:00
Seth Alves	ae7af3e227	don't hide stylus so quickly	2016-12-20 07:43:48 -08:00
Seth Alves	e9c848bfe8	stylus for web overlays	2016-12-20 07:43:48 -08:00
howard-stearns	5a97156151	no debug printing	2016-12-20 07:43:48 -08:00
howard-stearns	946d9aa346	checkpoint	2016-12-20 07:43:48 -08:00
howard-stearns	7e7ce0c103	checkpoint	2016-12-20 07:43:48 -08:00
Howard Stearns	b6b80fb9c1	checkpoint	2016-12-20 07:43:48 -08:00
David Rowe	0ae88c389a	Start at HiFi marketplace page instead of directory page	2016-12-20 07:43:48 -08:00
David Rowe	4d35b7a736	Fix Clara marketplace button appearing on top of navigation footer	2016-12-20 07:43:48 -08:00
David Rowe	39d01b8755	Raise and lower keyboard on password fields	2016-12-20 07:43:48 -08:00
howard-stearns	8d300eac76	pal prototype	2016-12-20 07:43:48 -08:00
David Rowe	25651800dd	Code review	2016-12-20 07:43:48 -08:00
David Rowe	f9bd03dd56	Remove extra browse history item created by Clara download	2016-12-20 07:43:48 -08:00
Seth Alves	67093dc519	don't flutter tablet when menu button is pressed. start on a stylus	2016-12-20 07:43:48 -08:00
David Rowe	4ff3599351	Tidying	2016-12-20 07:43:48 -08:00
David Rowe	7a36e4eed8	Fix keyboard focus when switch highlight between overlays and entities	2016-12-20 07:42:21 -08:00
David Rowe	0accdddc8f	Fix Web overlay x, y coordinate calcs	2016-12-20 07:42:21 -08:00
David Rowe	f749c76ced	First pass at controller interaction with 3D Web overlay	2016-12-20 07:42:21 -08:00
David Rowe	be0ef820ff	Add "back" button to marketplaces footer	2016-12-20 07:40:28 -08:00
David Rowe	eef8c70f10	Remove e-mail message hyperlink if displaying on tablet	2016-12-20 07:40:28 -08:00
David Rowe	78c6441842	Inject navigation footer into Clara account createion page	2016-12-20 07:40:28 -08:00
David Rowe	6e0227f8f7	Improve text and robustness of marketplaces footer	2016-12-20 07:40:28 -08:00
David Rowe	2216ab6def	Delete redundant code	2016-12-20 07:40:28 -08:00
David Rowe	5843185683	Tidying	2016-12-20 07:40:28 -08:00
David Rowe	5fbdd64fff	Handle Clara marketplace downloads	2016-12-20 07:40:28 -08:00
David Rowe	0ef972c1e5	Inject Clara Web page modifications	2016-12-20 07:40:28 -08:00
David Rowe	2db0b4dc59	Fix navigation bar and opaqueness of Web page	2016-12-20 07:40:28 -08:00
David Rowe	bebedd8e51	Add JavaScript event bridge for Web 3D overlay	2016-12-20 07:40:28 -08:00
David Rowe	767b3ea8e9	Add script injection to Web 3D overlay	2016-12-20 07:40:28 -08:00
David Rowe	beddad5807	Fix Web tablet screen size	2016-12-20 07:40:08 -08:00
David Rowe	1a970dbd79	Use overlay instead of entity to display tablet Web content	2016-12-20 07:38:25 -08:00
David Rowe	4bc1616c07	Fix up navigation footer fonts	2016-12-20 07:33:55 -08:00
David Rowe	fd24d12bc1	Add navigation bar to marketplace pages	2016-12-20 07:33:55 -08:00
David Rowe	57ca34f866	Fix up script injection methods	2016-12-20 07:33:55 -08:00
David Rowe	ef488ec036	Get script injection working in new marketplaces window	2016-12-20 07:33:55 -08:00
David Rowe	4dbbb08c98	Update user instructions	2016-12-20 07:33:55 -08:00
David Rowe	196473f9fa	Provide keyboard in marketplaces window	2016-12-20 07:33:55 -08:00
David Rowe	1c6cb9f905	Tidying	2016-12-20 07:33:55 -08:00
David Rowe	9dbcb94a0c	Update Clara.io instructions	2016-12-20 07:33:55 -08:00
Chris Collins	61c60fca2d	Merge pull request #8968 from ctrlaltdavid/21089 ... Clara.io marketplace improvements	2016-12-19 18:21:45 -08:00
Anthony J. Thibault	a791ddcc22	Tablet can switch to a web url. ... Help button has been updated to switch to the help.html. It doesn't look good because the content was authored expecting landscape window, not portrait. The API is by no means final. But it exposes two methods to JS. * Tablet.gotoHomeScreen() - Used to forcefully go back to the home tablet "springboard", eventually this will hooked up to the tablet button. * Tablet.gotoWebScreen(url) - Causes the tablet to switch from the home "springboard" and load a web url. tabletTest.js and help.js have been updated to use this functionality.	2016-12-19 17:52:19 -08:00
Dante Ruiz	fc4b4f85f4	added button to menu	2016-12-20 00:24:45 +00:00
howard-stearns	60cb7acb50	Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames	2016-12-19 15:28:07 -08:00
Anthony J. Thibault	856791c11d	Made TabletRoot.qml the main tablet qml file. ... This file uses a Loader node to load, Tablet.qml.	2016-12-19 15:15:16 -08:00
David Kelly	36792e005a	initial commit	2016-12-19 14:19:39 -08:00
Dante Ruiz	c0e82d3e05	moving buttons to tablet	2016-12-19 13:43:49 -08:00
Anthony J. Thibault	10f9233c90	Fixed js interface after recent Tablet.qml changes ... * TabletButton.inDebugMode defaults to false * TabletButton now listens to onIsActiveChanged event to flip state of button. * Fixed help.js and tabletTest.js to compensate for the removal of the TabletButton.color property	2016-12-19 12:20:56 -08:00
Zach Fox	e940daf5b4	Comments and clarity	2016-12-19 10:20:08 -08:00
Zach Fox	aa837d8858	It's working! Untested on human avatars.	2016-12-19 10:20:08 -08:00
Zach Fox	2c5db54b08	Super close	2016-12-19 10:20:08 -08:00
Zach Fox	802e283508	Another checkpoint, getting closer	2016-12-19 10:20:08 -08:00
Zach Fox	c9dc91900f	Checkpoint	2016-12-19 10:20:08 -08:00
howard-stearns	9d9345cb65	Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames	2016-12-19 09:19:14 -08:00
Ryan Huffman	9730d07f59	Cleanup tutorial scripts	2016-12-16 16:01:44 -08:00
Ryan Huffman	46d8130782	Cleanup variable naming in touch controller config	2016-12-16 16:01:26 -08:00
Ryan Huffman	009c982cdf	Cleanup implementation of touch controller config	2016-12-16 15:05:17 -08:00
Ryan Huffman	19a3fdcc01	Update Touch controller configuration	2016-12-16 15:05:17 -08:00
Ryan Huffman	f7ebda6931	Fix positioning of Oculus Touch controller visual	2016-12-16 15:05:17 -08:00
Ryan Huffman	b599ccea9e	Remove cache buster from touchControllerConfiguration	2016-12-16 15:05:17 -08:00
Ryan Huffman	188bf600d1	Fix oculus touch labels in tutorial	2016-12-16 15:05:17 -08:00
Ryan Huffman	46251e805a	Update oculus touch labels to be emissive	2016-12-16 15:05:17 -08:00
Ryan Huffman	46f5494af8	Fix emissive channel on touch models	2016-12-16 15:05:17 -08:00
Ryan Huffman	3df1819086	Fix right touch joystick	2016-12-16 15:05:17 -08:00
Ryan Huffman	2b88935812	Reenable disabling of hand controllers	2016-12-16 15:05:17 -08:00
Ryan Huffman	6fb39080e2	Update controller display to support non-string hardware resolution	2016-12-16 15:05:17 -08:00
Ryan Huffman	674bbe7de5	Add touch controller support to ControllerDisplay	2016-12-16 15:05:17 -08:00
howard-stearns	70af96669c	update pal	2016-12-16 14:59:54 -08:00
Dante Ruiz	61e2fb2366	correct indentation for HomeButton.js	2016-12-16 21:51:01 +00:00
Dante Ruiz	8f36090884	removed tabs and also remove script from host	2016-12-16 21:45:53 +00:00
Dante Ruiz	f7df9a64b2	remmoved tabs	2016-12-16 18:32:05 +00:00
Dante Ruiz	cb4b2473e1	remmoved tabs as whitespace	2016-12-16 18:30:15 +00:00
Dante Ruiz	a0a8ecc158	even more clean up	2016-12-16 17:28:02 +00:00
Dante Ruiz	f2d9f34993	more clean up	2016-12-16 17:25:38 +00:00
Dante Ruiz	889e9e854c	clean up	2016-12-16 17:24:53 +00:00
Dante Ruiz	40a79867be	removed unnessary comments	2016-12-16 17:24:09 +00:00
Dante Ruiz	571783b90d	fixed home buttons issues	2016-12-16 09:19:22 -08:00
David Rowe	9459b967be	Merge branch 'master' into 21089	2016-12-16 20:02:43 +13:00
David Rowe	3d6fe6efe8	Move Clara download button when displaying on tablet	2016-12-16 14:58:22 +13:00
David Rowe	18a3555453	Fix flash of old desktop window content if reopen after closing with "x"	2016-12-16 12:21:32 +13:00
David Rowe	04aef641c5	Fix auto-downloads not happening after forced log in	2016-12-16 11:45:17 +13:00
David Rowe	a7e0135a6a	Continuously update Clara pages because content can change dynamically	2016-12-16 11:28:34 +13:00
Howard Stearns	ba8b585368	Merge pull request #9202 from howard-stearns/pal-proto ... People Action List prototype	2016-12-15 13:56:12 -08:00
Anthony J. Thibault	8b99fa90e8	Merge branch 'master' into tablet-ui	2016-12-15 13:28:23 -08:00
Brad Hefta-Gaub	0923a79139	Merge pull request #9187 from PhilipRosedale/rescale ... Rescale yourself or entities using the grip buttons	2016-12-15 12:32:04 -08:00
howard-stearns	0e81e71325	fix selection and hud-hiding issues	2016-12-15 11:00:32 -08:00
David Rowe	861ce2c27b	Reduce whitespace in Clara categories	2016-12-15 20:33:43 +13:00
Anthony J. Thibault	d2c4417b24	Hook up Help button to the new Tablet interface	2016-12-14 17:05:47 -08:00
Philip Rosedale	14c867fdbd	Can't resize if objects in both hands, avatar resize is seek + grips	2016-12-14 13:38:37 -08:00
Zach Fox	c53111781b	Fix the bug	2016-12-14 12:17:00 -08:00
howard-stearns	66e2c651c6	clean up avatar nodes properly (and add some logging)	2016-12-14 11:26:33 -08:00
Howard Stearns	d5c219a761	deal with bubble-bounces (and comment the code a bit)	2016-12-13 19:52:27 -08:00
David Rowe	eb7b2dbdcf	Improve robustness of navigation footer	2016-12-14 15:07:06 +13:00
David Rowe	2b0529bcea	Inform user if can't do Clara.io download because can't write to ATP	2016-12-14 14:45:33 +13:00
howard-stearns	a50b731faa	fix broken search for myself	2016-12-13 16:52:18 -08:00
howard-stearns	03d3e0b550	Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto	2016-12-13 16:03:00 -08:00
howard-stearns	b0547750b0	people.svg	2016-12-13 15:53:45 -08:00
howard-stearns	adbfa0752a	no debug printing	2016-12-13 15:09:46 -08:00
howard-stearns	c9827d1521	checkpoint	2016-12-13 15:05:08 -08:00
howard-stearns	86010af828	checkpoint	2016-12-13 13:01:45 -08:00
Jazmin	b7b4c685e7	Fixed typo	2016-12-13 11:48:06 -08:00
Jazmin	4effdd0394	Update Bubble model in script	2016-12-13 11:46:40 -08:00
Jazmin	0a031e204e	Delete old bubble model	2016-12-13 11:46:22 -08:00
Jazmin	efc9f6549b	Add new bubble model	2016-12-13 11:45:50 -08:00
Jazmin	d9fbde2f66	Update bubble height ... This height allows my friends to stay in my view comfortably, even when the space bubble is on. Even though it's significantly lower, I don't think anyone is not going to look down when someone starts to shrink down in front of them.	2016-12-13 11:43:09 -08:00
Howard Stearns	7c92ad5ced	checkpoint	2016-12-13 09:15:28 -08:00
David Rowe	4890e92733	Start at HiFi marketplace page instead of directory page	2016-12-14 00:12:52 +13:00
David Rowe	8195393205	Fix Clara marketplace button appearing on top of navigation footer	2016-12-13 22:54:19 +13:00
David Rowe	20623ebddb	Raise and lower keyboard on password fields	2016-12-13 22:48:17 +13:00
David Rowe	1f3045ad30	Merge branch 'master' into 21089 ... Conflicts: interface/src/Application.cpp	2016-12-13 14:05:24 +13:00
howard-stearns	712543a39a	Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto	2016-12-12 16:37:41 -08:00
howard-stearns	4b5aae3c55	pal prototype	2016-12-12 16:37:16 -08:00
Seth Alves	16128f5087	Merge pull request #9191 from druiz17/homeButton ... Home button prototype	2016-12-12 16:27:06 -08:00
Seth Alves	d97be52542	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2016-12-12 16:24:17 -08:00
David Rowe	efb784f703	Code review	2016-12-13 13:11:21 +13:00
Dante Ruiz	cc0e25720e	mimimize the git diffs	2016-12-12 23:29:11 +00:00
Philip Rosedale	9370c8af6b	Added ability to rescale avatar	2016-12-12 15:26:53 -08:00
Dante Ruiz	6a8465a6ca	removed more whitespace	2016-12-12 23:26:06 +00:00
Chris Collins	4ce1bb3abc	Merge pull request #9172 from thoys/avatarFinderBeacon ... avatarFinderBeacon.js -- Find other avatars more easily	2016-12-12 15:25:36 -08:00
Dante Ruiz	92993202a4	removed double variable definition	2016-12-12 23:24:56 +00:00
Dante Ruiz	ccecce77de	removed unneeded whitespace	2016-12-12 23:21:14 +00:00
Dante Ruiz	737f11fb7a	merge fix	2016-12-12 23:03:38 +00:00
Dante Ruiz	1b7c89c41d	home button working	2016-12-12 14:34:42 -08:00
Zach Fox	7030c7b0a6	Space bubble improvements (#9142) ... * The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash. * The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale. * Space bubble collision detection is now more accurate and reliable. * CTRL + N toggles the bubble. * The "Bubble" HUD button has been moved to the proper location.	2016-12-12 14:22:54 -08:00
Philip Rosedale	a142c830fa	Merge branch 'master' of git://github.com/highfidelity/hifi into rescale	2016-12-12 09:41:34 -08:00
Philip Rosedale	8572950a09	Both grip buttons enable rescale for a held object	2016-12-12 09:39:32 -08:00
David Rowe	14ecb24986	Remove extra browse history item created by Clara download	2016-12-11 17:43:55 +13:00
David Rowe	c87149cfc2	Tidying	2016-12-10 12:59:01 +13:00
Thijs Wenker	3ec06b1a6e	Remove redundant parentheses	2016-12-10 00:21:20 +01:00
Thijs Wenker	4d467deb5e	Fix if statement to match style rule 4.2.8	2016-12-09 21:26:59 +01:00
Thijs Wenker	3f9aa00fd6	Increased show-radius to 20 meters	2016-12-09 19:39:48 +01:00
Seth Alves	37b179b00b	remove commented-out code	2016-12-09 09:55:02 -08:00
Seth Alves	6c99b5e9ca	code review	2016-12-09 06:50:10 -08:00
David Rowe	e956608fa4	Fix keyboard focus when switch highlight between overlays and entities	2016-12-09 18:31:52 +13:00
David Rowe	7d8926c802	Fix Web overlay x, y coordinate calcs	2016-12-09 17:00:00 +13:00
Thijs Wenker	9397108b3b	clear -> cleanup typo	2016-12-09 03:14:05 +01:00
Thijs Wenker	3ceac7d071	Fix for "cannot access member `sessionUUID' of deleted QObject" error	2016-12-09 02:44:43 +01:00
Thijs Wenker	28e8bb69ec	ignore camera man	2016-12-09 02:29:21 +01:00
Thijs Wenker	387f73b349	reset avatar beacons on domain change	2016-12-09 02:11:05 +01:00
Seth Alves	e06a445959	remove some cruft	2016-12-08 17:00:50 -08:00
Seth Alves	369f61e172	bring over some previous tablet-ui work	2016-12-08 16:54:39 -08:00
Thijs Wenker	dfb4c7cf89	avatarFinderBeacon	2016-12-09 01:41:19 +01:00
David Rowe	4c236b293e	First pass at controller interaction with 3D Web overlay	2016-12-09 01:47:40 +13:00
David Rowe	c4c2a95e83	Add "back" button to marketplaces footer	2016-12-08 10:58:37 +13:00
David Rowe	1de2c14fee	Remove e-mail message hyperlink if displaying on tablet	2016-12-07 12:52:53 +13:00
David Rowe	e821ec5593	Inject navigation footer into Clara account createion page	2016-12-07 12:38:16 +13:00
David Rowe	01226b03ef	Improve text and robustness of marketplaces footer	2016-12-07 12:20:43 +13:00
David Rowe	eafd51ba9e	Merge branch 'master' into 21089	2016-12-07 11:27:15 +13:00
David Rowe	460d332c6f	Delete redundant code	2016-12-07 10:06:32 +13:00
David Rowe	8e30674069	Tidying	2016-12-07 09:28:35 +13:00
David Rowe	d857f943f8	Handle Clara marketplace downloads	2016-12-07 09:16:59 +13:00
howard-stearns	3ba5e1ed4a	new mic toolbar button art	2016-12-06 10:52:40 -08:00
Andrew Meadows	7db8e8f31b	Merge pull request #9156 from hyperlogic/out-of-body-revert ... Revert Out of Body experience	2016-12-06 08:37:20 -08:00
howard-stearns	7621672964	new mic unumute art	2016-12-05 16:00:03 -08:00
Anthony J. Thibault	89ae3b3d6e	Revert "Merge pull request #8691 from highfidelity/out-of-body-experience" ... This reverts commit efe9571ab8, reversing changes made to 333e9ec7f4.	2016-12-05 15:18:03 -08:00
Ryan Huffman	996d3f5875	Merge pull request #9135 from druiz17/nearGrab ... Fixed pressing the grip button causes a near grabbed object to drop	2016-12-05 11:07:15 -08:00
Dante Ruiz	08301d488d	clean up	2016-12-05 18:10:54 +00:00
Dante Ruiz	09d5dc382f	better solution	2016-12-05 18:08:36 +00:00
David Rowe	b83d5c6275	Inject Clara Web page modifications	2016-12-05 21:34:34 +13:00
David Rowe	2f42f4cfa5	Merge branch 'master' into 21089	2016-12-05 18:33:38 +13:00
David Rowe	f04c493e16	Fix navigation bar and opaqueness of Web page	2016-12-05 17:48:20 +13:00
David Rowe	a5bdd9066f	Add JavaScript event bridge for Web 3D overlay	2016-12-05 17:20:30 +13:00
David Rowe	a8a04cfbba	Add script injection to Web 3D overlay	2016-12-05 12:19:49 +13:00
David Rowe	b723f3d92e	Fix Web tablet screen size	2016-12-05 10:03:30 +13:00
Seth Alves	d2b32c3084	Merge pull request #9057 from druiz17/childParent ... fixed children of parent object not being added back when performing an undo	2016-12-01 16:59:06 -08:00
Zach Fox	30dade242c	GIFs: Quality improvements; duration tweaks; processing notif (#9139)	2016-12-01 14:53:18 -08:00
Dante Ruiz	348c0c95e5	conforming to coding standard and better variable naming	2016-12-01 22:22:17 +00:00
Seth Alves	24e54f25bf	Merge pull request #9108 from PhilipRosedale/drifting ... Grab.js weaker at a distance	2016-12-01 12:59:28 -08:00
Philip Rosedale	c60b0c7ef5	Fix indents	2016-12-01 12:54:38 -08:00
Seth Alves	efe9571ab8	Merge pull request #8691 from highfidelity/out-of-body-experience ... Room Scale HMD comfort features.	2016-12-01 11:09:39 -08:00
Dante Ruiz	a35f28725b	fixed child not commit back when performing undo	2016-12-01 10:54:26 -08:00
Dante Ruiz	3c1d434449	fixed typo	2016-12-01 10:54:26 -08:00
Dante Ruiz	0c9cd5803a	added descendant checking	2016-12-01 10:54:26 -08:00
Dante Ruiz	cb0e01bfa4	fixed child of parent not being added when performing an undo	2016-12-01 10:54:26 -08:00
Dante Ruiz	1b24d373d2	fixed near grab issue	2016-12-01 10:18:34 -08:00
Dante Ruiz	dc7bb5b083	grip button fix	2016-12-01 10:17:54 -08:00
Chris Collins	19b5e7cd86	Merge pull request #9054 from howard-stearns/third-person-lasers ... make hand-controller ui work in third person	2016-12-01 10:11:12 -08:00
Chris Collins	c0a0a16ff8	Merge pull request #9127 from huffman/fix/hand-controller-grab-release ... Fix 'releaseGrab' not being called when using grip buttons	2016-12-01 09:58:36 -08:00
David Rowe	0136534954	Use overlay instead of entity to display tablet Web content	2016-12-01 21:32:57 +13:00
Anthony J. Thibault	7f840d3a08	Can use 'xboxLaser' in third person camera	2016-11-30 10:01:11 -08:00
David Rowe	a75d0b3fe8	Merge branch 'master' into 21089	2016-11-30 14:50:51 +13:00
Anthony J. Thibault	78559934a1	Merge branch 'master' into third-person-lasers	2016-11-29 16:38:34 -08:00
Ryan Huffman	aa1e813d72	Fix 'releaseGrab' not being called when using grip buttons	2016-11-29 15:04:14 -08:00
Ryan Jones	a59df5b04d	one last indentation fix	2016-11-28 17:19:43 -08:00
Ryan Jones	3961dbcf55	revert changes to dev utils, apply changes to system utils	2016-11-28 17:18:31 -08:00
Ryan Jones	4be1922df5	add bind polyfill	2016-11-28 14:47:15 -08:00
Howard Stearns	030f0d7103	Merge pull request #9114 from howard-stearns/bubble-state ... bubble state	2016-11-28 12:16:39 -08:00
howard-stearns	8b9efb461e	bubble state	2016-11-23 10:22:24 -08:00
howard-stearns	414371d1fc	record starting href/domainId, not ending	2016-11-22 16:13:08 -08:00
howard-stearns	2c9046742e	allow movement during .gif recording	2016-11-22 16:02:01 -08:00
howard-stearns	5188de924f	allow for SnapshotReview dialog to be up during a change of href for all ... media capture	2016-11-22 11:09:43 -08:00
Philip Rosedale	664b54c004	remove whitespace	2016-11-22 10:27:27 -08:00
Philip Rosedale	c1e044364f	Added distance attentuation of linear and angular rate	2016-11-22 10:24:02 -08:00
Philip Rosedale	c81d5b0793	Merge branch 'master' of git://github.com/highfidelity/hifi into drifting	2016-11-22 09:07:13 -08:00
howard-stearns	066a518142	expose metaverse url to javascript and use it rather than hardcoding	2016-11-21 13:07:38 -08:00
howard-stearns	5b216578d7	Merge branch 'master' of https://github.com/highfidelity/hifi into location-cleanup	2016-11-21 11:47:30 -08:00
Brad Hefta-Gaub	fe709f51de	personal space feature	2016-11-19 16:30:15 -08:00
howard-stearns	da56457c4a	Merge branch 'master' of https://github.com/highfidelity/hifi into location-cleanup	2016-11-18 17:13:32 -08:00
howard-stearns	f1806eb649	server protocols	2016-11-18 17:05:14 -08:00
Ryan Huffman	541ef21801	Merge pull request #9094 from Atlante45/edit-js ... Turn Edit.js on when importing entities	2016-11-18 15:36:50 -08:00
Zach Fox	35d075a78f	Fix notifications.js formatting	2016-11-18 14:39:30 -08:00
Zach Fox	20a2d1275a	Bugfixes and GIF uploads workinggit add -A!	2016-11-18 14:39:30 -08:00
Zach Fox	adcbb0b760	Code clarity and potential bugfix	2016-11-18 14:39:30 -08:00
Zach Fox	a81289a0d7	Huge progress today. Buggy behavior with multiple snapshots remains	2016-11-18 14:39:29 -08:00
Zach Fox	f726ea546f	code cleanup; simultaneous gif and still capture	2016-11-18 14:39:29 -08:00
Zach Fox	704476c197	Initial progressgit add -A!	2016-11-18 14:39:28 -08:00
Atlante45	cfd4294743	Turn Edit.js on when importing SVO	2016-11-18 11:31:12 -08:00
Anthony J. Thibault	270adfe692	removed debug prints	2016-11-17 11:40:05 -08:00
Anthony J. Thibault	38ac6fff03	Hand Controller rendering is camera relative ... Basically, when using the third person camera in HMD mode. If the controllers are shown. They should be shown in front of the users camera, not in front of the users avatar. To accomplish this, two new faux joint indices are introduced. CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX and CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX. These joint indices can be used for Overlay parenting. (But not for entity parenting because they are not transmitted over the network). They can also be queried for by using the MyAvatar.getAbsoluteJointRotationInObjectFrame() call. These new indices are now used by the controllerDisplay.js for the hand controller rendering. They are also used by system/libraries/controllers.js as the origin for hand controller grabbing and interaction lasers.	2016-11-17 11:33:12 -08:00
David Kelly	40914d9790	Logging to help find audio device issue ... We sometimes show duplicate devices in Audio > Devices menu. But I cannot reproduce it, so maybe best thing is log timing and contents of input and output device arrays, to try to run down where the issue is.	2016-11-15 12:58:51 -08:00
David Rowe	9b270834dd	Merge branch 'master' into 21089	2016-11-16 08:51:48 +13:00
David Rowe	591db37a21	Fix up navigation footer fonts	2016-11-15 15:09:33 +13:00
David Rowe	e4b8d34080	Add navigation bar to marketplace pages	2016-11-15 14:38:03 +13:00
Andrew Meadows	6bb3dd6830	Merge hifi/master into hifi/out-of-body-experience	2016-11-14 15:08:04 -08:00
Philip Rosedale	981f505a9c	Merge branch 'master' of git://github.com/highfidelity/hifi into drifting	2016-11-14 14:26:45 -08:00
David Rowe	1eeec2a3a1	Fix up script injection methods	2016-11-15 10:24:38 +13:00
howard-stearns	47bef18bd4	show the hand controllers when in third-person+hmd, but currently, they're ... at avatar hands instead of physical hand, which is not what we want!	2016-11-14 13:05:35 -08:00
David Rowe	e7d9f98ca4	Get script injection working in new marketplaces window	2016-11-15 09:23:51 +13:00
howard-stearns	06a6da3931	Merge branch 'master' of https://github.com/highfidelity/hifi into third-person-lasers	2016-11-14 09:58:54 -08:00
Stephen Birarda	212d518109	use for loop for kick and mute overlay cleanup	2016-11-13 12:17:12 -08:00
Chris Collins	6581a51bc9	Merge pull request #9052 from davidkelly/dk/2226 ... Add ability to mute user	2016-11-11 16:02:08 -08:00
David Kelly	3d7e075897	Added mute to mod.js script	2016-11-11 11:18:24 -08:00
howard-stearns	e2fded846f	make hand-controller ui work in third person	2016-11-11 11:10:42 -08:00
Brad Hefta-Gaub	a90a0fe8ba	Merge pull request #8976 from druiz17/FixMenuOutOfView ... Fixed menu out of view with HMD and Xbox controller	2016-11-10 18:49:34 -08:00
Brad Hefta-Gaub	f55b660820	Merge pull request #9033 from huffman/fix/usersjs-hide-show-laser ... Fix users.js maximize button unclickable with hand controllers	2016-11-10 17:53:17 -08:00
howard-stearns	8299e23cc3	diable some viewpoint menu options when in hmd.	2016-11-10 15:15:11 -08:00
Philip Rosedale	c0b1392685	Merge branch 'master' of git://github.com/highfidelity/hifi into drifting	2016-11-10 13:41:13 -08:00
David Rowe	1caca601f2	Update user instructions	2016-11-10 20:39:29 +13:00
David Rowe	5eff7c9e15	Merge branch 'master' into 21089	2016-11-10 14:42:21 +13:00
humbletim	35f857ef9d	inhibit user interactions when window is disabled	2016-11-09 13:21:24 -05:00
Ryan Huffman	5dab2ac2a7	Add margin to left and right side of users.js	2016-11-08 09:47:09 -08:00
Ryan Huffman	284b458148	Increase margin at bottom of users.js	2016-11-08 09:46:47 -08:00
Seth Alves	42d13f7e77	Merge pull request #9024 from huffman/fix/userdata-showing-old-data ... Fix userData in edit.js sometimes showing wrong value when locked	2016-11-07 13:37:03 -08:00
Ryan Huffman	c4f35bf7bf	Fix userData in edit.js sometimes showing wrong value when locked	2016-11-07 11:39:36 -08:00
David Rowe	d33ac21aaa	Merge branch 'master' into 21089	2016-11-08 08:23:10 +13:00
Dante Ruiz	e22c36b4b7	fixed menu pop up delay	2016-11-07 17:16:24 +00:00
Andrew Meadows	ccdf383151	Merge hifi/master into hifi/out-of-body-experience	2016-11-07 08:24:26 -08:00
David Rowe	852218815b	Display "content loading" while there are pending GPU texture transfers	2016-11-07 13:40:49 +13:00
Brad Hefta-Gaub	206f1ead1a	Merge pull request #8990 from howard-stearns/centered-toolbar ... centered toolbar	2016-11-03 14:18:32 -07:00
howard-stearns	8eb6699420	help script	2016-11-02 16:50:37 -07:00
Seth Alves	d0c0cdd82f	polyvox corners stitch together reliably. surface-extractor dropdown in edit.js works again	2016-11-02 16:31:34 -07:00
David Rowe	de5e02310b	Provide keyboard in marketplaces window	2016-11-03 09:00:40 +13:00
Dante Ruiz	1a83cc2c3e	fixed deleted comment	2016-11-02 00:12:23 +01:00
Dante Ruiz	d29b1c34b1	fixed coding standard conflicts	2016-11-02 00:07:58 +01:00
Dante Ruiz	e9d10b609d	removed bad commit	2016-11-02 00:05:38 +01:00
Dante Ruiz	86abd9120e	Fixed menu out of view with HMD and Xbox controller	2016-11-01 14:30:48 -07:00
David Rowe	0c6ed67e3b	Tidying	2016-11-02 00:05:30 +13:00
David Rowe	35448b6c09	Update Clara.io instructions	2016-11-02 00:05:10 +13:00
Brad Hefta-Gaub	dc836cbefc	Merge pull request #8949 from ctrlaltdavid/21090 ... Fix comment typo	2016-10-28 13:29:47 -07:00
David Rowe	9a79345493	Fix comment typo	2016-10-29 09:04:50 +13:00
Ryan Huffman	b8cf4e9c0e	Merge pull request #8943 from ctrlaltdavid/21090 ... QA READY: Revise loading progress bar	2016-10-28 08:24:40 -07:00
David Rowe	b548e6441c	Animate progress bar without regard for amount of content left to load	2016-10-28 18:57:54 +13:00
David Rowe	610159fcbe	Improve bar for 4K displays	2016-10-28 18:20:33 +13:00
David Rowe	73b2bc433d	Improve bar positions	2016-10-28 18:03:13 +13:00
Stephen Birarda	c41af25776	Merge pull request #8939 from huffman/fix/tutorial-fixes ... Tutorial fixes	2016-10-27 21:43:55 -07:00
Ryan Huffman	d933155c71	Fix trigger highlight configuration	2016-10-27 20:16:34 -07:00
David Rowe	edc9b1fa07	Update bar graph for desktop and HMD displays	2016-10-28 15:50:50 +13:00
David Rowe	c9e4fddeab	Remove background image	2016-10-28 14:17:18 +13:00
David Rowe	0824142987	Add "loading" text	2016-10-28 14:12:24 +13:00
David Rowe	4befab1151	JSLint progress bar code	2016-10-28 11:34:00 +13:00
Ryan Huffman	69e7dababc	Collapse multiline dict to one line in controllerDisplay	2016-10-27 15:16:38 -07:00
Ryan Huffman	c0e372c380	Remove annotation API from controller display	2016-10-27 14:58:20 -07:00
Ryan Huffman	1f25ba8f1f	Update controller tips and trigger highlight in tutorial	2016-10-27 14:58:20 -07:00
Ryan Huffman	e9099b77a5	Add more debug to tutorial, new firecrackers, and adjust fuse	2016-10-27 14:58:20 -07:00
Ryan Huffman	1782f97dbd	Fix away.js not unsubscribing on shutdown	2016-10-27 11:12:46 -07:00
Ryan Huffman	a801832a55	Fix away.js allowing any user to disable away.js	2016-10-27 11:12:31 -07:00
Andrew Meadows	38e4ac0ae9	Merge master into out-of-body-experience	2016-10-26 16:59:31 -07:00
Ryan Huffman	727fabeab2	Fix away.js logging all Messages	2016-10-25 15:28:11 -07:00
Ryan Downe Karpf	7a4302057a	Merge pull request #8900 from huffman/fix/disable-controller-hide-on-equip ... Update vive controller display to not hide on equip	2016-10-25 13:16:31 -07:00
Brad Hefta-Gaub	1bbf0179dd	Merge pull request #8894 from ZappoMan/xboxLasers ... Adds support for "lasers" to the Oculus+xbox controller	2016-10-25 09:18:00 -07:00
Ryan Huffman	af749605ea	Update vive controller display to not hide on equip	2016-10-25 08:27:20 -07:00
Chris Collins	325cd0ae61	Merge pull request #8870 from ctrlaltdavid/21084 ... Reinstate "reload" button for entity scripts in entities editor	2016-10-24 22:17:14 -07:00
Brad Hefta-Gaub	ed4279783d	CR feedback	2016-10-24 20:38:49 -07:00
Brad Hefta-Gaub	76ca3aa546	fix residual head laser	2016-10-24 15:25:06 -07:00
Brad Hefta-Gaub	779f326452	cleanup	2016-10-24 15:03:41 -07:00
Brad Hefta-Gaub	a25d50387e	gak	2016-10-24 14:47:10 -07:00
Andrew Meadows	ccc6f8eee2	fix teleport.js to work for out-of-body	2016-10-24 08:36:51 -07:00
Andrew Meadows	51a9a99381	Merge hifi/master into hifi/out-of-body-experience	2016-10-24 08:13:42 -07:00
Brad Hefta-Gaub	0f8967970a	Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers	2016-10-24 08:11:31 -07:00
Brad Hefta-Gaub	a282d83546	more work on extra lasers	2016-10-24 07:46:04 -07:00
Anthony J. Thibault	ae301602e7	Fix for incorrect tip texture URLs.	2016-10-21 14:49:46 -07:00
Anthony J. Thibault	c431c69d60	Merge branch 'master' into feature/controller-display	2016-10-21 13:48:07 -07:00
Anthony J. Thibault	60f728585a	away.js now shows hand controllers in away mode. ... * controllerDisplayManager is now part of default scripts. * Also tutorial and away.js communicate with controllerDisplayManager via HMD.requestShowHandControllers, HMD.requestHideHandControllers and sendLocalMessage. * removed previous version of controllerDisplayManger from tutorial.	2016-10-21 10:40:39 -07:00
Anthony J. Thibault	2193c5faad	Integrated controller display from tutorial scripts + assets	2016-10-20 18:24:58 -07:00
Howard Stearns	ca0d6587b5	Merge pull request #8869 from hyperlogic/bug-fix/edit-picking-with-hand-controllers ... edit.js: Fix for picking and manipulating objects via hand controllers.	2016-10-20 16:59:56 -07:00
David Rowe	c6558ebebd	Reinstate "reload" button for entity scripts in entities editor	2016-10-21 11:14:57 +13:00
Anthony J. Thibault	53864abaf2	edit.js: Fix for picking and manipulating objects via hand controllers. ... The ray picking was not using the proper grab sphere offset, so it became detached from the visual ray, making picking difficult.	2016-10-20 13:37:31 -07:00
Ryan Huffman	fad0607bf6	Remove showing of overlays in away.js	2016-10-20 11:49:23 -07:00
Brad Hefta-Gaub	1a28732b64	Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers ... Conflicts: libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h	2016-10-20 09:38:03 -07:00
Brad Hefta-Gaub	9008de72e0	Merge pull request #8864 from hyperlogic/feature/grab-sphere-adjustments ... Adjustment to position and visibility of grab sphere.	2016-10-19 21:51:02 -07:00
Anthony J. Thibault	55c062098a	Adjustment to position and visibility of grab sphere. ... * The grab sphere used to detect near grabbing is now 10cm in radius instead of 4cm. * The visual representation of this grab sphere is always hidden, by default. * This representation can be enabled in via the "Developer > Show Grab Sphere" menu item.	2016-10-19 17:33:05 -07:00
Anthony J. Thibault	bcd31e3d99	Adjust size and offset of grab balls to better align with hand controllers. ... (cherry picked from commit d97a8c2e7eace2494d3142e8187022a33aedc060)	2016-10-19 15:59:26 -07:00
Ryan Huffman	f42683cf8b	Update users.js to be minimizable when logged out, and by default	2016-10-19 13:19:29 -07:00
Seth Alves	7e4964db3e	Merge pull request #8684 from Menithal/controller-grab-unequip ... Fixed HandcontrollerGrab distance unequip	2016-10-19 09:53:04 -07:00
Brad Hefta-Gaub	c082c74cc0	use head pose for controller in case there are no hand controllers available	2016-10-18 10:01:00 -07:00
Ryan Huffman	5f5dedaa40	Fix equip sphere not showing up	2016-10-17 10:53:02 -07:00
howard-stearns	140caf84d8	never interact with hud elements while holding something	2016-10-14 18:30:52 -07:00
Chris Collins	d70b58555e	Merge pull request #8794 from howard-stearns/clientOnly-tablet ... make marketplace tablet be clientOnly	2016-10-14 10:54:54 -07:00
Howard Stearns	fc8bbde60a	Merge pull request #8810 from ZappoMan/handControlsWhileLoading ... make laser pointers work even while content is loading	2016-10-14 10:01:46 -07:00
Brad Hefta-Gaub	ef3c9ba78a	better handling of the teleport target overlays to prevent flashing and thrashing	2016-10-13 18:24:38 -07:00
Brad Hefta-Gaub	ddce0ef74a	make laser pointers work even while content is loading	2016-10-13 17:50:20 -07:00
Anthony J. Thibault	81db8f7e08	Merge branch 'master' into out-of-body-experience	2016-10-13 17:27:15 -07:00
howard-stearns	d232d115d5	persist tablet data, and clean it up on startup	2016-10-13 16:53:44 -07:00
Brad Hefta-Gaub	5638f6228b	Merge pull request #8792 from howard-stearns/allow-hmd-hand-controllers-without-interface-focus ... allow hand controller operations when Interface doesn't have focus, but ONLY when in hmd	2016-10-13 13:48:44 -07:00
Ryan Huffman	55d4695489	Fix edit.js not allowing imports when you only have temp rez permissions	2016-10-13 11:51:54 -07:00
howard-stearns	78f96a80bd	oops	2016-10-12 16:31:12 -07:00
howard-stearns	b377127fc1	make marketplace tablet be clientOnly	2016-10-12 14:46:04 -07:00
Andrew Meadows	d54c07ed14	Merge 'master' into 'out-of-body-experience'	2016-10-12 13:35:27 -07:00
howard-stearns	0099a4e549	allow hand controller operations when Interface doesn't have focus, but ... ONLY when in hmd.	2016-10-12 11:23:06 -07:00
Seth Alves	16af14d1f6	Merge pull request #8758 from hyperlogic/bug-fix/allow-ignoreik-false ... allow equipped object to follow hand and not controller	2016-10-12 09:52:57 -07:00
Brad Hefta-Gaub	0f1e61e240	Merge pull request #8781 from ZappoMan/tweakGrabPoint ... adjust grab indicators	2016-10-12 07:08:16 -07:00
Brad Hefta-Gaub	6630ec3208	Merge pull request #8746 from ctrlaltdavid/21033 ... Send High Fidelity user's visibility when users.js starts up	2016-10-11 21:36:22 -07:00
Brad Hefta-Gaub	8ac31a041d	Merge pull request #8654 from ZappoMan/betterAway ... fix away HMD unmouted logic	2016-10-11 20:35:08 -07:00
Anthony J. Thibault	f76dbeeffd	Edit.js now works with new ignoreIK default	2016-10-11 17:12:02 -07:00
Brad Hefta-Gaub	e1a3bc7d55	hide/show grab point sphere only when in a grabbable entity	2016-10-11 16:22:42 -07:00
Brad Hefta-Gaub	93d9cf7917	adjust grab indicators	2016-10-11 12:42:26 -07:00
Andrew Meadows	abb05bc686	Merge pull request #8753 from ctrlaltdavid/21068 ... Improve indication of user not being logged in	2016-10-11 10:40:37 -07:00
Brad Hefta-Gaub	774d87a7a7	Merge pull request #8773 from howard-stearns/marketplace-button-state ... make marketplace button state match whether tablet is being shown	2016-10-10 15:50:07 -07:00
Brad Hefta-Gaub	a877f182f7	Merge pull request #8771 from howard-stearns/kick-by-laser ... fix kick by laser	2016-10-10 15:36:16 -07:00
howard-stearns	333ec388a8	make marketplace button state match whether tablet being shown	2016-10-10 14:30:47 -07:00
howard-stearns	1051c068e1	kick by hand controller	2016-10-10 13:47:08 -07:00
Brad Hefta-Gaub	4ec9299930	fix reticle depth when not moving mouse, but moving head relative to HUD	2016-10-08 14:31:30 -07:00
Brad Hefta-Gaub	20c522a9bc	fix more bugs in away	2016-10-08 13:45:18 -07:00
Brad Hefta-Gaub	3aa1c36f53	Merge branch 'master' of https://github.com/highfidelity/hifi into betterAway	2016-10-08 11:50:10 -07:00
Menithal	4bed3ee036	Adjusted theoretical Unequip time to 250 ms	2016-10-08 01:36:57 +03:00
Andrew Meadows	55c90e7bca	Merge branch 'master' into out-of-body-experience	2016-10-07 15:18:08 -07:00
Anthony J. Thibault	7c7a9055d1	Allow grabbed objects to override the ignoreIK = true default. ... They can do this by adding the following to their userData. grabbableKey: { ignoreIK: false } When this is present and false, the object will follow the hand joint, otherwise it will follow the hand controller.	2016-10-07 14:50:00 -07:00
Anthony J. Thibault	0c2ebc27cb	Fix for exception in handControllerGrab.js ... Specifically this: [UncaughtException] TypeError: Result of expression 'this.handToController' [undefined] is not a function. in file:///C:/msys64/home/anthony/code/hifi/build/interface/Release/scripts/defaultScripts.js:1388	2016-10-07 14:48:55 -07:00
Ryan Huffman	a5e3fa45c3	Fix advanced movement being disabled	2016-10-07 10:30:18 -07:00
Ryan Huffman	c74df965ba	Fix misnamed function and duplicate onFinish in tutorial	2016-10-07 10:30:18 -07:00
Ryan Huffman	fec8049226	Add proper disabling to advanced movement script	2016-10-07 10:30:18 -07:00
Ryan Huffman	827506e929	Disable 180 spin in tutorial	2016-10-07 10:30:18 -07:00
Ryan Huffman	a4ffa7b23f	Add disabling of right click menu with vive	2016-10-07 10:30:18 -07:00
Ryan Huffman	14323a06b3	Add interface to disable hand controller grab functionality	2016-10-07 10:30:18 -07:00
Ryan Downe Karpf	ed2571704f	Merge pull request #8735 from huffman/feat/teleport-improvements ... Update teleport.js to ignore invisible or collisionless objects and disallow teleporting to certain surfaces	2016-10-07 09:56:30 -07:00
David Rowe	52fbb654fa	Tweak location of users online minimize/maximize button	2016-10-07 15:43:54 +13:00
David Rowe	c637649805	Make users online title say to login to view	2016-10-07 15:25:47 +13:00
David Rowe	4ca0048ec9	Display minimized users list when not logged in	2016-10-07 15:21:24 +13:00
David Rowe	e2e762f9e7	Merge branch 'master' into 21055 ... Conflicts: interface/resources/qml/AddressBarDialog.qml	2016-10-07 11:27:35 +13:00
David Rowe	b2f3b47db9	Send High Fidelity user's visibility when users.js starts up	2016-10-06 12:16:57 +13:00
Ryan Huffman	d50689b795	Remove disabling of teleport in hand grab	2016-10-04 20:25:46 -07:00
Ryan Huffman	d0ba53a069	Change name of isTooCloseToTeleport to be more descriptive	2016-10-04 20:22:22 -07:00
Ryan Huffman	1e6aba1928	Fix teleport not removing overlay on teleport	2016-10-04 20:21:32 -07:00
Ryan Huffman	2ef7c9a57a	Disable smooth movement in teleport.js	2016-10-04 20:21:32 -07:00
Ryan Huffman	53623f7583	Make teleport.js normal rejection more lenient	2016-10-04 20:21:30 -07:00
Ryan Huffman	813ed59f00	Update teleport to not collide with non collidable entities	2016-10-04 20:19:54 -07:00
Ryan Huffman	75265cff6e	Update teleport to not let you teleport into walls	2016-10-04 20:19:54 -07:00
Ryan Huffman	b0c7e91737	Disable ray picking against invisible objects in far grab and teleport	2016-10-04 20:19:51 -07:00
Ryan Huffman	17c63eb722	Add the ability to ignore invisible entities in findRayIntersection	2016-10-04 20:19:32 -07:00
Ryan Huffman	8343cfd687	Add grip to unequip	2016-10-04 16:34:18 -07:00
Ryan Huffman	289cd6ba2b	Adjust hand controller unequip rotation threshold	2016-10-04 16:34:18 -07:00
Anthony J. Thibault	aab974e6ae	Merge branch 'master' into out-of-body-experience	2016-10-04 11:17:52 -07:00
David Rowe	caf1a93354	Merge branch 'master' into 21055 ... Conflicts: libraries/entities-renderer/src/RenderableWebEntityItem.cpp	2016-10-04 10:51:14 +13:00
Brad Hefta-Gaub	546d4ff986	remove mic and window resize notifications	2016-10-02 09:10:12 -07:00
David Rowe	ad5d525340	Fix keyboard status when switching between entities editor tabs	2016-09-30 14:13:35 +13:00
David Rowe	5e842843c6	Set alphabetic/numeric keyboard per field entered	2016-09-30 11:54:32 +13:00
Menithal	a6040197eb	Fixed HandcontrollerGrab unequip. ... Will now use deltaTime and a second instead of instantly disconnecting on if more than 0.1 off. This is to avoid accidental disconnection due to acceleration and latency	2016-09-29 22:24:07 +03:00
David Rowe	e3be34528f	Fix keyboard flickering when select entities ... Fix entities list footer count of selected entities in the process.	2016-09-29 16:53:20 +13:00
David Rowe	8e44096981	Fix last entities properties not scrolling when keyboard raised	2016-09-29 15:59:24 +13:00
David Rowe	f8572096b1	Merge branch 'master' into 21055	2016-09-28 20:00:04 +13:00
David Rowe	b60f649e0a	Scroll HTML window if necessary when raise keyboard	2016-09-28 19:27:16 +13:00
David Rowe	a94d77ee12	Raise and lower keyboard in entities editor	2016-09-28 17:57:53 +13:00
Brad Hefta-Gaub	f7228993a5	go into away if the application starts in HMD mode but it's not mounted	2016-09-26 17:29:37 -07:00
Brad Hefta-Gaub	c4a80996d5	fix away HMD unmouted logic	2016-09-23 16:17:28 -07:00
Anthony J. Thibault	98ffea2fb9	Merge branch 'master' into out-of-body-experience	2016-09-22 18:08:23 -07:00
Seth Alves	785e187a27	edit.js uses notification.js to indicate errors instead of a modal dialog. in HMD, notification messages no longer jitter around	2016-09-21 11:39:25 -07:00
Brad Hefta-Gaub	2b01c60a55	Merge pull request #8615 from davidkelly/dk/1264 ... Make the equip sphere emissive	2016-09-19 16:33:55 -07:00
Anthony J. Thibault	aefe224215	Fix for jittery far-grab at low update rates ... Clamp the blendFactor used to smooth out the motion of the far-grabbed object. This prevents the newTargetPosition from over shooting it's goal.	2016-09-19 10:51:46 -07:00
David Kelly	22d80914e2	whitespace	2016-09-16 14:17:44 -07:00
David Kelly	ade17e6456	PR feedback	2016-09-16 14:15:14 -07:00
David Kelly	2ddd46f30b	Switch to the cool looking model instead	2016-09-16 10:56:59 -07:00
David Kelly	1acfe017e1	Make the equip sphere emissive ... maybe this will make it visible in low ambient light situations?	2016-09-15 17:12:35 -07:00
Chris Collins	84ffda5281	Merge pull request #8608 from huffman/fix/particle_explorer ... Fix eventBridgeLoader path in particle explorer	2016-09-15 16:51:41 -07:00
Ryan Huffman	6a32ef29dc	Fix eventBridgeLoader path in particle explorer	2016-09-15 13:07:00 -07:00
howard-stearns	03a8af76e3	don't do hand-controller edit object-selection when pointed at a HUD ... element	2016-09-14 12:02:33 -07:00
Seth Alves	e5e9bb0052	Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments	2016-09-14 11:28:10 -07:00
David Rowe	fa0aeb4563	Display render info values only when valid provided	2016-09-13 13:03:47 +12:00
Andrew Meadows	09c4720665	fix typo in teleport.js	2016-09-12 16:35:52 -07:00
Andrew Meadows	9728cf6904	fix typos in teleport.js	2016-09-12 16:24:08 -07:00
Andrew Meadows	0d300c3a47	teleport.js drags avatar along	2016-09-12 16:24:08 -07:00
David Rowe	d61e4c5c11	Display textures size in MB	2016-09-13 10:52:19 +12:00
David Rowe	fe8b3b4d0d	Merge branch 'master' into 21040	2016-09-13 09:12:47 +12:00
David Rowe	44282499c5	New glyph for "has transparent"	2016-09-10 14:37:09 +12:00
Anthony J. Thibault	86351ca21c	Teleport bugs ... * made HMD.setPosition thread safe * changed script to use HMD.position = foo;	2016-09-09 17:32:02 -07:00
Andrew Meadows	82522fbbb1	fix C++ism typo in JS script	2016-09-09 16:40:07 -07:00
Andrew Meadows	6b9cdb440b	update teleport.js to teleport HMD before avatar ... (in theory, not tested)	2016-09-09 16:33:13 -07:00
David Rowe	a06f49f791	Fix footer entities count not being updated when change filter value	2016-09-10 11:14:23 +12:00
David Rowe	487cb7d893	Use findInFrustum in entities list and filter results per search radius	2016-09-09 18:58:38 +12:00
Seth Alves	ecb0669972	try to keep far grab from getting stuck if the entity is brought very near to the grab-point	2016-09-08 17:02:29 -07:00
Seth Alves	0f98c51d89	distance-grabbed things collide with static entities	2016-09-08 16:13:22 -07:00
Seth Alves	9e99cc1f78	fix mod.js	2016-09-08 07:35:52 -07:00
David Rowe	28cfca993f	Add and wire up "search in view" JavaScript API stub	2016-09-08 14:58:48 +12:00
David Rowe	a4b5f5395d	Add "in view" button	2016-09-08 12:56:41 +12:00
Seth Alves	9c96ffc9cb	don't show grab-point spheres if controller poses aren't valid	2016-09-07 16:31:02 -07:00
David Rowe	7d6ab77c16	Merge branch 'master' into 21040	2016-09-08 11:30:19 +12:00
Seth Alves	746d0cd91c	get various hand lasers to all line up with grab-point sphere	2016-09-07 16:10:37 -07:00
Seth Alves	b45181ea92	don't back up pick-ray from hand	2016-09-07 13:32:26 -07:00
Anthony J. Thibault	9f0550ea7e	Raised dpi of WebTablet to fit 480 width keyboard	2016-09-07 10:59:54 -07:00
Anthony J. Thibault	dc0d0c2d5c	Merge branch 'master' into feature/tablet-ui-foundation	2016-09-07 09:49:55 -07:00
Seth Alves	5303488f52	Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments	2016-09-07 09:40:51 -07:00
David Rowe	db30e36b3b	Implement expand/collapse action to show/hide table columns	2016-09-07 19:11:53 +12:00
David Rowe	b372f82f78	Ensure that the expand/collapse icon is always visible	2016-09-07 17:09:56 +12:00
David Rowe	dba3efd857	Add expand/collapse extra info toggle icon to entities table header	2016-09-07 15:04:27 +12:00
SamGondelman	88d0aa3737	removed showButtonDown, which didn't exist	2016-09-06 17:36:55 -07:00
Seth Alves	616b094111	experimenting with position of grab sphere	2016-09-06 16:16:09 -07:00
David Rowe	156866f835	Fix "has script" entities list icon	2016-09-07 11:12:04 +12:00
David Rowe	83593087b6	Resize table headers after filter value changed	2016-09-07 11:08:06 +12:00
Seth Alves	34e4b4ae19	move haptic-pulse for when grab-point enters a grabbable entity to the right section of code	2016-09-06 15:37:37 -07:00
Seth Alves	215fd4ddfd	fix grab-point sphere for right hand	2016-09-06 15:15:46 -07:00
David Rowe	f83599f855	Merge branch 'master' into 21040	2016-09-07 10:08:51 +12:00
Seth Alves	43c98b3f1e	attempt to avoid a very-still far-grab leaving something non-dynamic in bullet upon release. adjust position of grab-point sphere	2016-09-06 14:42:53 -07:00
Seth Alves	37db1cba26	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-09-06 09:38:44 -07:00
David Rowe	c44bd902c3	Display render info values only if provided	2016-09-03 13:07:40 +12:00
Andrew Meadows	0a55afda69	Merge pull request #8554 from elisa-lj11/marketplaces_html ... Include a marketplace status bar and access to "marketplace" of marketplaces	2016-09-02 17:12:05 -07:00
David Rowe	980df19db1	Merge branch 'master' into 21040 ... Conflicts: libraries/entities/src/EntityItemProperties.cpp	2016-09-03 11:38:27 +12:00
Seth Alves	b8b1127d55	merge from upstream	2016-09-02 15:11:21 -07:00
Anthony J. Thibault	0128d7c61b	Merge branch 'master' into feature/tablet-ui-foundation	2016-09-02 12:16:25 -07:00
Anthony J. Thibault	3d5e8fc213	First pass of keyboard raising and lowering	2016-09-02 12:15:30 -07:00
Brad Hefta-Gaub	cf242eca9f	Merge pull request #8537 from hyperlogic/feature/larger-marketplace-tablet ... Marketplace tablet is a bit larger and lower DPI.	2016-09-02 08:45:29 -07:00
Seth Alves	9ef03b1205	avoid having auto-unequip code trigger during a teleport	2016-09-01 19:13:08 -07:00
Seth Alves	8505d1eeed	avoid a bootstrap	2016-09-01 17:51:02 -07:00
Seth Alves	da35281941	don't assume collides-with-dynamic during a multi-grab	2016-09-01 16:57:23 -07:00
Seth Alves	b1eb4c361d	if a hand is disabled while holding something, release it	2016-09-01 15:02:41 -07:00
Seth Alves	dd7e25441c	include which hand in grab messages	2016-09-01 14:58:37 -07:00
Seth Alves	045042a9c6	don't disable grabbing when teleporting	2016-09-01 14:15:49 -07:00
Seth Alves	a35e527128	try to fix far-trigger	2016-09-01 11:46:08 -07:00
Seth Alves	53ba190ca6	don't do auto-release test unless the hand is equipping	2016-09-01 09:57:46 -07:00
Anthony J. Thibault	823420ae0a	Working web entity keyboard ... * Missing many keys * Does not dynamically appear and disappear	2016-08-31 17:57:13 -07:00
elisa-lj11	bebf9c5890	Added error feature when user tries to download a non fbx file	2016-08-31 17:46:35 -07:00
Seth Alves	47259ee053	find equip-points with controller position rather than hand	2016-08-31 16:52:46 -07:00
Seth Alves	21b4759b6d	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-08-31 10:27:44 -07:00
Ryan Downe Karpf	6c853ec77d	Merge pull request #8538 from AndrewMeadows/workaround-resolvePath ... workaround for Script.resolvePath() bug	2016-08-31 08:59:14 -07:00
Andrew Meadows	12e6920a8d	fix syntax error	2016-08-31 08:15:00 -07:00
elisa-lj11	d16ef521f4	fixed merge conflicts from Howard's webview fix	2016-08-30 15:33:59 -07:00
elisa-lj11	aceddb0cf8	merge with james repo	2016-08-30 15:07:01 -07:00
Seth Alves	78f54a7f33	get rid of some jitter in equipped items. do a better job of deciding when something equipped has been torn-away	2016-08-30 14:39:11 -07:00
Seth Alves	617880479a	Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions	2016-08-30 11:19:40 -07:00
Seth Alves	3a5f92d7a2	ignoreIK for equipping. change how auto-unequip searches	2016-08-30 11:16:13 -07:00
Brad Davis	eb0a8db0af	Merge pull request #8539 from hyperlogic/bug-fix/snappy-search-beam ... When trigger is pulled, snap search beam to correct length instead of animating	2016-08-30 11:13:58 -07:00
elisa-lj11	37cc50a14a	Merge remote-tracking branch 'highfidelity/master' into marketplaces_html	2016-08-30 10:45:26 -07:00
elisa-lj11	fa941e4a1b	Merge remote-tracking branch 'origin' into marketplaces_html	2016-08-30 10:42:56 -07:00
Seth Alves	f4eee8d480	Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers	2016-08-30 09:12:53 -07:00
elisa-lj11	f2e61aa504	added status bar to marketplace	2016-08-29 18:43:32 -07:00
Seth Alves	314b7617ac	Merge pull request #8543 from hyperlogic/bug-fix/entity-pointer-events ... Bug fix for click events received by entity scripts	2016-08-29 17:57:56 -07:00
James B. Pollack	2b2b2ecbac	caps	2016-08-29 17:44:33 -07:00
James B. Pollack	d3aad53e0e	cleanup	2016-08-29 17:43:32 -07:00
Andrew Meadows	2d8bb54b93	fix typo	2016-08-29 17:37:24 -07:00
James B. Pollack	2a12f2feae	marketplaces html	2016-08-29 17:27:39 -07:00
Andrew Meadows	b50d24fb00	don't use Script.resolvePath() in local functions	2016-08-29 17:11:29 -07:00
Anthony J. Thibault	e34aecde49	Bug fix for click events received by entity scripts ... PointerEvent.isLeftButton should be true even on left button release events. in a previous PR this behavior was changed. isLeftButton was used as a flag indicating the button state, which would be false on left button release events. Because we have scripts that rely on the old behavior, I've changed it back to the original and introduced isPrimaryHeld properties instead.	2016-08-29 16:21:39 -07:00
James B. Pollack	cceae50b90	no more delete with backspace	2016-08-29 14:28:05 -07:00
James B. Pollack	95c627aa71	dev	2016-08-29 14:24:36 -07:00
Anthony J. Thibault	3ed11d2e5f	When trigger is pulled, snap search beam to correct length instead of animating. ... This improves interaction on web browser tablets. Instead of the beam shooting through the tablet and animating back to the surface, it starts at the correct length.	2016-08-29 13:22:57 -07:00
Anthony J. Thibault	dcd91d4398	removed debug flag	2016-08-29 12:04:48 -07:00
Anthony J. Thibault	0f42943bfb	Marketplace tablet is a bit larger and lower DPI. ... Bug fix for grabbing/equipping large objects, they no longer will drop immediately if your grab point is too far away from the grabbed entity position.	2016-08-29 11:55:04 -07:00
Seth Alves	be1332532f	disable debugging prints	2016-08-29 03:39:52 -07:00
Seth Alves	5daf334a0e	avoid extra grab-point spheres when resetting scripts	2016-08-27 20:42:03 -07:00
Seth Alves	d69e712bef	keep near-grab radius small but still allow large equip hotspots	2016-08-27 20:23:19 -07:00
Seth Alves	2a5d686a76	don't show grab-point sphere when near grabbing or equipping	2016-08-27 20:11:16 -07:00
Seth Alves	3355097bd0	handle another type of abandoned grab	2016-08-27 19:46:15 -07:00
Seth Alves	7dad303ce7	don't leave stray blue search sphere when near-grabbing	2016-08-27 19:25:05 -07:00
Seth Alves	765cd72e0e	fix code that prints relative offsets of an equipped entity after it's been adjusted by the other hand	2016-08-27 19:13:32 -07:00
Seth Alves	cfca32e0b4	fix code that notices and fixes an abandoned grab	2016-08-27 16:00:27 -07:00
Seth Alves	e4b2b7158f	hotspots with large radius work correctly, again	2016-08-27 09:30:26 -07:00
Seth Alves	76b72e32f0	Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers	2016-08-27 09:06:45 -07:00
David Rowe	06f0e76647	Merge branch 'master' into 21040	2016-08-27 14:31:28 +12:00
David Rowe	0d1daecf12	Provide count of textures for entity items	2016-08-27 12:13:34 +12:00
James B. Pollack	264176dac6	css	2016-08-26 14:21:32 -07:00
James B. Pollack	382cbd0a73	start	2016-08-26 14:16:37 -07:00
James B. Pollack	53a2281918	better	2016-08-26 11:57:15 -07:00
James B. Pollack	f6bd04780d	add a print to catch errors	2016-08-26 11:56:40 -07:00
James B. Pollack	4c63ad1ac8	code cleanup	2016-08-26 10:19:31 -07:00
David Rowe	a0691a581c	Fix sense of column sort order indicators	2016-08-26 18:18:52 +12:00
David Rowe	f55d1f7ce7	Make new columns sortable	2016-08-26 17:56:23 +12:00