5700 commits

Author	SHA1	Message	Date
David Back	b6edb2c9d6	platform states, edit controller mapping, separate mac/win delete	2018-08-27 14:53:13 -07:00
danteruiz	e4293d9ad5	fixing some entity visual problems	2018-08-26 21:50:01 -07:00
Dante Ruiz	af19849a75	fixing merge conflict	2018-08-24 15:48:42 -07:00
Dante Ruiz	3796675123	script update and visuallyReady entities	2018-08-24 15:46:39 -07:00
John Conklin II	fcdbc6c6d2	Merge pull request #13778 from SamGondelman/bloom ... Enable bloom in zone properties	2018-08-24 14:46:31 -07:00
David Back	30c6975198	maintain stretch cube position vs mouse when stretching	2018-08-24 11:53:03 -07:00
David Back	5e4e255e94	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleScaleImprovements	2018-08-24 10:15:17 -07:00
Howard Stearns	9a472fa388	Merge pull request #13870 from zfox23/wallet_autologout ... Implement Wallet Security feature - Auto Logout checkbox	2018-08-23 18:04:38 -07:00
Zach Fox	dddb2141f0	Implement Wallet Security feature - Auto Logout checkbox	2018-08-23 15:45:29 -07:00
Zach Fox	e3d03cd321	Fix MS17738: Fix a case where the BLAST icon didn't show up in Snapshot Review	2018-08-23 13:16:02 -07:00
David Rowe	b6e4a22db7	Rotate the mini tablet as it expands	2018-08-23 13:06:28 +12:00
David Back	8eddb36c82	resize scale cube	2018-08-22 17:29:40 -07:00
David Back	8c422cb0eb	change corner cubes to center cube, replace spheres with cubes	2018-08-22 16:54:59 -07:00
Dante Ruiz	bb83a2f620	interstitial script ending cleanup fixes	2018-08-22 16:48:10 -07:00
David Rowe	335eb98bb7	Increase size of the "..." button	2018-08-23 11:14:21 +12:00
David Rowe	6dcce0e953	Revert display test to depending just on hand to camera angle for now	2018-08-23 10:59:23 +12:00
David Rowe	883479d654	Merge branch 'master' into M17428-c	2018-08-23 10:43:44 +12:00
Dante Ruiz	f5441b2721	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-22 15:28:42 -07:00
Dante Ruiz	78458d62de	revert some changes and fix toolbar issue	2018-08-22 15:20:56 -07:00
Dante Ruiz	535fdf32cf	saving changes	2018-08-22 13:13:00 -07:00
John Conklin II	32562511e8	Merge pull request #13782 from ElderOrb/FB17184 ... Add Support for Managing Avatar Entities to the Avatar App	2018-08-22 10:20:04 -07:00
Dante Ruiz	26a30edec9	trying to fix loading bar	2018-08-21 18:27:21 -07:00
Dante Ruiz	71e8ccd190	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-21 16:20:16 -07:00
Wayne Chen	4e9a544618	redoing newline	2018-08-21 16:01:24 -07:00
Wayne Chen	bb176eb228	trailing debug statements	2018-08-21 16:00:01 -07:00
Wayne Chen	7360629d31	modifying variable naming to fit convention	2018-08-21 14:13:55 -07:00
Wayne Chen	5b4eb92281	adding fix	2018-08-21 14:04:29 -07:00
John Conklin II	1b4314ae45	Merge pull request #13846 from ctrlaltdavid/M17652-b ... Reduce strength of teleport parabola	2018-08-21 11:32:40 -07:00
Wayne Chen	222391532a	Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192	2018-08-21 11:18:17 -07:00
Wayne Chen	bfb9b67968	more debug statements	2018-08-21 11:17:33 -07:00
Dante Ruiz	db3d3d3d93	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-21 09:56:59 -07:00
David Rowe	4b12e18c27	Merge branch 'master' into M17428-c	2018-08-21 16:52:30 +12:00
David Rowe	536db64123	Mitigate against UI overlay possibly getting rotated	2018-08-21 16:48:35 +12:00
David Rowe	e25b2f6e0f	Support stylus input on the mini tablet	2018-08-21 16:47:40 +12:00
David Rowe	f6a607efcc	Expand / shrink mini-tablet when showing / hiding	2018-08-21 15:43:37 +12:00
David Rowe	5e7f68d4b7	Use a smaller near grab radius for tablet and mini-tablet	2018-08-21 14:00:20 +12:00
David Rowe	e24d920bdd	Tune teleport and play area	2018-08-21 11:45:01 +12:00
David Rowe	0a82f8adc9	Merge branch 'master' into M17217-b	2018-08-21 11:25:58 +12:00
David Rowe	67eb03ba7d	Reduce strength of teleport parabola	2018-08-21 11:18:00 +12:00
David Rowe	69e5eb9b1c	Move tablet towards fingertips as it expands	2018-08-21 10:46:48 +12:00
David Rowe	dc86230e40	Make "..." expand tablet per display hand rather than centered	2018-08-21 10:33:13 +12:00
David Rowe	f4a8dc49e9	Add button sounds	2018-08-21 10:28:23 +12:00
David Rowe	4268297769	Mini tablet button actions	2018-08-21 09:17:53 +12:00
Seth Alves	c876cda89d	Merge pull request #13826 from ctrlaltdavid/M17615 ... Disable Vive teleport button if transitioning from direction button	2018-08-20 14:05:45 -07:00
David Rowe	6791d3f1b6	Mini tablet button icons and states	2018-08-21 08:36:04 +12:00
Dante Ruiz	2261ad2bcb	clean up the interstitial page	2018-08-20 11:14:48 -07:00
Ryan Huffman	ead0126365	Merge pull request #13815 from thoys/fix/create/createZeroRotationEntities ... MS17562: CreateApp - newly created Entity rotation should be zero	2018-08-20 09:07:38 -07:00
David Rowe	4e23caf46d	Fix tablet proper not being grabbed once mini tablet has expanded	2018-08-20 17:57:59 +12:00
David Rowe	ff54516790	Maintain overlays ready for display in HMD mode	2018-08-20 17:46:07 +12:00
David Rowe	aca343330f	Base UI elements	2018-08-20 16:00:02 +12:00
David Rowe	94041291d5	Add web3d overlay for UI surface	2018-08-20 10:58:01 +12:00
Alexander Ivash	9f92ff5de9	fix for duplicating wearables on saving ... note: the issue was caused by newly-introduced code converting between attachments & entities fix removes attachments-related code because attachments are deprecated and converted into entities on the fly	2018-08-18 16:38:35 +03:00
David Rowe	fce45339a2	Shorter teleport parabola	2018-08-18 12:39:34 +12:00
David Rowe	26576fa760	Fix Vive left/right buttons not disabling teleport	2018-08-18 09:34:16 +12:00
David Rowe	2c389af751	Display mini tablet only if camera is also looking at the hand	2018-08-17 16:18:22 +12:00
David Rowe	846f38584f	Merge branch 'master' into M17428	2018-08-17 15:01:35 +12:00
David Rowe	7e46a99400	Merge branch 'master' into M17217-b	2018-08-17 10:35:52 +12:00
David Rowe	5328b48acc	Make Vive snap turn buttons lock teleport, also	2018-08-17 09:09:11 +12:00
David Rowe	bf733ded0f	Handle Vive controller not being available at start-up	2018-08-17 09:08:28 +12:00
John Conklin II	96fd4704ac	Merge pull request #13829 from huffman/fix/edit-zoom-stuck ... Fix edit orbit camera getting stuck zooming	2018-08-16 08:21:31 -07:00
David Rowe	40f7914aae	Expand from lower left/right of proxy tablet	2018-08-16 19:11:03 +12:00
David Rowe	7a1a86f182	Expand proxy tablet immediately it is grabbed; grab with either hand	2018-08-16 16:20:28 +12:00
David Rowe	cb9b7f567a	Move update functions into state machine	2018-08-16 16:08:36 +12:00
David Rowe	8d1b947bbd	Fix variable names	2018-08-16 13:35:36 +12:00
elderorb	ea22fdb400	Merge branch 'master' into FB17184	2018-08-16 02:08:47 +03:00
David Rowe	a86fdeafc0	Merge branch 'master' into M17248-a	2018-08-16 10:38:30 +12:00
Ryan Huffman	2f833f16d8	Force entity list tool to refresh when opened	2018-08-15 14:19:20 -07:00
Ryan Huffman	24af22a52f	Fix edit orbit camera getting stuck zooming	2018-08-15 13:56:44 -07:00
Seth Alves	83718ca06d	Merge pull request #13746 from alexiamandeville/emoteIcon ... updating emote app icon	2018-08-15 08:29:48 -07:00
David Rowe	2034162c76	Disable Vive teleport button if transitioning from direction button	2018-08-15 21:31:53 +12:00
Seth Alves	3623590e90	Merge pull request #13784 from sethalves/far-point-joints ... Far point joints	2018-08-14 15:40:07 -07:00
John Conklin II	8c5344ad1a	Merge pull request #13781 from thoys/fix/localAngularVelocityZeroesOut ... MS17380: Create App fix for angularVelocity zeroing out on duplication or undo	2018-08-14 11:37:33 -07:00
Seth Alves	527b27da96	pseudo-joints for far-grab positions	2018-08-14 08:55:20 -07:00
Seth Alves	54fa7dd0b6	Merge pull request #13817 from sethalves/fix-desktop-handshake ... fix desktop press-x handshake	2018-08-14 08:42:10 -07:00
John Conklin II	73ef2ff09c	Merge pull request #13804 from thoys/fix/create/cantMoveFocusCameraOutPastLowLimit ... MS17291: Create-app increase focus distance limit	2018-08-13 14:58:17 -07:00
Seth Alves	4fa0c96046	fix desktop press-x handshake	2018-08-13 11:57:48 -07:00
Thijs Wenker	221dfb8979	typo fix	2018-08-11 05:46:48 +02:00
Thijs Wenker	a20be5b50d	remove rotation for newly created entities	2018-08-11 02:28:01 +02:00
Thijs Wenker	f26188d5b8	added comment for limit choice	2018-08-11 01:54:13 +02:00
Dante Ruiz	75cc1c62c0	mostly done interstitial page	2018-08-10 16:53:34 -07:00
Thijs Wenker	876079bb81	deactivate Create App when desktop windows are closed	2018-08-11 00:41:50 +02:00
David Rowe	2a177e04e1	Misc. tweaks	2018-08-11 10:11:56 +12:00
Ryan Huffman	c0ac76bf4a	Merge pull request #13797 from dback2/rotationRingSize ... Edit handle rotation ring size	2018-08-10 13:53:10 -07:00
David Rowe	b4ec1f4310	Reorient tablet proxy	2018-08-11 06:18:26 +12:00
David Back	1d0da4042a	Merge pull request #13771 from dback2/entityListCtrlReselection ... Reselecting same entity in list will unselect it	2018-08-10 10:41:57 -07:00
David Rowe	7a7fca3982	Update tiny tablet model	2018-08-11 05:34:01 +12:00
Dante Ruiz	46297c6b22	interstitial page	2018-08-10 10:20:39 -07:00
John Conklin II	de0cdf6d8d	Merge pull request #13793 from wayne-chen/fixWebTabletJSBug ... Fixing web tablet JavaScript error	2018-08-10 09:31:17 -07:00
Alexander Ivash	ce6c8c72f5	ensure selection of newly-added wearable always happens after pushing updated wearables list to UI	2018-08-10 19:09:47 +03:00
Alexander Ivash	90fb0d7be6	add possibility to add wearable from external url	2018-08-10 17:59:11 +03:00
Thijs Wenker	925cfc9b23	Set a max focus distance value of 14km to not lose the edit handles by far-clipping	2018-08-10 16:45:27 +02:00
Alexander Ivash	0a28361dc8	treat ModelEntityItem-s with relayParentJoints as wearables	2018-08-10 12:58:45 +03:00
David Rowe	c89955b416	Use FBX for tablet proxy	2018-08-10 13:53:53 +12:00
David Rowe	3732de51a3	Tidying	2018-08-10 13:25:41 +12:00
David Rowe	bc456ae5c8	Don't show proxy if in toolbar mode	2018-08-10 13:18:21 +12:00
David Rowe	557f18f370	Don't show proxy if tablet has been opened by other means	2018-08-10 13:10:24 +12:00
David Rowe	b240a4248d	Size and position according to avatar scale	2018-08-10 12:51:06 +12:00
David Rowe	0aa42d70d6	Don't let the tablet proxy hand do the initial grab	2018-08-10 12:37:21 +12:00
John Conklin II	6c647c8185	Merge pull request #13768 from thoys/fix/create/triggerable-reset ... MS17413 Triggerable value does not reset on entity deselect	2018-08-09 17:13:34 -07:00
David Rowe	047ea0deaf	Remove the post-teleport spot if a new teleport is started	2018-08-10 11:31:50 +12:00
Dante Ruiz	353121be7d	making some changes	2018-08-09 16:29:37 -07:00
David Rowe	a08bcd325d	Merge branch 'master' into M17217-b ... # Conflicts: # interface/src/scripting/HMDScriptingInterface.h	2018-08-10 11:25:39 +12:00
Alexia Mandeville	38973f0840	Adding icon states to emote app, active state	2018-08-09 16:00:36 -07:00
John Conklin II	6447bcab5b	Merge pull request #13765 from dback2/serverScriptStatus ... Fix server script status	2018-08-09 14:51:17 -07:00
John Conklin II	f31776516b	Merge pull request #13791 from dback2/editHandlesAlpha ... Alpha 1 for edit handles	2018-08-09 14:50:43 -07:00
David Rowe	5bada416bb	Show/hide/expand tablet proxy	2018-08-10 09:41:25 +12:00
David Back	cc953ab691	Merge branch 'master' of https://github.com/highfidelity/hifi into rotationRingSize	2018-08-09 13:36:13 -07:00
David Back	e36e9aa68f	tweak rotation ring size	2018-08-09 13:35:55 -07:00
John Conklin II	6481aea2f4	Merge pull request #13715 from SamGondelman/parabolic ... Enable parabolic teleport	2018-08-09 13:12:17 -07:00
Dante Ruiz	9a8ebdd021	Merge pull request #13739 from dback2/cloneChildrenFix ... Fix cloning a parented entity	2018-08-09 13:05:28 -07:00
John Conklin II	f4f0c5fcad	Merge pull request #13767 from ctrlaltdavid/M15772 ... Fix entity stay highlighted after hand leaves when far grabbing another	2018-08-09 12:53:41 -07:00
Wayne Chen	2a6ff90a2c	fixing web tablet error	2018-08-09 11:30:10 -07:00
David Back	a6d944e034	use alpha 1 for edit handles	2018-08-09 10:32:34 -07:00
John Conklin II	34697b6b07	Merge pull request #13770 from huffman/fix/edit-duplicate-fix ... Fix duplicating multiple entities causing infinite looping	2018-08-09 09:07:37 -07:00
Dante Ruiz	faa5411757	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-09 08:42:14 -07:00
David Rowe	521797b32f	Script and state machine basics	2018-08-09 20:44:01 +12:00
Dante Ruiz	0fed48bd0e	improving interstitial page	2018-08-08 18:15:27 -07:00
Anthony Thibault	90b0bd333f	Merge pull request #13774 from danteruiz/revert-tablet-material-entity ... Revert to using overlays instead of material entities for button highlighting.	2018-08-08 17:33:26 -07:00
David Rowe	71341cf700	Display teleport target after teleport	2018-08-09 10:51:12 +12:00
SamGondelman	a0c3c09b05	Merge remote-tracking branch 'upstream/master' into bloom	2018-08-08 14:44:02 -07:00
David Back	a04ffd969e	deselect when reselecting same entity, fix indents	2018-08-08 13:32:38 -07:00
Ryan Huffman	544a6504f2	Merge pull request #13760 from ctrlaltdavid/M16932 ... Render Touch controllers at physical hands's locations	2018-08-08 13:11:21 -07:00
David Back	adc2c9c6fc	Merge branch 'master' of https://github.com/highfidelity/hifi into entityListCtrlReselection	2018-08-08 12:41:54 -07:00
SamGondelman	2959a406d7	working on enabling bloom	2018-08-07 21:52:05 -07:00
David Rowe	f7c17df6cc	Float play area and sensors above the ground	2018-08-08 16:32:08 +12:00
Dante Ruiz	a9fd034f09	switching to location api	2018-08-07 16:02:54 -07:00
David Rowe	fd977a758b	Update teleport destination model	2018-08-08 10:49:34 +12:00
David Rowe	96767c1103	Merge branch 'master' into M17217-b ... # Conflicts: # plugins/openvr/src/OpenVrDisplayPlugin.cpp	2018-08-08 10:43:58 +12:00
David Rowe	f65b1a26ae	Merge remote-tracking branch 'SamGondelman/parabolic2' into M17217-b	2018-08-08 10:06:43 +12:00
David Back	3c5c5d8552	Merge pull request #13750 from dback2/editLogSpamFix ... Fix edit log spam with -1 hand	2018-08-07 13:51:39 -07:00
David Rowe	a7170a5892	Fix typo	2018-08-08 08:49:29 +12:00
Dante Ruiz	269afb9a49	remove tablet material entities code remove create	2018-08-07 11:19:22 -07:00
Dante Ruiz	8c5eefcc95	some file and code cleanup	2018-08-07 10:58:45 -07:00
Dante Ruiz	d78c571df6	revert to use overlays instead of entities for tablet highlighting	2018-08-07 10:56:53 -07:00
Thijs Wenker	9c96a10f6c	Fix for angularVelocity zeroing out on duplication or undo	2018-08-07 19:35:49 +02:00
David Back	d88615219c	CR changes	2018-08-07 10:19:48 -07:00
David Back	174519e86e	fix reselecting same entity in list	2018-08-07 09:56:51 -07:00
Ryan Huffman	61fdce9c11	Fix duplicating multiple entities causing infinite looping	2018-08-07 09:52:14 -07:00
Thijs Wenker	95c32c8e45	fix reset triggerable checkbox	2018-08-07 17:23:49 +02:00
David Rowe	c9c23b8db3	Fix entity stay highlighted after hand leaves when far grabbing another	2018-08-07 15:34:17 +12:00
David Back	f9e25d36e7	use wrapper emitScriptEvent, change to Fetching	2018-08-06 17:52:27 -07:00
Dante Ruiz	6a4a56cee3	imporving the interstitial page script	2018-08-06 17:42:21 -07:00
David Back	e5abd9d57d	fix server script status event, use [ Getting status ]	2018-08-06 17:03:32 -07:00
David Back	112327a3c1	Merge pull request #13735 from dback2/entityCameraKeyFix ... Use key codes for entity camera keys	2018-08-06 14:07:48 -07:00
David Rowe	83ed572a33	Render Touch controllers at physical hands's locations	2018-08-04 19:27:44 +12:00
David Rowe	e008f057eb	Fade play area after teleport	2018-08-04 18:19:59 +12:00
David Rowe	c0dc70c076	Parent play area to teleport target unless underneath avatar	2018-08-04 17:26:18 +12:00
David Rowe	ed5e77df37	Scale-in teleport target from zero size	2018-08-04 15:11:53 +12:00
SamGondelman	f1ca0411c0	drawInFront parabolas	2018-08-03 16:43:13 -07:00
David Rowe	653a281482	Use new teleport destination FBX	2018-08-04 10:11:22 +12:00
David Rowe	11b85e30db	Merge branch 'master' into M17217-a	2018-08-04 09:44:39 +12:00
David Rowe	1cd3869b2c	Reinstate FBX file that original version or parabolic branch deleted	2018-08-04 09:42:52 +12:00
David Back	0565e0400c	fix edit log spam with -1 hand	2018-08-03 11:08:56 -07:00
Dante Ruiz	a2717e2efa	editing interstitialPage.js	2018-08-03 10:47:20 -07:00
Dante Ruiz	683b42e35b	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-03 09:59:35 -07:00
Dante Ruiz	b9cfbfb3be	adding interstitial page file to default sctipts	2018-08-03 09:59:21 -07:00
David Rowe	5be945715f	Include the teleporter target in the occlusion	2018-08-03 08:22:36 +12:00
David Rowe	29dbc01361	Add alternative code to position Oculus sensors at correct elevation	2018-08-03 08:12:44 +12:00
David Rowe	57da0fef63	Show occluded parts of the play area overlays	2018-08-02 15:21:56 +12:00
David Rowe	eed0159b5e	Scale-in play area from zero size	2018-08-02 14:45:09 +12:00
David Rowe	07049b9481	Update and tidy play area and Oculus sensor models	2018-08-02 11:08:21 +12:00
David Back	0b9e520b53	fix grab cloning parented entitiy	2018-08-01 16:00:25 -07:00
John Conklin II	f02e91806c	Merge pull request #13686 from huffman/fix/undo-create-entity ... Fix added entities not being undoable in Create	2018-08-01 13:11:17 -07:00
David Back	cdbf75666f	new line	2018-08-01 12:46:49 -07:00
David Back	f946bb73ef	remove constants	2018-08-01 12:46:17 -07:00
David Back	97e45643b0	spacing	2018-08-01 12:44:40 -07:00
David Back	ca3151ae39	Merge branch 'master' of https://github.com/highfidelity/hifi into entityCameraKeyFix	2018-08-01 12:43:04 -07:00
David Back	3e9e00f1d6	use key codes for entity camera keys	2018-08-01 12:42:50 -07:00
Thijs Wenker	c562a6945d	Merge pull request #13671 from huffman/fix/create-copy-follows-user ... Fix duplication not working as expected on grabbed entities	2018-08-01 19:25:33 +02:00
SamGondelman	e11030bbc3	mukul's changes, enable parabolic teleport	2018-08-01 09:46:17 -07:00
Ryan Huffman	6369cee0d1	Fix added entities not being undoable in Create	2018-08-01 09:40:29 -07:00
David Rowe	981b6fc4c9	Display play area and sensor about teleport target	2018-08-01 17:18:38 +12:00
David Back	e8068fea0a	block selecting overlays with other hand	2018-07-31 17:18:35 -07:00
David Rowe	cf12124b34	Merge remote-tracking branch 'SamGondelman/parabolic' into M17217-a	2018-08-01 10:14:15 +12:00
Ryan Huffman	bbdc7ba380	Fix Uuid null comparison and dangling comma in Create tool	2018-07-31 13:57:27 -07:00
David Back	ad9ec26781	print	2018-07-31 11:53:17 -07:00
David Back	7bf7663f09	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues	2018-07-31 11:51:26 -07:00
David Back	4a722a62f7	use click handler only, remove triggerClicked	2018-07-31 11:51:16 -07:00
Ryan Huffman	431cbf2694	Merge pull request #13699 from thoys/fix/create/triggerable ... MS16809: handle both triggerable and wantsTrigger in CreateApp	2018-07-31 10:34:31 -07:00
John Conklin II	8e277758ad	Merge pull request #13700 from danteruiz/fix-grabbing-problem ... Impove the way we checkForChildTooFarAway in nearParentGrabEntity.js	2018-07-31 09:46:57 -07:00
David Back	03f0116b79	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues	2018-07-31 09:28:14 -07:00
John Conklin II	bd2ab38bfe	Merge pull request #13701 from ElderOrb/FB16702 ... FB16702 - Avatar App does not save Animation JSON Override URL	2018-07-30 14:51:32 -07:00
John Conklin II	200292c18e	Merge pull request #13675 from howard-stearns/forget-you ... pal refresh fixes	2018-07-30 14:38:24 -07:00
David Back	b420ef8cf2	fix trigger clicks on vive	2018-07-30 13:21:09 -07:00
David Back	bec54cc182	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues	2018-07-30 12:26:48 -07:00
SamGondelman	19cf2b0a29	mukul's changes, enable parabolic teleport	2018-07-30 11:28:59 -07:00
Sam Gondelman	8201997a16	Merge pull request #13660 from SamGondelman/parabolic ... Parabolic Picking + Pointers	2018-07-30 10:49:02 -07:00
Thijs Wenker	d486a0721d	Merge pull request #13698 from dback2/resetPropertiesNoSelection ... Reset entity property fields when no selection	2018-07-30 19:37:12 +02:00
Dante Ruiz	0f46001f9a	remove redundent variable	2018-07-30 10:29:53 -07:00
Dante Ruiz	4caf613269	making requested changes	2018-07-30 10:19:27 -07:00
David Back	398c530214	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues	2018-07-30 10:18:19 -07:00
Wayne Chen	c8845e1a23	Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192	2018-07-28 09:42:12 -07:00
Dante Ruiz	cf6850de48	better stuff	2018-07-27 17:53:21 -07:00
Dante Ruiz	887a416656	Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem	2018-07-27 17:50:12 -07:00
Dante Ruiz	6320401308	somewhat better distance from bounding box	2018-07-27 17:49:49 -07:00
SamGondelman	1ef54b2fe6	back to ray teleport	2018-07-27 14:58:56 -07:00
John Conklin II	fc88165e23	Merge pull request #13696 from SamGondelman/particleRot ... Particles don't spin with head roll, new spin + rotateWithEntity properties	2018-07-27 14:54:48 -07:00
Thijs Wenker	9dce1b64b6	Merge pull request #13695 from huffman/fix/create-focus-on-create ... Fix edit.js not being able to delete after creating entity	2018-07-27 22:43:34 +02:00
Ryan Huffman	103f9e04fa	Fix duplication not working as expected on grabbed entities	2018-07-27 13:32:12 -07:00
Dante Ruiz	30b4815bf9	Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem	2018-07-27 13:13:10 -07:00
David Rowe	3bfdd3ff58	Maintain virtual and real world orientations when teleport	2018-07-27 15:18:40 +12:00
David Back	cd842afc1c	prevent both hands triggering same time, allow one to trigger after other	2018-07-26 17:52:25 -07:00
David Back	dcdf734114	remove unneeded	2018-07-26 16:43:07 -07:00
David Back	82e5d6ad29	use triggerClicks from controllers for edit handles	2018-07-26 16:38:25 -07:00
Alexander Ivash	29f7cab7df	FB16702 - Avatar App does not save Animation JSON Override URL ... note: PR also changes logic of 'hint' - previously it showed hard-coded senseless text, now - current value of 'animation URL'	2018-07-27 02:08:44 +03:00
Dante Ruiz	74bb2301b0	minimize diff	2018-07-26 16:05:56 -07:00
Dante Ruiz	31d31af941	minimize diff	2018-07-26 16:05:18 -07:00
David Back	ff6ed971d8	comments, re-org, submesh number	2018-07-26 15:40:27 -07:00
Dante Ruiz	02232daa58	Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem	2018-07-26 15:26:24 -07:00
Dante Ruiz	6edd109dfe	revert back to the old way we checkForChildTooFarAway	2018-07-26 15:23:54 -07:00
SamGondelman	74b3143bc3	remove scaling from teleport script	2018-07-26 12:23:14 -07:00
howard-stearns	699d1647ca	typo, and more conservative item limit	2018-07-26 12:01:56 -07:00
howard-stearns	9b61e8c4ad	Merge branch 'master' of github.com:highfidelity/hifi into forget-you	2018-07-26 11:50:15 -07:00
SamGondelman	1c1b68ee66	emitterShouldTrail fix, review comments, rotateWithEntity	2018-07-26 11:41:16 -07:00
Thijs Wenker	6e23caca0d	handle both wantsTrigger and triggerable in CreateApp	2018-07-26 20:25:42 +02:00
David Back	cb8e9f218b	reset all property fields when no selection	2018-07-26 11:23:28 -07:00
Zach Fox	cc921ed9c4	Merge pull request #13685 from zfox23/MS16820_rateLimitPolaroids ... Fix MS16820: Rate limit Snapshot Polaroids	2018-07-25 15:45:51 -07:00
SamGondelman	9b41cb5554	improve model picking performance, scale parabola v/a with avatar, improve followNormal behavior, turn off followNormal on teleport, remove 1 m no teleport spot	2018-07-25 15:19:25 -07:00
Ryan Huffman	0e0966004c	Fix edit.js not being able to delete after creating entity ... This fix puts focus back on the main window when creating an entity so that the user can use shortcuts like 'f' and 'delete'	2018-07-25 14:52:56 -07:00
Sam Gondelman	2aeef2e016	min spinSpread is 0	2018-07-25 09:40:52 -07:00
Sam Gondelman	b4cc9c8004	typo	2018-07-25 09:36:43 -07:00
SamGondelman	4750611af9	particles don't spin with head roll, add particle spin properties, negative emitSpeed	2018-07-24 23:47:58 -07:00
Zach Fox	04754d0dab	Fix MS16820: Rate limit Snapshot Polaroids	2018-07-24 15:28:37 -07:00
Alexander Ivash	6db46e84ff	FB17036 Avatar App causes error on cache reload (CTRL+R)	2018-07-25 01:11:26 +03:00
SamGondelman	fbcddf1445	test gradual normal interpolation	2018-07-24 14:15:49 -07:00
Thijs Wenker	b7d12c6b1c	Merge pull request #13656 from huffman/fix/create-selection-box ... Fix the Create selection box not always matching outline	2018-07-24 19:49:20 +02:00
SamGondelman	318ef907b8	parabola/polyvox, fixing some bugs	2018-07-24 10:08:35 -07:00
Wayne Chen	c0dfbac480	adding comment for possible solution - still WIP	2018-07-24 10:04:51 -07:00
John Conklin II	2ac9463830	Merge pull request #13653 from ElderOrb/fake-wearables-fix ... FB16870: Avatar Wearables showing incorrect number	2018-07-23 15:55:11 -07:00
howard-stearns	48184c102b	Merge branch 'master' of github.com:highfidelity/hifi into forget-you	2018-07-23 15:25:46 -07:00
howard-stearns	f87db26cad	pal refresh that remembers your place	2018-07-23 15:25:06 -07:00
Wayne Chen	e4a5be668a	adding check function for pointing at near grabbable entity	2018-07-23 12:29:01 -07:00
Wayne Chen	1ec136a19c	removing debug overlay statements	2018-07-23 12:18:26 -07:00
Wayne Chen	a2aeacab64	adding fix for near grabbing with web entity	2018-07-23 12:17:19 -07:00
Wayne Chen	89f9cd089f	Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192	2018-07-23 11:51:39 -07:00
Ryan Huffman	d1da7675f6	Merge pull request #13648 from huffman/fix/create-xz-lines ... Fix xz guides not showing when translating with Shift	2018-07-23 10:44:47 -07:00
Seth Alves	4f45fbc5f5	Merge pull request #13661 from danteruiz/avatarapp-undefined-data ... fix avatar app from crashing when avatar entity variable is undefined.	2018-07-23 10:18:31 -07:00
Seth Alves	a6a4dd3b8e	Merge pull request #13570 from danteruiz/fix-tablet-material-entities ... clean up tablet material entities and don't display them in create menu	2018-07-23 09:50:23 -07:00
Wayne Chen	1880c49d03	removing garbage file	2018-07-20 17:18:58 -07:00
Wayne Chen	32886d67d9	optimizing near-/far- grabbable entities a bit	2018-07-20 17:17:36 -07:00
Wayne Chen	be5fdef974	adding check in isReady for grabbing non-web entitys	2018-07-20 15:26:55 -07:00
danteruiz	9bf6cff5cd	fix indent isssues	2018-07-20 12:27:51 -07:00
Ryan Huffman	ae26c5fe9a	Remove extraneous logging	2018-07-20 11:38:02 -07:00
Ryan Huffman	32122a7c1f	Replace magic numbers with RAIL_AXIS_LENGTH	2018-07-20 11:37:42 -07:00
danteruiz	ce3922a3c1	fix avatarEntities undefined crash	2018-07-20 11:23:02 -07:00
Wayne Chen	4e3a6cb320	adding ignore for far-/near- grabbable entities when operating on web surface	2018-07-20 11:18:20 -07:00
SamGondelman	763e6465a2	followNormal, fixin stuff	2018-07-20 10:41:24 -07:00
Alexander Ivash	f5717b7648	add check for SELF_ID	2018-07-20 19:33:16 +03:00
Wayne Chen	5276d84aa5	pushing what i coded out loud - it broke the way grabbing works	2018-07-19 17:08:12 -07:00
Alexander Ivash	fb8640de47	FB16870: Avatar Wearables showing incorrect number	2018-07-20 02:51:17 +03:00
Ryan Huffman	2305099874	Fix the Create selection box not always matching outline	2018-07-19 16:09:21 -07:00
SamGondelman	956c1511b6	Merge remote-tracking branch 'upstream/master' into parabolic	2018-07-19 15:23:25 -07:00
Wayne Chen	1942eaf68f	Merge branch 'fixGrabWebSurface-case-16192' of https://github.com/wayne-chen/hifi into fixGrabWebSurface-case-16192	2018-07-19 13:47:48 -07:00
Wayne Chen	b60d650843	Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192	2018-07-19 13:47:38 -07:00
Ryan Huffman	25b558e6b4	Fix xz guides not showing when translating with Shift	2018-07-19 12:56:18 -07:00
SamGondelman	39fa3420ec	pointer rendering, update teleport.js	2018-07-19 12:02:39 -07:00
Qliemillar	2163bf1ef0	Merge pull request #13628 from r3tk0n/16726-Vive-Blackboxes ... 16726 - Remove Black Boxes ( HMD.requestShowHandControllers() )	2018-07-19 12:34:38 -06:00
Howard Stearns	2378cdfdc6	Merge pull request #13624 from howard-stearns/app-refactor4-merge ... appUi module, and use in People app	2018-07-19 11:07:54 -07:00
Qliemillar	3466d944fb	Merge pull request #13630 from huffman/fix/create-undo-while-disabled-visual ... Disable showing the entity edit tools when undoing while disabled	2018-07-19 09:03:40 -06:00
howard-stearns	a904182cc2	cr feedback	2018-07-18 14:03:26 -07:00
Thijs Wenker	b29044fd7e	Merge pull request #13618 from dback2/clickHandleSwitchEntityFix ... Fix quickly clicking an edit handle causing selected entity change	2018-07-18 22:49:11 +02:00
howard-stearns	74914ffb3e	Merge branch 'master' of github.com:highfidelity/hifi into app-refactor4-merge	2018-07-18 13:16:50 -07:00
Ryan Huffman	b015845371	Disable showing the entity edit tools when undoing while disabled	2018-07-18 11:54:40 -07:00
r3tk0n	a9eb8103f6	Clean up comments a bit.	2018-07-18 09:52:25 -07:00
r3tk0n	f7b49598b5	Disabled tip boxes for Vive controllers, as per experience team request.	2018-07-18 09:50:59 -07:00
Qliemillar	080d664341	Merge pull request #13619 from luiscuenca/handTouchDisabler ... Allow creators to disable hand touch from javascript	2018-07-18 08:16:37 -06:00
Wayne Chen	ac642f126a	adding extra conditional to ensure all modules are checked	2018-07-17 20:52:50 -07:00
Wayne Chen	30ca5a8cbd	code cleanup to use web laser if laser is not pointing at grabbable entity	2018-07-17 16:44:49 -07:00
Wayne Chen	eb7bde1bfc	switching near grab priority to be before web surface laser	2018-07-17 15:38:56 -07:00
Wayne Chen	f444d0ae28	Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192	2018-07-17 15:03:04 -07:00
Qliemillar	07a7bbbcf6	Merge pull request #13621 from thoys/fix/create/desktop-tablet#master ... [FIX] Use create app in tablet mode when choosing to use tablet in desktop mode	2018-07-17 14:36:55 -06:00
howard-stearns	bfd9e208b5	Merge branch 'master' of github.com:highfidelity/hifi into app-refactor4-merge	2018-07-17 12:31:18 -07:00
Wayne Chen	2c16c6579f	Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192	2018-07-17 11:54:15 -07:00
Wayne Chen	813c58a1fb	adding check to see if near grabbing is ready	2018-07-17 11:53:55 -07:00
Thijs Wenker	09e1090e72	Use create app in tablet mode when choosing to use tablet in desktop mode	2018-07-17 17:33:13 +02:00
Qliemillar	42daa33d11	Merge pull request #13560 from danteruiz/fix-parent-grab-and-flickering ... fix parent grab dropping and cullig flickering when flying at high velocities	2018-07-17 08:53:41 -06:00
luiscuenca	82a3b73de8	Added disable hand touch for entityID	2018-07-17 07:06:48 -07:00
howard-stearns	cb5ac6f42c	Merge branch 'master' of https://github.com/highfidelity/hifi into app-refactor4-merge	2018-07-16 17:43:53 -07:00
luiscuenca	84dac94379	Allow creator to disable hand touch	2018-07-16 17:03:50 -07:00
Zach Fox	7cdb84ee68	Merge pull request #13602 from zfox23/MS16562_massivePalSpeedup ... Fix MS16562: Massive PAL speedup!	2018-07-16 16:45:01 -07:00
howard-stearns	2c92b02b95	lint	2018-07-16 16:28:44 -07:00
howard-stearns	f1fed37763	cleanup	2018-07-16 15:58:01 -07:00
howard-stearns	4e6aa34814	Merge branch 'master' of github.com:highfidelity/hifi into app-refactor4	2018-07-16 13:07:08 -07:00
howard-stearns	ffa5259319	cleanup references to button, tablet	2018-07-16 13:06:12 -07:00
howard-stearns	46061a2a15	initial with pal	2018-07-16 11:54:05 -07:00
Dante Ruiz	20a8275343	min diff	2018-07-16 11:43:29 -07:00
Dante Ruiz	fa2b975e8f	undo some wrong changes	2018-07-16 11:42:38 -07:00
Dante Ruiz	0fa2a71d0f	actually fix requested changes	2018-07-16 11:35:53 -07:00
Dante Ruiz	d81420542c	making PR requests	2018-07-16 11:00:27 -07:00
Dante Ruiz	47eb7a0899	Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab-and-flickering	2018-07-16 10:04:42 -07:00
Qliemillar	511b297be5	Merge pull request #13597 from dback2/entityListDeleteSpamFix ... Fix entity list refresh when entity deleted	2018-07-16 09:49:25 -06:00
David Back	46a9521939	fix selecting an edit handle causing selected entity change	2018-07-13 17:40:24 -07:00
Zach Fox	c3ffe7eb97	Fix bubble shading; fix audio loudness calculation	2018-07-13 13:55:32 -07:00
David Back	c225c3deca	Merge pull request #13608 from dback2/alignSelectionToGridFix ... Fix aligning selection to grid	2018-07-13 13:33:26 -07:00
Zach Fox	4daa0c6537	CR feedback	2018-07-13 12:47:45 -07:00
David Back	0a738e36a8	Merge pull request #13569 from dback2/hmdHandlesInBoundingBox ... Only clamp edit handles in HMD when outside bounding box	2018-07-13 10:55:54 -07:00
unknown	151f948b26	prints	2018-07-12 19:26:20 -07:00
unknown	acae4df3c3	fix align to selection to grid	2018-07-12 19:23:06 -07:00
Alexander Ivash	437f49ac22	16683 Avatar App - Add to Favorites Button Not Working	2018-07-13 03:01:02 +03:00
Zach Fox	fa518b995a	Fix my audio level	2018-07-12 15:16:54 -07:00
Zach Fox	92756d81ad	Implement MS16562: Massive PAL speedup!	2018-07-12 15:05:31 -07:00
unknown	306a77c039	fix delete event	2018-07-12 12:46:18 -07:00
Zach Fox	ee08ef981d	Slightly increase linear damping	2018-07-11 10:44:24 -07:00
Zach Fox	6218f80387	MS14743 again: More bandaids for preventing Snappy printouts from falling thru floor	2018-07-11 10:07:02 -07:00
Zach Fox	2fad55e5d0	Prevent PAL from re-enabling ContextOverlayInterface when it's not supposed to	2018-07-10 15:56:13 -07:00
Dante Ruiz	1cc95fbf76	better fix	2018-07-10 11:05:41 -07:00
Dante Ruiz	df4d81277f	clean up tablet material entities and don't show them in edit	2018-07-09 16:59:32 -07:00
David Back	7a7b9730ee	only clamp handles in hmd outside bounding box	2018-07-09 15:36:22 -07:00
John Conklin II	81f5631ce9	Merge pull request #13386 from ElderOrb/FB13949 ... AvatarApp	2018-07-09 15:20:18 -07:00
John Conklin II	25406fa464	Merge pull request #13495 from thoys/feat/create/native-windows ... Create App: Native windows	2018-07-09 14:25:13 -07:00
David Back	8f1ad8e367	Merge pull request #13538 from dback2/editHandleMacFix ... Edit handle undefined event fix	2018-07-09 12:08:18 -07:00
John Conklin II	79b2858220	Merge pull request #13543 from ctrlaltdavid/M16392 ... Create snap-to-grid and translation fixes	2018-07-09 11:39:26 -07:00
David Back	d4f43a56f2	Merge pull request #13556 from dback2/deselectInput ... Change deselecting entities to Ctrl + D and prevent W/A/S/D/E/Q movements with Ctrl	2018-07-09 10:40:33 -07:00
David Back	17220b9360	Merge pull request #13549 from dback2/parentChildCopy ... Re-parent entities after duplicating and duplicate children with parents	2018-07-09 10:06:18 -07:00
Thijs Wenker	b1884b0841	CR fixes	2018-07-09 16:38:53 +02:00
David Back	3bcc727d47	check controller triggered in checkControllerMove	2018-07-06 18:57:32 -07:00
David Back	f33fae30ed	Merge branch 'editHandleMacFix' of github.com:dback2/hifi into editHandleMacFix	2018-07-06 18:56:09 -07:00
David Back	d04c2eaf73	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleMacFix	2018-07-06 18:01:16 -07:00
David Back	f815ad1ddd	tabs	2018-07-06 17:02:41 -07:00
David Back	c271e1aae4	fix triggering at non-web overlays	2018-07-06 17:02:29 -07:00
Alexander Ivash	7feb9910c9	use rotation degrees instead of quaternions for comparison ... re-query entity properties after editing it to get actual changes	2018-07-07 02:36:19 +03:00
Alexander Ivash	168584169c	do not close avatarapp on hiding tablet	2018-07-07 02:36:19 +03:00
Alexander Ivash	19f37246a6	capitalize avatarapp name in toolbar/tablet icons	2018-07-07 02:36:19 +03:00
David Back	a546d8b279	tabs	2018-07-06 15:48:53 -07:00
Dante Ruiz	ae03dcb57a	fix parent grab dropping and cullig flickering	2018-07-06 15:42:21 -07:00
David Back	33e170315c	recurse on children of children	2018-07-06 15:39:18 -07:00
David Back	a415d1eb37	Merge branch 'master' of https://github.com/highfidelity/hifi into parentChildCopy	2018-07-06 14:32:17 -07:00
John Conklin II	6e13b0e141	Merge pull request #13453 from gcalero/web_overlay_android ... Support web3d overlays in android	2018-07-06 13:02:56 -07:00
Thijs Wenker	eea95161ab	Merge branch 'master' of github.com:highfidelity/hifi into feat/create/native-windows	2018-07-06 20:06:50 +02:00
Alexander Ivash	67fb8af87c	update avatarapp on avatar switch	2018-07-06 21:00:56 +03:00
Alexander Ivash	8021434984	remove debug tracing	2018-07-06 21:00:56 +03:00
Alexander Ivash	5990d2725a	disallow to scale avatar with controllers	2018-07-06 21:00:55 +03:00
Alexander Ivash	58de136dfa	fix MARKETPLACES_INJECT_SCRIPT_URL, apply it on opening avatar info	2018-07-06 21:00:55 +03:00
Alexander Ivash	dbf1aa779a	reflect changes in grabbed wearable position/rotation in UI	2018-07-06 21:00:55 +03:00
Alexander Ivash	cc151d6187	Change the name of the app from “AvatarApp” to “Avatar”.	2018-07-06 21:00:54 +03:00
Alexander Ivash	b445cc6105	allow changing avatar scale without saving; revert on cancel	2018-07-06 21:00:54 +03:00
Alexander Ivash	73ec34825b	add proper application icon	2018-07-06 21:00:54 +03:00
Alexander Ivash	764dc6d156	add link to 'external avatar' dialog	2018-07-06 21:00:53 +03:00
Alexander Ivash	91e1714b0e	external avatars support	2018-07-06 21:00:53 +03:00
Alexander Ivash	3ac44376b2	bind Settings page to a backend	2018-07-06 21:00:53 +03:00
Alexander Ivash	1cc086f9c6	cleanup and bugfixing	2018-07-06 21:00:53 +03:00
Alexander Ivash	74bfea59cc	reply => data	2018-07-06 21:00:53 +03:00
Alexander Ivash	bcb373618f	navigation to market / my purchases from message dialog links	2018-07-06 21:00:53 +03:00
Alexander Ivash	4ce8e29d97	navigate to BodyMart / AvatarIsland on 'get avatars' / 'get wearables'	2018-07-06 21:00:53 +03:00
Alexander Ivash	3baa1a588f	bound 'displayName' to backend, adjust font	2018-07-06 21:00:53 +03:00
Alexander Ivash	10f2fe5fe6	implement adding bookmark ... improve comparision of attachments/wearables	2018-07-06 21:00:53 +03:00
Alexander Ivash	c3f0cb67a6	fix for inability to ajuste wearables after cancelling changes	2018-07-06 21:00:53 +03:00
Alexander Ivash	512e72d6d1	integrate deleting favorite avatars with backend	2018-07-06 21:00:53 +03:00
Alexander Ivash	51c8248463	introduce reverting avatar wearables on cancel	2018-07-06 21:00:53 +03:00
Alexander Ivash	9914a1d523	AdjustWearables: implement deleting/refreshing wearables/wearable	2018-07-06 21:00:52 +03:00
Alexander Ivash	b6769f9678	avatar selection & wearables adjustments work-on-progress	2018-07-06 21:00:52 +03:00
Alexander Ivash	4fa72eab6d	show real wearables from avatar in combobox	2018-07-06 21:00:52 +03:00
Alexander Ivash	5007c259bb	query real avatar favorites (but use fake urls for now)	2018-07-06 21:00:52 +03:00
Alexander Ivash	1ddfc87396	wip on avatarapp	2018-07-06 21:00:51 +03:00
David Back	169d40c3c1	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleMacFix	2018-07-06 10:55:04 -07:00
Thijs Wenker	42afd31325	default window width fixes	2018-07-06 19:48:35 +02:00
David Rowe	1a18d3305e	Code review	2018-07-06 17:03:30 +12:00
David Back	4763ccf1ec	Merge branch 'master' of https://github.com/highfidelity/hifi into deselectInput	2018-07-05 14:53:21 -07:00
David Back	2bcc96269e	comments, fix doubles in list, fix re-parenting to 0	2018-07-05 13:10:56 -07:00
John Conklin II	dfa0b96a93	Merge pull request #13546 from sethalves/fix-display-controller-buttons ... keep buttons from drifing away from in-world display of controllers	2018-07-05 13:09:07 -07:00
David Back	fbe670d8c0	also copy unselected children	2018-07-05 12:43:37 -07:00
David Back	1cc79f0e7c	renaming	2018-07-05 12:07:13 -07:00
David Back	25d55b9cc5	tabs	2018-07-05 11:59:05 -07:00
David Back	40fec8a318	reparent after duplication	2018-07-05 11:58:45 -07:00
Seth Alves	73071df857	when displaying the in-world controller model, make buttons and joysticks be children of the base controller model, rather than children of the avatar	2018-07-05 10:07:49 -07:00
David Back	2e70853ffc	Merge branch 'master' into editHandleMacFix	2018-07-05 09:51:56 -07:00
Zach Fox	01c4b57d11	Merge pull request #13539 from zfox23/MS16413_snapPrintFall ... Implement MS16413: Improve angularVelocity of printed Snaps	2018-07-05 09:50:06 -07:00
Thijs Wenker	574bfd177d	Create app (desktop mode): ... - Fix insta-close on switching from other app to create app. - Fix new model and particle dialogs.	2018-07-05 17:57:00 +02:00
David Rowe	a642324a11	Fix oscillating positions as translate when snapping to grid	2018-07-05 11:58:48 +12:00
David Rowe	9709599c1a	Fix translation handle not following mouse at some view angles	2018-07-05 11:47:34 +12:00
David Rowe	94c097fc39	Fix entity y value jumping when translate with grid snapping enabled	2018-07-05 11:42:37 +12:00
David Rowe	b00d07b029	ESLint	2018-07-05 10:50:08 +12:00
Thijs Wenker	446b82abd6	Merge pull request #13410 from dback2/editHandleToggleFix ... Fix toggling edit handles between local/world space	2018-07-04 00:23:21 +02:00
David Back	986864fc53	ctrl D for deselect	2018-07-03 15:09:11 -07:00
Zach Fox	6efb895708	Implement MS16413: Improve angularVelocity of printed Snaps	2018-07-03 13:43:04 -07:00
David Back	afbe64ec11	missing bracket	2018-07-03 13:32:11 -07:00
David Back	2af0f05cb4	tabs	2018-07-03 12:40:19 -07:00
David Back	ed4d0f2577	early-out if event undefined	2018-07-03 12:39:41 -07:00
Seth Alves	62ec693280	Merge pull request #13526 from wayne-chen/fixStillOnlySnap-case-15860 ... fixing still only snap in snap app	2018-07-03 11:36:25 -07:00
Thijs Wenker	d5fb094d8a	enable Desktop.CLOSE_BUTTON_HIDES flag for create app native windows	2018-07-03 18:49:23 +02:00
Thijs Wenker	c583c07d9c	Merge branch 'feat/create/interactive-window' into feat/create/native-windows ... # Conflicts: # scripts/system/libraries/entityList.js # scripts/system/particle_explorer/particleExplorerTool.js	2018-07-03 18:47:38 +02:00
Wayne Chen	2bbc5b6137	remove ray pick print statement - it bloats the debug window	2018-07-03 09:11:57 -07:00
Thijs Wenker	7ed03c2f77	- native window presentation mode update ... - de-activate create on displayMode change.	2018-07-03 17:26:18 +02:00
Wayne Chen	aefa52b4c9	fixing still only snap in snap app	2018-07-02 17:00:31 -07:00
John Conklin II	94ab0c71b2	Merge pull request #13040 from 1P-Cusack/BugFix_EntityListException_20180427 ... [BugFix] EntityList UncaughtException in that.sendUpdate	2018-07-02 12:35:20 -07:00
John Conklin II	d9a3676c7c	Merge pull request #13493 from alexiamandeville/sittingUpdate ... Resolving issue where VR input for movement stops emotes	2018-07-02 12:30:50 -07:00
David Back	e1de226aae	change toggle input to t	2018-07-02 11:11:02 -07:00
David Back	122b385dd3	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleToggleFix	2018-07-02 10:57:47 -07:00
David Back	fd4a8fdd83	fix color NaN check	2018-06-29 15:33:55 -07:00
Gabriel Calero	a6d093d8c9	Merge remote-tracking branch 'upstream/master' into web_overlay_android	2018-06-29 15:09:32 -03:00
David Back	328bf37f64	Merge branch 'master' of https://github.com/highfidelity/hifi into particleExplorerOptionalPropFix	2018-06-29 10:34:17 -07:00
David Back	6f0ac32344	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleToggleFix	2018-06-28 17:32:18 -07:00
David Back	7b9341954f	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleToggleFix	2018-06-28 12:10:42 -07:00
Zach Fox	2d27de12bd	Fix MS14743: Change SNAP prints such that they don't fall through the floor	2018-06-28 12:06:31 -07:00
Thijs Wenker	7fe9365a76	create app - native windows	2018-06-28 19:12:03 +02:00
John Conklin II	138342ba91	Merge pull request #13485 from zfox23/MS16257_clearOverlay ... Implement MS16257: Remove 'clear overlay when moving' setting and code	2018-06-28 09:31:04 -07:00
David Back	e74d30ce22	fix color fallbacks	2018-06-27 17:43:41 -07:00
Alexia Mandeville	8228afb378	Resolving issue where VR input for movement stops emotes	2018-06-27 17:15:54 -07:00
David Back	dd09ec1656	Merge branch 'master' of https://github.com/highfidelity/hifi into particleExplorerOptionalPropFix	2018-06-27 16:32:21 -07:00
John Conklin II	e9d2797573	Merge pull request #13472 from alexiamandeville/sittingUpdate69 ... Restoring Emote app to stable build state, adding sit and love emotes	2018-06-27 16:00:53 -07:00
Zach Fox	cfc8c0fb09	Implement MS16257: Remove 'clear overlay when moving' setting and code	2018-06-27 14:07:04 -07:00
Alexia Mandeville	0f25ab7376	Fixing error from typo	2018-06-27 13:30:10 -07:00
David Back	2cdda23169	more robustness for optional properties	2018-06-27 13:05:39 -07:00
John Conklin II	2da3192c33	Merge pull request #13402 from ctrlaltdavid/21895 ... Make desktop left and right mouse button actions independent	2018-06-27 12:46:11 -07:00
Zach Fox	bdeb22703c	Merge pull request #13474 from zfox23/MS16235_handshakeParticles ... Fix MS16235: Set previously-buggy Handshake particle properties to 0	2018-06-27 12:16:48 -07:00
Gabriel Calero	1e09f98f6e	Pick entity or overlay depending on distance	2018-06-27 12:23:43 -03:00
John Conklin II	a38859e4da	Merge pull request #13397 from ctrlaltdavid/21893 ... Fix Create app selection updating when entities are deleted	2018-06-26 17:06:43 -07:00
Zach Fox	6f956ffb8d	Fix MS16235: Set previously-buggy Handshake particle properties to 0	2018-06-26 15:45:18 -07:00
Alexia Mandeville	b3eec72c90	Removing animations.zip	2018-06-26 15:39:50 -07:00
Alexia Mandeville	6f6a9b2c64	Style formatting, updating comments	2018-06-26 15:02:46 -07:00
Alexia Mandeville	92acbdbbd7	Adding sit and love emotes	2018-06-26 14:21:10 -07:00
David Back	40b2525b99	Merge pull request #13439 from dback2/editHandleFixesImprovements ... Edit handle fixes	2018-06-26 13:33:25 -07:00
John Conklin II	47f907f44e	Merge pull request #13441 from wayne-chen/collisionlessGrab-case-12661 ... Fixing collisionless grabbing	2018-06-26 13:05:25 -07:00
David Back	46b5c0cc8e	Merge pull request #13448 from dback2/multiSelectColorInvisibleFix ... Fix multi-selection color setting visible/locked to false	2018-06-26 11:28:58 -07:00
Gabriel Calero	48cdd6d64c	Fix web entities for android	2018-06-26 12:30:03 -03:00
Gabriel Calero	7e640abb39	Support Web entities in android	2018-06-26 12:01:01 -03:00
Sam Gondelman	acfd562309	Merge pull request #13435 from gcalero/breakpad_android ... Breakpad integration for android Interface (part II)	2018-06-25 16:47:07 -07:00
David Back	05438f3b85	bad avatar collision merge	2018-06-25 15:26:54 -07:00
David Back	f65bc9b5ed	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements	2018-06-25 15:22:07 -07:00
Gabriel	ea2c1298e5	Remove crash added with testing purposes only	2018-06-25 19:13:47 -03:00
Gabriel Calero	0a70e844bf	Merge remote-tracking branch 'upstream/master' into web_overlay_android	2018-06-25 17:41:51 -03:00
Gabriel Calero	fedc0a9e61	Support web3d overlays in android	2018-06-25 16:37:03 -03:00
David Back	6fa191742c	Merge pull request #13390 from dback2/editHandleDebugWindowFix ... Prevent edit press events when pointing at tablet or desktop windows	2018-06-25 11:11:37 -07:00
David Back	39b3e5a711	tabs	2018-06-22 18:15:16 -07:00
David Back	09ccd3acf0	fix multi-selection color setting visible/locked to false	2018-06-22 18:13:40 -07:00
David Back	88762e879f	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision	2018-06-22 13:53:04 -07:00
David Back	80adad7965	myAvatar constant	2018-06-22 13:52:43 -07:00
David Back	6a4c5ed12a	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision	2018-06-22 11:58:28 -07:00
Wayne Chen	1239472f2d	adding line for allowing grabbing of collisionless overlays	2018-06-22 11:35:01 -07:00
Wayne Chen	5b36449edd	allowing grabbing of collisionless entities	2018-06-22 09:54:25 -07:00
Sam Gondelman	850e2d5cf5	Merge branch 'master' into particleFix	2018-06-21 17:32:24 -07:00
SamGondelman	223350b7be	remove logging, play with debounce times	2018-06-21 17:26:39 -07:00
David Back	c019a4816f	CR changes + eslint fixes	2018-06-21 16:45:09 -07:00
David Back	ed56f09fcf	comment	2018-06-21 15:00:10 -07:00
David Back	37b35353d2	space	2018-06-21 14:48:37 -07:00
David Back	e3e8de1042	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements	2018-06-21 10:24:12 -07:00
John Conklin II	835528b212	Merge pull request #13383 from dback2/autoLaserFix2 ... Fix auto lasering locked web entities & only auto laser tablet and web overlays	2018-06-21 09:21:54 -07:00
David Rowe	d43be5ce19	Code review	2018-06-21 16:35:37 +12:00
David Back	54145e0310	use previous pick ray when translate reaches end	2018-06-20 15:53:38 -07:00
Menithal	55e75298bd	Added Logging	2018-06-21 01:24:32 +03:00
Menithal	903762b122	Make sure max constraints reset ... This now occurs when selecting a new entity and having the UI filled again	2018-06-21 01:04:01 +03:00
David Back	7704e8c2a9	fix stretching too far, improve stretch sphere vs camera dist sizing	2018-06-20 14:47:41 -07:00
Menithal	32982326b1	Moved WebBridge sync to oninput: ... This avoids the settings_update being called only when the image finishes loaded	2018-06-21 00:08:36 +03:00
Menithal	d878ec66e2	Added Lock for not sending settings_update ... This occurs only when fields are being filled	2018-06-21 00:07:14 +03:00
SamGondelman	2f0877dc0f	debugging js	2018-06-19 16:36:13 -07:00
David Back	633be87473	fix stretch panel dimensions	2018-06-19 14:57:46 -07:00
David Back	61cbe84ae5	fix stretching below minimum still moving entity	2018-06-19 14:39:58 -07:00
SamGondelman	de5fcccc7b	proper reporting of nan values in get	2018-06-19 14:22:24 -07:00
SamGondelman	12a5d8b550	quiet ubuntu warnings, particle properties show radians	2018-06-19 12:51:35 -07:00
David Rowe	064f4ca204	Remove deleted entities from list without scrolling to top	2018-06-19 16:22:59 +12:00
David Rowe	5de451e8e0	Update entity list upon entity deletion	2018-06-19 14:52:49 +12:00
David Back	5b699d1cd4	tabs	2018-06-18 16:14:46 -07:00
David Back	7d4fa4f484	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleToggleFix	2018-06-18 15:56:05 -07:00
David Back	030e697945	fix toggling to world space	2018-06-18 15:55:55 -07:00
David Back	0c644c0504	Merge branch 'master' of https://github.com/highfidelity/hifi into autoLaserFix2	2018-06-18 11:06:56 -07:00
David Back	175e4b7013	also check tabletID	2018-06-18 11:06:33 -07:00
David Rowe	ffd66f4377	Make desktop left and right mouse button actions independent	2018-06-18 20:55:13 +12:00
David Rowe	e8154b5df1	Fix Create app selection updating when entities are deleted	2018-06-17 08:35:45 +12:00
SamGondelman	7771661948	fix particle spread properties	2018-06-15 17:35:49 -07:00
David Back	bb0b1cc4a4	no myAvatarIndex needed	2018-06-15 17:35:18 -07:00
David Back	d16b777977	tabs	2018-06-15 17:33:49 -07:00
David Back	b10cf364c4	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision	2018-06-15 17:32:32 -07:00
David Back	6ef8206f3a	temp disable myAvatar collisions when stretching	2018-06-15 17:32:03 -07:00
Gabriel Calero	583c46b3a0	Merge remote-tracking branch 'upstream/master' into breakpad_android	2018-06-15 21:21:03 -03:00
Seth Alves	b4b6c85aaf	Merge pull request #13366 from danteruiz/fixing-invisible-cursor ... fixing invisible cursor when coming from HMD mode	2018-06-15 17:16:46 -07:00
Seth Alves	7ca6dfc8c5	Merge pull request #13371 from danteruiz/fix-focus-issues ... fix focus issues when mouse is offscreen	2018-06-15 17:15:42 -07:00
David Back	cb9c255acd	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision	2018-06-15 14:51:53 -07:00
David Back	bc06b88afc	tabs	2018-06-15 14:31:18 -07:00
David Back	9b33e6757f	prevent edit press events when pointing at desktop window or tablet	2018-06-15 14:29:47 -07:00
Gabriel Calero	4cd94a32b8	Crash on audio button press with testing purpose	2018-06-15 17:44:28 -03:00
David Back	fcccaaea48	tabs	2018-06-14 17:49:02 -07:00
David Back	ed5b05eef4	fix auto laser on locked web entity, only auto laser at tablet or web overlays	2018-06-14 17:43:45 -07:00
David Back	3be477e7f2	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleDebugWindowFix	2018-06-14 13:14:24 -07:00
John Conklin II	fa1dc78469	Merge pull request #13374 from thoys/fix/dynamic-cloneDynamic ... [RC69] fix cloneDynamic	2018-06-14 12:58:17 -07:00
John Conklin II	d023d6adef	Merge pull request #13321 from danteruiz/tablet-imporvments ... Tablet improvements	2018-06-14 12:38:20 -07:00
John Conklin II	4f561b00da	Merge pull request #13003 from alexiamandeville/sittingUpdates ... Adding sitting and love to emote app	2018-06-14 11:52:47 -07:00
Thijs Wenker	4d3087b98c	fix cloneDynamic	2018-06-14 19:07:20 +02:00
Dante Ruiz	abee3e8b96	fix focus issue when mouse is offscreen	2018-06-13 17:07:05 -07:00
Dante Ruiz	a6202cf3cb	fixing invisible cursor	2018-06-13 11:31:14 -07:00
Dante Ruiz	60e46481b2	emissive maps	2018-06-13 10:41:02 -07:00
David Back	cde111d601	remove pointing at system overlay and overlay at point checks	2018-06-12 17:55:04 -07:00
Zach Fox	ffb9a47be0	Merge pull request #13355 from zfox23/MS14314_multipleSnapshots ... Interface Fix for MS14314: Make use of original image filename when sharing	2018-06-12 15:10:22 -07:00
Anthony Thibault	717093abf7	Merge pull request #13171 from luiscuenca/handTouchToDefault ... Enable Avatar Hand Touch Script by Default	2018-06-12 14:54:26 -07:00
Zach Fox	bf5d6de780	Merge branch 'master' of github.com:highfidelity/hifi into MS14314_multipleSnapshots	2018-06-12 11:19:05 -07:00
Zach Fox	cf9cf45d02	Merge pull request #13348 from zfox23/MS14129_buyButtonStuck ... Fix MS14129: Prevent Marketplace buttons from getting stuck in hover state	2018-06-12 11:02:52 -07:00
Dante Ruiz	f1d11f9566	Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments	2018-06-12 10:21:12 -07:00
Luis Cuenca	9126a6f66d	hide debug lines	2018-06-12 10:12:28 -07:00
Zach Fox	860f9db939	Remove logging	2018-06-12 09:25:09 -07:00
Zach Fox	14034f29a1	Interface Fix for MS14314: Make use of original image filename when sharing	2018-06-11 17:10:09 -07:00
Sam Gondelman	e8ec32c7f8	Merge pull request #13340 from SamGondelman/modelTextures ... Try to fix ModelOverlay texture loading	2018-06-11 16:09:10 -07:00
Dante Ruiz	6685fbbfc4	Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments	2018-06-11 13:56:54 -07:00
Dante Ruiz	f2d6b84e6c	fix qa fail issues	2018-06-11 13:56:44 -07:00
John Conklin II	9db71fb40d	Merge pull request #13322 from dback2/fixEquipMessage ... Fix Hifi-Grab-Hand message for equipping	2018-06-11 13:16:39 -07:00
Zach Fox	a5ef3fa729	Fix MS14129: Prevent Marketplace buttons from getting stuck on hover state	2018-06-11 12:00:51 -07:00
John Conklin II	d5b8570ef6	Merge pull request #13343 from ctrlaltdavid/21888 ... Fix tablet attaching to hand while far-grabbing an entity	2018-06-11 10:26:37 -07:00
Howard Stearns	5ce122f148	Merge pull request #13307 from howard-stearns/infinite-scroll ... Infinite scroll	2018-06-11 10:03:52 -07:00
Sam Gondelman	9c66ee412a	Merge pull request #13325 from Cristo86/patch-1 ... Use third person camera mode when switching to My View from Top View mode.	2018-06-11 09:36:29 -07:00
Dante Ruiz	ba86c9753d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments	2018-06-11 09:13:14 -07:00
SamGondelman	2dae613612	remove conserveResources	2018-06-08 17:58:06 -07:00
David Rowe	54b96cd602	Fix incomplete transition from far-grabbing entity to grabbing tablet	2018-06-09 11:32:10 +12:00
David Rowe	dc46c2077d	Fix function name	2018-06-09 11:01:18 +12:00
Dante Ruiz	5843c24309	adding perfectly straight model and adjusting ovelray	2018-06-08 13:56:00 -07:00
Dante Ruiz	dfea4a0f7c	fixing rotation	2018-06-08 11:50:52 -07:00
howard-stearns	2761688d39	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-07 16:14:57 -07:00
druiz17	8c83bd29a3	making requested changes	2018-06-07 14:04:39 -07:00
Zach Fox	93eba5fe5e	Merge pull request #13293 from zfox23/MS7224_cubeSnapshots ... Fix MS7224: Add dimensions to printed Snapshot entity	2018-06-07 12:52:20 -07:00
Cristian Duarte	664884c9a8	Use third person camera mode when switching to My View from Radar mode. ... This makes it consistent with the default third person camera in My View.	2018-06-07 16:41:41 -03:00
howard-stearns	890c97e7cb	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-07 12:24:27 -07:00
luiscuenca	df32fe60e4	using RayPick API	2018-06-07 11:44:59 -07:00
luiscuenca	5403db6d51	Merge branch 'master' into handTouchToDefault	2018-06-07 11:42:26 -07:00
John Conklin II	067fa46355	Merge pull request #13265 from wayne-chen/toggleSpaceMode ... Re-adding toggleSpaceMode function	2018-06-07 11:21:28 -07:00
John Conklin II	389bddb0f4	Merge pull request #13255 from ctrlaltdavid/21884 ... Fix properties not populating particle explorer tab	2018-06-07 09:42:45 -07:00
John Conklin II	66e2bebcbf	Merge pull request #13279 from thoys/fix/create-camera ... Fix MS13500: create-app camera orbit to not jump around on secondary monitor	2018-06-07 09:38:10 -07:00
David Back	8f5de7b16a	use messageGrabEntity flag instead	2018-06-06 18:05:26 -07:00
David Back	0ee55a09b6	fix tabs	2018-06-06 17:35:25 -07:00
David Back	048872c79a	use messageEquip flag to fix Hifi-Hand-Grab	2018-06-06 17:32:52 -07:00
David Rowe	32c21a1397	Fix particle property value reverting to old value when switch tabs	2018-06-07 12:22:56 +12:00
Dante Ruiz	5a89a51b85	make edit mode play nicely	2018-06-06 16:04:36 -07:00
David Rowe	3e100fb141	Merge branch 'master' into 21884	2018-06-07 10:46:53 +12:00
Dante Ruiz	6ddc768f57	making overlays use precisionPicking and adjust tablet screen position	2018-06-06 15:40:33 -07:00
Dante Ruiz	d57d087752	update tablet model again	2018-06-06 12:48:20 -07:00
Dante Ruiz	995cfeb3c5	cleaning code	2018-06-06 10:42:12 -07:00
Dante Ruiz	59c50b7f26	remove highlight overlay in favor of materialEntity	2018-06-06 08:38:58 -07:00
Dante Ruiz	b275bbe5a7	saving changes	2018-06-05 15:44:17 -07:00
Zach Fox	4ebfca0c57	Really fix it	2018-06-05 10:04:37 -07:00
Zach Fox	82c438a174	CR	2018-06-05 10:04:26 -07:00
Zach Fox	b9604fdb9d	Fix MS14796: Fix position of tablet close button highlight	2018-06-05 10:04:13 -07:00
Wayne Chen	c18c2358d6	adding fix for tablet screen y offset	2018-06-05 10:03:59 -07:00
David Rowe	b4b63187ae	Fix typo	2018-06-05 08:48:10 +12:00
howard-stearns	5257a254cb	more for the previous	2018-06-04 13:12:41 -07:00
howard-stearns	254abfa04a	add request-services to default scripts.	2018-06-04 12:59:08 -07:00
SamGondelman	8af1beca8d	add isGroupCulled for model overlays	2018-06-04 12:07:57 -07:00
Zach Fox	cf7a3d1af6	Fix MS7224: Add dimensions to printed Snapshot entity	2018-06-04 11:30:29 -07:00
howard-stearns	29b09d64e6	checkpoint with PAL working.	2018-06-01 13:33:45 -07:00
howard-stearns	e6ffb9a3e5	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-01 11:10:13 -07:00
Seth Alves	708cbbc984	Merge pull request #13258 from wayne-chen/toggleAdvancedMovementFile-case-15453 ... JavaScript exception in toggleAdvancedMovementForHandControllers.js	2018-06-01 10:48:24 -07:00
howard-stearns	84f5f0a653	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-01 09:58:08 -07:00
Thijs Wenker	3779a4780e	Prevent the cursor from being stuck on the most outer edges of the screen	2018-06-01 02:07:02 +02:00
Thijs Wenker	a06c9eccca	- fix create-app camera orbit to not jump around on secondary monitor ... - style fixes entityCameraTool.js	2018-06-01 00:16:42 +02:00
Wayne Chen	9f20d52d01	adding alternate solution.	2018-05-31 15:05:33 -07:00
Wayne Chen	d66b548fc5	fixing typo in script file.	2018-05-31 15:04:29 -07:00
howard-stearns	e8e12eef8f	checkpoint	2018-05-31 14:42:52 -07:00
David Rowe	3c5a779a98	Don't modify function parameter	2018-06-01 09:36:28 +12:00
David Back	d20d594ae5	use setCollisionEnabled for avatar collisions	2018-05-31 10:50:54 -07:00
howard-stearns	b0d3729d4d	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-05-30 17:09:57 -07:00
howard-stearns	bdd38cef7a	checkpoint	2018-05-30 17:09:13 -07:00
Wayne Chen	34120da63f	re-adding toggleSpaceMode	2018-05-30 16:06:34 -07:00
Dante Ruiz	072d8b70b1	adding back notifcations	2018-05-30 13:36:02 -07:00
David Rowe	8c9bdf51a7	Remove superfluous variable	2018-05-30 17:16:08 +12:00
David Rowe	03cec8cb54	Fix properties not populating particle explorer tab	2018-05-30 17:15:33 +12:00
howard-stearns	a84829392f	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-05-29 16:14:22 -07:00
Gabriel Calero	bb73af7230	Show stats button only in debug mode. Add isDebugMode to Script public interface	2018-05-29 17:21:44 -03:00
howard-stearns	17be460adf	checkpoint	2018-05-25 16:37:06 -07:00
Alexia Mandeville	cdf56d3c6d	Adding comment for clarification, formatting comment style	2018-05-25 10:42:56 -07:00
Wayne Chen	8453c7baba	reverting commit 802cedf1bc regarding toggleSpaceMode	2018-05-25 09:25:05 -07:00
Wayne Chen	89f7eb0b30	Adding fix for enabling saved front/back advanced controls.	2018-05-25 09:21:01 -07:00
Alexia Mandeville	5540561730	Removing trigger input stopping animation to enable VR	2018-05-24 18:45:04 -07:00
Alexia Mandeville	81d615c9db	Revert "Removing sit functionality from teleport" ... This reverts commit 36df9d7de8.	2018-05-24 17:36:29 -07:00
howard-stearns	235971f8bf	checkpoint	2018-05-24 15:23:45 -07:00
Wayne Chen	3d0e0da42f	re-adding removed toggleSpaceMode function	2018-05-24 11:08:26 -07:00
John Conklin II	3e665fb616	Merge pull request #13179 from dback2/cloneables ... Server-Managed Cloneables + Cloneable Properties	2018-05-23 12:40:27 -07:00
Dante Ruiz	c4f39841f5	fix another menu name changes that broke snapshot	2018-05-22 10:46:20 -07:00
Dante Ruiz	9df79462ad	fix snapshot	2018-05-22 09:06:10 -07:00
Liv Erickson	604b3cac1c	check for null entities in grab, add conversion for old userdata cloneable	2018-05-21 16:19:43 -07:00
howard-stearns	fc6bfe9e44	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-05-21 10:41:45 -07:00
Dante Ruiz	249d22b4b4	Merge branch 'master' of github.com:highfidelity/hifi into menu-updates	2018-05-21 10:31:24 -07:00
Anthony Thibault	4f69ae253d	Merge pull request #12906 from Triplelexx/21794_move_inspect ... WorkList #21794: Modify inspect.js to work with Avatars as well as entities	2018-05-21 09:40:42 -07:00
howard-stearns	d385a255c4	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-05-18 16:53:08 -07:00
Liv	0927cadf10	Merge pull request #13093 from RebeccaStankus/edit-bug-14671 ... moved checkEditPermissionsAndUpdate function to higher scope	2018-05-18 16:44:53 -07:00
Liv	99960b3024	Merge pull request #13085 from ctrlaltdavid/21863 ... Fix intermittent ability to select particle and light entities	2018-05-18 16:44:11 -07:00
Dante Ruiz	3b59af3ed7	Merge branch 'master' of github.com:highfidelity/hifi into menu-updates	2018-05-18 16:42:31 -07:00
Dante Ruiz	60dd7e49ab	making requested changes	2018-05-18 16:41:39 -07:00
Liv Erickson	de05388ebf	Merge branch 'master' of github.com:highfidelity/hifi into clone-server	2018-05-18 10:42:26 -07:00
RebeccaStankus	27638b9ced	Removing duplicate function	2018-05-18 09:20:03 -07:00
Sam Gondelman	74840d2130	Merge pull request #12935 from gcalero/android_new_login ... Android new login	2018-05-17 15:53:25 -07:00
David Back	900b373c96	Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables	2018-05-17 09:04:28 -07:00
Gabriel Calero	96da032b16	Add missing js to haptic feedback change	2018-05-17 11:49:44 -03:00
Gabriel Calero	8741c5e6a4	Make haptic pulse duration configurable in VirtualPadDevice	2018-05-17 11:37:13 -03:00
David Rowe	6c3174ccf1	Make particle / light icon translate x-z when inside bounding box	2018-05-17 17:04:12 +12:00
David Rowe	801a4b9aba	Make laser click in sky deselect entity	2018-05-17 15:09:23 +12:00
Zach Fox	585957409d	Merge pull request #13141 from zfox23/spectatorCameraImprovements ... Spectator Camera V2	2018-05-16 13:38:07 -07:00
David Rowe	b74f42dc23	Merge branch 'master' into 21863	2018-05-17 07:44:39 +12:00
Zach Fox	0021af8714	Merge in in-progress changes from old commerce_paginationAndFiltering branch	2018-05-16 12:28:52 -07:00
David Back	06fa4efe05	add comment	2018-05-16 11:39:53 -07:00
David Back	6c946d7ac5	prevent continuous clone calls	2018-05-16 11:36:57 -07:00
Dante Ruiz	37c51a7246	Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates	2018-05-16 10:41:40 -07:00
Dante Ruiz	e676348c4f	fixing some menu reog bugs	2018-05-16 10:40:28 -07:00
Gabriel Calero	5afc9c6df3	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-16 12:45:17 -03:00
vladest	5127cb0ea6	Merge branch 'master' into menu-updates	2018-05-16 14:37:00 +02:00
David Back	1e2d2819d5	tweaks	2018-05-15 17:36:39 -07:00
David Back	f8fc7bedd7	Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables	2018-05-15 17:31:43 -07:00
David Back	f74e219029	rename properties, add clone avatar entity, remove worldEntityProps arg, fix clone ID cleanup on delete	2018-05-15 17:24:14 -07:00
John Conklin II	ce1231910c	Merge pull request #13140 from Cristo86/android_avatar_name ... @SamGondelman We just do a quick 5-10 minute Windows check, just to make sure Windows/Mac weren't broken by the change.	2018-05-15 13:22:15 -07:00
vladest	7ea6181520	Merge branch 'master' into menu-updates	2018-05-15 21:54:45 +02:00
Zach Fox	bccaa2dbe5	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-15 11:50:38 -07:00
Dante Ruiz	931c8f5abe	Merge pull request #13110 from ctrlaltdavid/21866 ... Don't unnecessarily scroll HTML content when keyboard is raised	2018-05-15 11:00:38 -07:00
Seth Alves	6da59d15e5	Merge pull request #13167 from dback2/lowercaseUnequip ... Desktop equip: fix unequipping with capital U	2018-05-15 10:55:19 -07:00
John Conklin II	a76be78386	Merge pull request #13163 from sethalves/fix-near-grab-to-hips ... fix near-grab attaching entity to hips	2018-05-15 10:28:36 -07:00
Howard Stearns	39ccfc86ef	Merge pull request #13168 from zfox23/MS_15090 ... MS15090: Fix gifting when running marketplaces.js separately	2018-05-15 10:12:29 -07:00
David Back	623410a0aa	Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables	2018-05-15 09:53:24 -07:00
Dante Ruiz	82422edb59	fixinig the controller settings page and have menu option on by default	2018-05-14 18:51:39 -07:00
luiscuenca	acd1721c88	Load handTouch.js as a default script	2018-05-14 17:26:03 -07:00
Zach Fox	43254e2981	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-14 15:12:44 -07:00
Howard Stearns	d7121265d0	Merge pull request #13150 from howard-stearns/fix-lastEdited-vs-pal ... fix lastEdited vs pal	2018-05-14 15:12:07 -07:00
Zach Fox	a881d07e59	MS15090: Fix gifting when running marketplaces.js separately	2018-05-14 13:12:58 -07:00
David Back	ac78e14585	fix unequipping with capital U	2018-05-14 11:44:25 -07:00
Cristian Luis Duarte	e7abf3c7be	Android - Display Names - Use my avatar uuid directly when finding ray intersection	2018-05-14 15:26:57 -03:00
vladest	0a67fc3b36	Merge conflicts	2018-05-12 11:24:35 +02:00
Cristian Luis Duarte	aaa6038d28	Prevent calling ending on displayNames if was never started	2018-05-11 22:27:58 -03:00
Cristian Luis Duarte	3fd8a02375	Prevent this name implementation to appear in radar mode	2018-05-11 21:58:12 -03:00
Cristian Luis Duarte	d39f7f7a58	Simplified avatar touch code + Fix Typo + Add my avatar to the exclusion list + Explain mouse events	2018-05-11 21:27:42 -03:00
Seth Alves	898dec29cb	don't cache value of getControllerJointIndex at startup, because the script may run before the data is available. Instead, refresh the data every few seconds	2018-05-11 17:07:51 -07:00
Cristian Luis Duarte	e3d7d65186	Merge remote-tracking branch 'origin/master' into android_avatar_name	2018-05-11 18:48:34 -03:00
David Back	65bda27ae3	Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables	2018-05-11 13:03:27 -07:00
John Conklin II	4129664368	Merge pull request #13145 from highfidelity/stable ... Merge RC67 stable into master	2018-05-10 17:07:20 -07:00
howard-stearns	bf26aec260	untabify	2018-05-10 16:39:56 -07:00
howard-stearns	50a53a5174	fix lastEdited vs pal	2018-05-10 16:00:01 -07:00
John Conklin II	64d3219ee1	Merge pull request #12746 from gcalero/fix_radar_zoom_in ... Android: Fix zoom in unresponsive in radar mode	2018-05-10 13:14:52 -07:00
vladest	62aa2df836	Merge branch 'master' into menu-updates	2018-05-10 10:36:38 +02:00
David Back	1aa653c5db	tabs	2018-05-09 18:20:07 -07:00
David Back	3241c18271	first pass cloneables WIP	2018-05-09 18:10:40 -07:00
Cristian Luis Duarte	cd3836883b	10 seconds timeout hides name	2018-05-09 19:27:03 -03:00
Zach Fox	44cfa95830	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-09 15:01:24 -07:00
Gabriel Calero	e0b57a2228	Code review in radar.js	2018-05-09 18:20:19 -03:00
Cristian Luis Duarte	936a319e62	Android - First version of showing up avatars names upon touch. Brought back (transparent) overlays into render forward task.	2018-05-09 17:15:57 -03:00
Dante Ruiz	1a0ded4526	adding windows	2018-05-08 15:10:57 -07:00
Dante Ruiz	0513204781	fix hmd.js	2018-05-08 15:05:55 -07:00
Stephen Birarda	4165ab3667	Merge branch 'RC67' of github.com:highfidelity/hifi into 67-to-master	2018-05-08 14:08:21 -07:00
Zach Fox	c5ebc436ce	Merge branch 'master' of github.com:highfidelity/hifi into MS14878_preventPasswordLeak	2018-05-08 09:40:53 -07:00
Dante Ruiz	a593209ec1	remove highlight when point to the sky	2018-05-07 15:33:12 -07:00
Zach Fox	fd4530e671	MS3128: Remove vestigal Edit menu item	2018-05-07 14:39:31 -07:00
Cristian Luis Duarte	0bab311b0d	Merge remote-tracking branch 'origin/master' into android_avatar_name	2018-05-07 18:26:02 -03:00
Gabriel Calero	9b63b76b68	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-07 16:06:02 -03:00
Zach Fox	646c0ec987	MS14878: Prevent wallet passphrase leak in specific case	2018-05-07 11:56:47 -07:00
John Conklin II	1e6e182c63	Merge pull request #13090 from druiz17/fix-entity-highlighting ... fix highlighting issues (master)	2018-05-07 10:20:38 -07:00
David Rowe	1ccde9a1b2	Disable moving selection when camera is in inside bounding box	2018-05-06 20:53:20 +12:00
David Rowe	8fd972fce9	Don't disable lasering on particle or light entity icon when is selected	2018-05-06 20:23:49 +12:00
vladest	c7ab1f3dbf	Merge branch 'master' into menu-updates	2018-05-05 20:48:40 +02:00
vladest	5a5bfcfe02	Merge branch 'master' into menu-updates	2018-05-05 07:11:39 +02:00
David Rowe	ed1391581e	Merge branch 'master' into 21863	2018-05-05 16:49:51 +12:00
David Rowe	5021778dc0	Merge branch 'master' into 21866	2018-05-05 12:17:18 +12:00
David Rowe	3c2bee757a	Remove calls to function that's been removed	2018-05-05 12:14:40 +12:00
Gabriel Calero	1330132a32	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-04 18:35:51 -03:00
Dante Ruiz	0e92bb41bf	fix-another-highlighting-issue	2018-05-04 14:30:38 -07:00
Liv	e4b6686e1c	Merge pull request #13075 from ctrlaltdavid/21862 ... Clear entity selection handles and update list when entities are deleted	2018-05-04 14:23:37 -07:00
Dante Ruiz	607de3dfb4	Merge branch 'RC67' of github.com:highfidelity/hifi into RC67	2018-05-04 14:20:57 -07:00
Dante Ruiz	6414fcaae5	fix-another-highlighting-issue	2018-05-04 14:20:17 -07:00
Gabriel Calero	868b58e66d	Un-expose Application from javascript. Restore displayplugin deactivation when goes to background	2018-05-04 18:01:01 -03:00
Zach Fox	1da840984b	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-04 10:24:28 -07:00
Dante Ruiz	d44882e6dc	fix entity highlighting during edit mode	2018-05-04 09:01:24 -07:00
Dante Ruiz	a57c72df6e	fix entity highlighting during edit mode	2018-05-04 08:53:49 -07:00
David Rowe	dd8eac8cb2	Remove superfluous keyboardControl.js file and references ... The raiseAndLowerKeyboard.js script is automatically injected into these pages, instead.	2018-05-04 16:14:42 +12:00
RebeccaStankus	7a7474baca	moved checkEditPermissionsAndUpdate function to higher scope	2018-05-03 13:34:55 -07:00
Dante Ruiz	a6eab29b14	fixing edge case	2018-05-03 13:09:45 -07:00
Dante Ruiz	cffb008c31	fixing edge case	2018-05-03 13:07:32 -07:00
Zach Fox	c3d3cdca3d	Add cubemap output format	2018-05-03 12:57:00 -07:00
Dante Ruiz	c258e8c248	fix highlighting issues	2018-05-03 11:38:59 -07:00
Dante Ruiz	4793cddde6	fix highlighting issues	2018-05-03 11:27:07 -07:00
David Rowe	ebd46f1861	Fix intermittent ability to select particle and light entities	2018-05-03 14:43:54 +12:00
Cristian Luis Duarte	4ec68f6f76	Merge remote-tracking branch 'origin/master' into android_avatar_name	2018-05-02 18:48:04 -03:00
David Rowe	5312c81a6f	Match style of surrounding code	2018-05-03 08:49:18 +12:00
David Rowe	4a96dc2fdc	Refactor	2018-05-03 08:48:17 +12:00
Gabriel Calero	d0ab81d1f9	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-02 17:00:32 -03:00
Gabriel Calero	c15ef56d90	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-05-02 14:38:10 -03:00
Zach Fox	ecae3ceb9d	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-02 10:05:15 -07:00
vladest	53350b471b	Merge branch 'master' into menu-updates	2018-05-02 19:02:11 +02:00
Gabriel Calero	e83f1a8ec7	Merge branch 'android_new_login' of https://github.com/gcalero/hifi into android_new_login	2018-05-02 12:20:23 -03:00
Gabriel Calero	0f08bd8fa1	Use a single AccountManager for android.	2018-05-02 12:11:11 -03:00
Cristian Luis Duarte	3322622c84	Merge remote-tracking branch 'origin/master' into android_avatar_name	2018-05-02 10:58:09 -03:00
Gabriel Calero	3a1bfefc22	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-02 10:09:56 -03:00
David Rowe	f27e363b68	Remove entity from list when it deletes; handle multiple deletions	2018-05-02 15:23:13 +12:00
David Rowe	5a064d3499	Remove selection handles and list highlight when entity deletes	2018-05-02 14:13:15 +12:00
David Rowe	1b99946c5f	Fix entity not highlighted in list after creating or undoing delete	2018-05-02 12:38:29 +12:00
vladest	aef62d09c7	Merge branch 'master' into menu-updates	2018-05-01 21:47:46 +02:00
vladest	617b49fe14	Added mouse sensivity UI. Reworked advanced movements. TODO: properties interface complitely broken in Tablet mode	2018-05-01 21:22:48 +02:00
Liv Erickson	7db07db9e2	remove menu item at cleanup	2018-04-30 13:55:01 -07:00
Zach Fox	aafcf056c4	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-04-30 12:36:00 -07:00
Cristian Luis Duarte	c0ad6dc17d	Merge remote-tracking branch 'origin/master' into android_avatar_name	2018-04-30 16:32:14 -03:00
Zach Fox	a2b84c0fbb	It's working!!	2018-04-30 12:11:46 -07:00
John Conklin II	47f68364d2	Merge pull request #13012 from misslivirose/fix/particle-prop-caps ... Limits for alpha sliders in particle explorer	2018-04-30 10:13:05 -07:00
David Back	61afd12eeb	change to not left button	2018-04-27 16:06:27 -07:00
David Back	0962e1fc16	ignore right clicks	2018-04-27 16:06:14 -07:00
David Back	729f3366ff	Merge pull request #13033 from dback2/desktopEquip ... Desktop equip - ignore right clicks	2018-04-27 14:36:26 -07:00
LaShonda Hopper	79278f5add	[BugFix] EntityList UncaughtException in that.sendUpdate (details below). ... * Adds safety checks to properties.renderInfo to prevent invalid access when undefined. * Error trace prior to guards: [04/27 13:16:19] [CRITICAL] [hifi.scriptengine] [defaultScripts.js] [UncaughtException signalHandlerException] Error: Result of expression 'properties.renderInfo' [undefined] is not an object. in .../build/interface/RelWithDebInfo/scripts/system/libraries/entityList.js:93 [04/27 13:16:19] [CRITICAL] [hifi.scriptengine] [Backtrace] [04/27 13:16:19] [CRITICAL] [hifi.scriptengine] <anonymous>() at .../build/interface/RelWithDebInfo/scripts/system/libraries/entityList.js:93 [04/27 13:16:19] [CRITICAL] [hifi.scriptengine] <anonymous>(data = [object Object]) at .../build/interface/RelWithDebInfo/scripts/system/libraries/entityList.js:149 [04/27 13:16:19] [CRITICAL] [hifi.scriptengine] <global>() at -1 Changes Committed: modified: scripts/system/libraries/entityList.js	2018-04-27 17:23:27 -04:00
David Back	8d49d1c118	change to not left button	2018-04-27 13:32:05 -07:00
Zach Fox	684d2b08ba	Finalize work on MS14295 and MS14559	2018-04-27 12:03:54 -07:00
David Back	78436ebcbf	ignore right clicks	2018-04-27 11:30:45 -07:00
Zach Fox	bbc15cdc63	Finalize work on MS14295 and MS14559	2018-04-27 11:04:46 -07:00
Zach Fox	fc324f67bd	MS14559: Fix sometimes being unable to click on 'Nearby' orb when sending Gift/HFC	2018-04-26 15:09:53 -07:00
Liv Erickson	ef275485c0	fix alpha sliders for particles	2018-04-26 12:54:37 -07:00
David Back	71dc75b208	fix disconnect clear entities	2018-04-24 14:25:33 -07:00
Gabriel Calero	d33855b860	Advance the haptic feedback from onClick to onPressDown	2018-04-24 17:15:05 -03:00
Gabriel Calero	51f9b763ff	Merge remote-tracking branch 'origin/android_goto_splash' into android_new_login	2018-04-24 13:18:28 -03:00
Gabriel Calero	103e9f92fa	Add haptic feedback to back, view and mic buttons	2018-04-24 11:56:01 -03:00
David Back	e21c451815	ensure deleted or cleared entities properly unequipped	2018-04-23 16:56:18 -07:00
John Conklin II	2e6a563c87	Merge pull request #12959 from davidkelly/dk/14375 ... Don't populate user list in pal until you connect the events up	2018-04-23 14:47:31 -07:00
Alexia Mandeville	36df9d7de8	Removing sit functionality from teleport	2018-04-23 14:31:53 -07:00
Alexia Mandeville	a2e2d1bd6f	Updating emote app with sit and love emotes. Renaming emotes and adjusting HTML and emote behaviors	2018-04-23 14:05:23 -07:00
Gabriel Calero	8923c16b08	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-04-23 17:04:06 -03:00
David Kelly	d84ea6bf0f	Don't populate user list in pal until you connect the events up	2018-04-20 16:09:20 -07:00
David Back	8950c31378	fix mouse equipping while someone else far grabbing	2018-04-19 16:29:49 -07:00
Gabriel Calero	adfbaac18f	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-19 19:40:00 -03:00
Gabriel Calero	f2184bf456	Handle android back button. Remove unused resources. Fix compilation errors.	2018-04-19 17:31:25 -03:00
David Back	f7723a5bba	Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip	2018-04-19 11:17:34 -07:00
David Back	8cbe0f4633	safer clear grab actions	2018-04-19 11:17:26 -07:00
Seth Alves	6f420ffae2	Merge pull request #12936 from druiz17/more-tablet-changes ... Change tablet model and spawn position	2018-04-19 10:25:34 -07:00
John Conklin II	5ef90b242e	Merge pull request #12925 from thoys/fix/create-errorOnShutdown ... Create app: Save light selection menu option properly	2018-04-19 10:16:40 -07:00
David Back	d1bb11562b	Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip	2018-04-19 09:36:19 -07:00
Gabriel Calero	c8fe45eb8f	Remove debug statements and unused code. Put JNI code in a separated file.	2018-04-19 11:41:59 -03:00
John Conklin II	e557e0ae52	Merge pull request #12844 from druiz17/feature-entity-highlighting ... Highlight grabbable and equippable entities.	2018-04-18 15:35:46 -07:00
John Conklin II	51a98961a6	Merge pull request #12920 from thoys/fix/create-dontCloneOthersAvatarEntities ... edit.js - remove ability to clone non-owned avatar-entities	2018-04-18 15:27:09 -07:00
David Back	bf21a4cf56	tabs	2018-04-18 15:05:29 -07:00
David Back	666653dd96	tabs	2018-04-18 15:01:14 -07:00
David Back	4a37c4ba18	add entityIsEquipped utils for grab.js check	2018-04-18 15:00:10 -07:00
John Conklin II	eedc8a8c0a	Merge pull request #12929 from misslivirose/fix/misc-edit-bugs ... Fix edit icon behavior	2018-04-18 13:46:38 -07:00
Zach Fox	e0012ed5dc	Merge pull request #12924 from zfox23/MS12292_snapshotResourcesPath ... Fix paths to various Snapshot resource files	2018-04-18 13:44:53 -07:00
Dante Ruiz	86d3ba658f	Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting	2018-04-18 13:30:24 -07:00
Dante Ruiz	cf22f61361	adding cleanup of selection	2018-04-18 13:30:14 -07:00
Zach Fox	3ef0598871	Merge pull request #12923 from zfox23/MS10864_preventSnapshotSpam ... Don't allow users to spam Still Only snapshot capture	2018-04-18 13:19:36 -07:00
Dante Ruiz	9d6fc13a04	Merge branch 'master' of github.com:highfidelity/hifi into more-tablet-changes	2018-04-18 13:06:51 -07:00
Dante Ruiz	a65f5f7917	making tablet changes	2018-04-18 13:06:26 -07:00
Gabriel Calero	472cc1b29a	Fix code spacing	2018-04-18 16:44:49 -03:00
David Back	3afde111c4	Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip	2018-04-18 10:18:28 -07:00
Liv Erickson	e795af03dd	move function out of global scope	2018-04-18 09:56:39 -07:00
Liv Erickson	2a055429cd	handle edit changes	2018-04-17 17:31:16 -07:00
Liv Erickson	e35efccfa3	make icon slightly more robust	2018-04-17 17:11:37 -07:00
Liv Erickson	6c1872caba	remove old dependency on domain changed message to fix issue with edit icon not handling domain changes	2018-04-17 16:38:29 -07:00
unknown	46e040ca7b	Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip	2018-04-17 16:26:42 -07:00
unknown	278a6b763f	ensure target mouse entity has equip data	2018-04-17 16:26:33 -07:00
unknown	9e4914975b	missing reset flag on end equip, remove mouseEquip check on unequip via U	2018-04-17 16:13:10 -07:00
Liv Erickson	abe8a3e6d9	correct implementation that doesn't interfere with other app status	2018-04-17 15:41:03 -07:00
Liv	071396bed0	move logic for disconnecting out of initalize() and into setActive()	2018-04-17 15:40:59 -07:00
Liv	7a7438b648	space for synxtax	2018-04-17 15:40:57 -07:00
Liv	7f01dded79	add handler to refused domain change connections	2018-04-17 15:40:55 -07:00
Liv	6f020a7ec8	return tablet to home on change domain	2018-04-17 15:40:54 -07:00
Thijs Wenker	e6f0bfbf4c	get proper checkbox value from the allow light selection menu option	2018-04-18 00:10:49 +02:00
Zach Fox	95ee3c82f5	Fix paths to various Snapshot resource files	2018-04-17 14:13:14 -07:00
Zach Fox	4e48008ba1	Don't allow users to spam Still Only snapshot capture	2018-04-17 12:39:46 -07:00
Thijs Wenker	b741888d77	CR feedback (for real)	2018-04-17 20:31:30 +02:00
Thijs Wenker	91467b6059	CR feedback	2018-04-17 20:30:00 +02:00
Thijs Wenker	0aa0f53925	edit.js - remove ability to clone non-owned avatar-entities	2018-04-17 19:46:45 +02:00
Triplelexx	86cfb1448a	move inspect script	2018-04-16 21:54:14 +01:00
David Back	e86ef1c2d6	fix bracket	2018-04-16 13:33:17 -07:00
David Back	ad85e2b053	pre PR adjustments	2018-04-16 13:12:33 -07:00
David Back	78c0ec5770	remove animations	2018-04-16 12:56:22 -07:00
Zach Fox	02aa8ac566	Bugfixes per QA	2018-04-16 11:53:37 -07:00
Gabriel Calero	e3b94b163c	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-16 14:55:16 -03:00
Zach Fox	071bf35683	Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018	2018-04-16 10:11:44 -07:00
Dante Ruiz	08ea72d71f	Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting	2018-04-13 15:39:14 -07:00
David Back	76c7ec69ce	Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip	2018-04-13 14:28:14 -07:00
John Conklin II	08ca30cf43	Merge pull request #12870 from druiz17/fix-grab-js ... fix grab.js unable to grab other entities	2018-04-13 12:17:46 -07:00
John Conklin II	98f6899c3d	Merge pull request #12839 from SamGondelman/matMigrate ... Migrate materials from userData to materialData	2018-04-12 18:24:33 -07:00
Gabriel Calero	476e1cf7ae	Adjust UI with pixel perfect precision. Support devices with on-screen bars.	2018-04-12 17:59:38 -03:00
David Back	243b3637c4	fix grab.js change	2018-04-12 12:41:36 -07:00
Dante Ruiz	43b92299d6	changing highlighting percentage	2018-04-12 10:35:29 -07:00
David Back	09f3b845a8	Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip	2018-04-12 10:17:17 -07:00
Gabriel Calero	8010fd2420	New view selector behaviour. Update icons	2018-04-11 18:43:39 -03:00
Dante Ruiz	7243160dac	making requested changes	2018-04-11 14:42:26 -07:00
Dante Ruiz	cdc248129c	fix grab.js	2018-04-11 14:25:06 -07:00
Dante Ruiz	ba9d5d18bc	make requested changes	2018-04-11 13:30:21 -07:00
Gabriel Calero	578012b662	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-11 16:30:53 -03:00
John Conklin II	2f4bc5bd04	Merge pull request #12701 from misslivirose/fix-edit-grid-color ... Fix for grid color changes not applying	2018-04-11 12:06:09 -07:00
John Conklin II	28168e6e45	Merge pull request #12699 from misslivirose/fix/save-settings-for-editing ... Fix for edit preferences not persisting	2018-04-11 11:59:58 -07:00
David Back	59971869f5	desktop equip	2018-04-10 19:06:27 -07:00
Zach Fox	095b4ba5f2	Reduce logging from some Commerce/Discovery features	2018-04-10 16:02:58 -07:00
Zach Fox	01fec2edc7	Prevent the Bubble icon from ever blinking as per 14026	2018-04-10 16:00:35 -07:00
Zach Fox	a2f5891a0b	Cleanup 'Private' HMD Preview State Machine Logic	2018-04-10 16:00:18 -07:00
Zach Fox	a9b9a1cb10	Commerce: Gifts	2018-04-10 15:54:19 -07:00
Gabriel Calero	7ee067de35	Merge remote-tracking branch 'upstream/master' into fix_radar_zoom_in	2018-04-10 19:23:55 -03:00
Gabriel Calero	63e17e87b0	Fix radar initial position. Clean radar.js	2018-04-10 19:21:23 -03:00
Liv	c7be6e0934	Update edit.js ... remove the unneeded manual removal of the create setting - it's handled with the rest of the menu items now, and this was causing it to default to false every start.. tested locally but might have gotten in a weird state, so fixing in GH editor.	2018-04-10 12:15:57 -07:00
Dante Ruiz	54c3f48e65	Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting	2018-04-10 09:32:40 -07:00
Dante Ruiz	447163bd07	clean up scripts	2018-04-10 09:23:40 -07:00
Liv Erickson	20ee169054	two more spaces	2018-04-10 09:23:14 -07:00
Liv Erickson	6c15577653	style fixes for eslint	2018-04-10 09:18:54 -07:00
Dante Ruiz	2e1ebac03f	clean up functionality	2018-04-09 18:07:03 -07:00
Dante Ruiz	1113202a90	reverting file	2018-04-09 16:51:20 -07:00
SamGondelman	9b07880aab	migrate materials from userData to materialData	2018-04-09 12:49:03 -07:00
Cristian Duarte	d5c252c9ad	Use MyAvatar.goToLocation in radar teleport. ... Use MyAvatar.goToLocation in radar teleport to prevent synchronization issues that make it fail occasionally when directly modifying its world position. It will work just as teleport.js does.	2018-04-09 16:24:03 -03:00
Gabriel Calero	b30cb25a3f	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-09 12:20:35 -03:00
Gabriel Calero	e85f5c97dc	Remove bottom bar. Apply new design for android	2018-04-09 11:41:00 -03:00
Dante Ruiz	2c20593b6d	editing equip code	2018-04-06 16:30:45 -07:00
Dante Ruiz	fd47832857	saving changes	2018-04-06 11:47:09 -07:00
Dante Ruiz	07b1a6be01	saving work	2018-04-06 11:01:40 -07:00
Stephen Birarda	1d76dea9f6	Merge pull request #12818 from highfidelity/RC66 ... Merge back RC66 to master	2018-04-06 10:43:01 -07:00
Dante Ruiz	893832f4c7	Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting	2018-04-05 16:01:36 -07:00
Dante Ruiz	cc341e8ad7	highlight nearby entities	2018-04-05 15:38:56 -07:00
Gabriel Calero	36bc5f8416	Fix the view snap when user starts zooming	2018-04-05 15:35:08 -03:00
Zach Fox	8e46ebf83b	Prevent Interface from crashing when a Snapshot upload fails	2018-04-05 11:27:26 -07:00
Gabriel Calero	c26ae3592c	Merge remote-tracking branch 'upstream/master' into fix_radar_zoom_in	2018-04-05 11:33:07 -03:00
Gabriel Calero	15163f5e87	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-04 19:25:20 -03:00
Gabriel Calero	99d8f822b2	Fix crash selecting domain for second time. Stop rendering while Goto activity is started	2018-04-04 19:24:26 -03:00
John Conklin II	89127a06b3	Merge pull request #12714 from dback2/editUpDownArrowFix ... Fix Y arrow translation handle issues	2018-04-04 13:46:31 -07:00
Dante Ruiz	42149e295d	editing seletion style	2018-04-04 12:55:28 -07:00
John Conklin II	cba307f28b	Merge pull request #12762 from samcake/one ... Remove notifications and print outs when degrading LOD	2018-04-04 10:35:05 -07:00
Zach Fox	b641f87792	Merge pull request #12778 from zfox23/MS13792 ... Prevent Context Overlay from flashing when briefly hovering over certified entity	2018-04-04 09:31:33 -07:00
Gabriel Calero	ddbf4417ff	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-04 12:24:25 -03:00
Dante Ruiz	c9c3d8f332	adding entity selection for far grabbing	2018-04-04 08:07:35 -07:00
Clément Brisset	3d4490f3fd	Merge pull request #12737 from highfidelity/RC66 ... RC66 mergeback	2018-04-03 15:39:16 -07:00
Zach Fox	5f47d51171	Prevent Context Overlay from flashing when briefly hovering over certified entity	2018-04-03 15:35:46 -07:00
howard-stearns	f229e24e60	fix help.js noisy log reference to undefined string#startsWith	2018-04-03 13:48:51 -07:00
samcake	2dc4630e68	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-04-03 12:55:21 -07:00
Seth Alves	5f13df4102	Merge pull request #12722 from druiz17/fix-entities-outline ... fix ContextOverlayInferface highlighing unspecified entities.	2018-04-03 12:29:19 -07:00
Seth Alves	249a97b5d0	don't move or rotate children if a parent is being changed by the same action	2018-04-03 12:14:59 -07:00
Seth Alves	08b7326bd1	when moving a group of selections, don't move a child if a parent is being moved	2018-04-03 12:14:40 -07:00
Gabriel Calero	78c50410b3	Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash	2018-04-03 14:37:19 -03:00
samcake	077b2dab30	Code review fixes	2018-04-02 16:09:43 -07:00
samcake	5a1eac563b	Code review fixes	2018-04-02 15:50:18 -07:00
samcake	d4bc61fb3d	Remove notifications and print outs for LOD changes because it was too much noise	2018-04-02 13:53:30 -07:00
John Conklin II	7ba05e3a5b	Merge pull request #12653 from vladest/bubblu_button_blink_fix ... Bubble button blink fix	2018-04-02 11:12:12 -07:00
Gabriel Calero	176038aa53	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-02 12:23:04 -03:00
Gabriel Calero	2ff13270ed	Go back to GoTo screen	2018-04-02 12:22:21 -03:00
Dante Ruiz	16749df83a	fix highlighting edge case	2018-03-30 14:14:13 -07:00
Livi Erickson	799963a009	fix syntax based on CR feedback	2018-03-30 13:50:46 -07:00
Liv Erickson	810930ff23	handle correct first time settings	2018-03-30 13:50:46 -07:00
Liv Erickson	ec0874be1a	fix for edit preferences not persisting	2018-03-30 13:50:46 -07:00
John Conklin II	542d1ad1ff	Merge pull request #12720 from druiz17/fix-parent-tree ... Fix far grabbing a grabbable child when the parent is not grabbable.	2018-03-30 12:25:22 -07:00
Gabriel Calero	b123b67134	Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash	2018-03-30 15:38:36 -03:00
Gabriel Calero	da4f2b8c2f	Fix zoom in unresponsive in radar mode	2018-03-30 15:34:00 -03:00
Sam Gondelman	d2a74e5713	Merge pull request #12686 from gcalero/android_ui_not_move_camera ... Android - Prevent Camera movement with UI (especially Windows and Radar mode)	2018-03-28 17:14:42 -07:00
Cristian Luis Duarte	fe9481b28d	Cleanup code, comment out log, simplify radar is valid touch code (no more flag)	2018-03-28 19:50:44 -03:00
John Conklin II	790162c88b	Merge pull request #12689 from ctrlaltdavid/21808 ... Reinstate Overlays.getOverlayObject API function	2018-03-28 14:00:28 -07:00
Cristian Luis Duarte	f0bcaa47c8	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-28 16:47:21 -03:00
Dante Ruiz	3d7f7f0e62	fix parent tree grabbing	2018-03-27 14:05:43 -07:00
John Conklin II	bcd2de3bf8	Merge pull request #12660 from alexiamandeville/awayImage-update ... Update away image and image paths	2018-03-27 12:46:37 -07:00
unknown	194b00d732	fix translate arrow normals	2018-03-26 16:31:58 -07:00
Gabriel Calero	7be11fc697	Align UI of Go To activity	2018-03-26 19:44:26 -03:00
Cristian Luis Duarte	6cb5cd7f92	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-26 11:19:42 -03:00
Cristian Luis Duarte	686af4ff77	Clean code that manually checked for windows coordinates to disable radar touch	2018-03-23 20:02:51 -03:00
Cristian Luis Duarte	242b009562	Android - Use mouse events for interacting with UI. Now LoginDialog UI interation does not move radar camera. Remove repeated tooggle call in audio.js. Adapt button to simulated mouse events.	2018-03-23 18:59:55 -03:00
Liv Erickson	c66badc53c	replace accidentally deleted line	2018-03-23 11:42:39 -07:00
Liv Erickson	9dd91ea31e	style fixes and fix for grid color changes not applying	2018-03-23 11:39:44 -07:00
John Conklin II	563ff61325	Merge pull request #12661 from SamGondelman/android ... Android: Stats, disable IK, reduce impact of InputRecorder	2018-03-23 11:08:50 -07:00
Howard Stearns	113670e33b	Merge pull request #12638 from zfox23/commerce_upgrades_1 ... Commerce: Item Updates!	2018-03-22 15:40:22 -07:00
Clément Brisset	feec59655c	Merge pull request #12692 from highfidelity/stable ... Merge stable back into master	2018-03-22 15:08:30 -07:00
David Rowe	05efc5a231	Revert "Remove Overlays.getOverlayObject() from JavaScript API" ... This reverts commit 8e2a3e8c99.	2018-03-21 15:36:39 +13:00
Cristian Duarte	0d6bfada40	Prevent Go To and Avatar windows to move Radar Mode's camera when touched or interacted with	2018-03-20 17:24:38 -03:00
Zach Fox	daa68768b9	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-19 12:18:10 -07:00
David Back	3f2a49d243	fix list of tablet IDs ray cast checks in edit.js	2018-03-17 10:59:18 -07:00
Sam Gondelman	b96f398274	Merge pull request #12593 from gcalero/android_joystick_rotate_move ... Android joystick rotate move	2018-03-16 17:24:15 -07:00
Zach Fox	a792bcc3d3	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-16 13:24:17 -07:00
Alexia Mandeville	921b19139d	Updating indentation	2018-03-16 11:09:53 -07:00
Alexia Mandeville	74c654690f	Updating image path in script for HMD	2018-03-15 16:55:41 -07:00
Alexia Mandeville	700d828b67	Updating away image and image path in away script	2018-03-15 16:46:21 -07:00
SamGondelman	0fa73c73ce	stats	2018-03-15 16:05:46 -07:00
Zach Fox	eb2f8aa169	New notification flow for item updates	2018-03-15 16:03:49 -07:00
Cristian Luis Duarte	03cbadece5	Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move	2018-03-15 17:11:40 -03:00
vladest	3e00243c37	Merge branch 'master' into bubblu_button_blink_fix	2018-03-15 19:45:33 +01:00
vladest	c385bf26e9	Do not use timer for switching bubble button active state	2018-03-15 19:43:00 +01:00
Seth Alves	a64f0d2779	if tablet wasn't visible when wallet passphrase screen hid it, don't show it when passphrase page is done.	2018-03-15 11:39:05 -07:00
Seth Alves	8a0b8aa034	make tablet invisible in secondary-camera if wallet passphrase page is up	2018-03-15 11:01:13 -07:00
Zach Fox	74e24ec289	Final touches?	2018-03-14 10:58:18 -07:00
Gabriel Calero	884da98466	Change default mode to My View (android)	2018-03-14 14:50:44 -03:00
Zach Fox	98cdbbb3e6	Small update to dot before merging in filterBar	2018-03-14 09:45:42 -07:00
Zach Fox	e2326a3733	Initial work for 'messages waiting' light	2018-03-13 17:05:16 -07:00
Zach Fox	7b6b08fd26	Upgrade specific edition	2018-03-13 13:51:10 -07:00
Zach Fox	f42255f46b	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-13 13:42:42 -07:00
Cristian Luis Duarte	9e429e9f03	Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move	2018-03-12 15:51:46 -03:00
Cristian Luis Duarte	ce0d76be2b	Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move	2018-03-09 20:51:21 -03:00
Cristian Luis Duarte	3d933e1810	Android - Joystick hidden when opening login and shown after Cancel.	2018-03-09 17:41:05 -03:00
NissimHadar	317d9a8dbc	Correct can cast shadow flag being visible on entities that can't cast shadows.	2018-03-09 11:45:39 -08:00
Brad Hefta-Gaub	8e44b429d8	Merge pull request #12472 from 1P-Cusack/FogBugz/Case_4315_VFXTabSupport ... [Case 4315] Resolves Particle Tab Color Picker visual inconstency	2018-03-09 08:49:07 -08:00
Atlante45	69fb830480	Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master	2018-03-08 17:23:17 -08:00
John Conklin II	cad53a0203	Merge pull request #12585 from druiz17/small-tablet-changes ... tablet scale and position changes	2018-03-08 15:36:06 -08:00
Cristian Luis Duarte	4c3ee195de	Android - hide joystick when opening the Avatar window and disable it in cases is hidden (it was working with ui windows in front).	2018-03-08 19:58:15 -03:00
Zach Fox	4df58f1e67	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-08 12:58:08 -08:00
NissimHadar	fda32e4aa4	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-08 12:16:36 -08:00
Sam Gondelman	1e9cfe29f2	Merge pull request #12388 from highfidelity/android ... Android Tip	2018-03-08 10:18:35 -08:00
David Back	554c37d14b	removed undefined event checks in scaling	2018-03-07 19:34:08 -08:00
David Back	9681f0eb77	restore old scale math, disable avatar collisions while scaling	2018-03-07 18:20:26 -08:00
Zach Fox	08b2be85d2	Don't pass isUpdating around	2018-03-07 11:44:54 -08:00
Zach Fox	d07d02b2bc	Take certID from backend instead of query params; Better loading; Uninstall app before updating	2018-03-07 11:10:47 -08:00
David Back	2047437893	Merge branch 'RC65' of https://github.com/highfidelity/hifi into RC65	2018-03-07 10:30:18 -08:00
Zach Fox	91e0af9b46	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-07 10:16:10 -08:00
Dante Ruiz	2d448d7208	tablet scale and position changes	2018-03-07 10:02:35 -08:00
Cristian Luis Duarte	4f0cecefc3	Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed	2018-03-06 22:03:39 -03:00
Cristian Luis Duarte	bde2ba9272	Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed	2018-03-06 22:02:23 -03:00
Gabriel Calero	243e79df4a	Fix merge of radar.js	2018-03-06 21:59:59 -03:00
NissimHadar	d72f46ec3e	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-06 16:24:53 -08:00
NissimHadar	05e9aa52c9	Moved can-cast-shadow checkbox to behaviour section.	2018-03-06 16:22:54 -08:00
Zach Fox	04a230c20f	Merge pull request #12491 from ElderOrb/FB12523 ... fix for not re-enabling preview on leaving security-sensitive pages in marketplace	2018-03-06 16:19:39 -08:00
Atlante45	edeed95ccc	Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master	2018-03-06 15:33:12 -08:00
NissimHadar	dbf1be5de3	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-06 15:22:40 -08:00
David Back	47e8e26255	CR indent fixes	2018-03-06 14:05:24 -08:00
Gabriel Calero	069d3e40bc	Merge branch 'android' into android_bubble_fix	2018-03-06 18:58:49 -03:00
David Back	b74be92fd8	redo scale handles to fix scaling into avatar collision causing chaos	2018-03-06 12:27:51 -08:00
Zach Fox	ee28983334	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-06 11:13:40 -08:00
Elisa Lupin-Jimenez	15c1f5ba30	fixed log spam undefined error	2018-03-06 11:01:50 -08:00
Zach Fox	35b23cc954	It's working!	2018-03-05 15:54:17 -08:00
John Conklin II	16bb992d8d	Merge pull request #12557 from druiz17/correctly-use-defaults-values ... correctly use default values and don't delete userData in entitiesProperties.js	2018-03-05 13:15:23 -08:00
Thijs Wenker	d7725f1d73	make the grabbable checkbox again, respect default true setting	2018-03-05 20:54:08 +01:00
Brad Davis	8bfc610cfb	Merge remote-tracking branch 'upstream/master' into android	2018-03-05 11:48:58 -08:00
NissimHadar	1eb0dde3d2	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-05 11:36:39 -08:00
Dante Ruiz	1997cd27bd	correctly use default values	2018-03-05 11:26:37 -08:00
Zach Fox	4046c873bd	Still need to send correct thing to metaverse	2018-03-05 11:24:59 -08:00
Zach Fox	f5a8187fe2	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-05 10:01:55 -08:00
Zach Fox	f10f9aa939	Continued progress	2018-03-05 10:01:40 -08:00
Dante Ruiz	654770af51	fix controller dispatacher error	2018-03-05 09:39:26 -08:00
John Conklin II	3f751bb5ca	Merge pull request #12546 from druiz17/fix-hyperlink ... Fix hyperlink when far/near grabbing enitities	2018-03-05 08:23:51 -08:00
NissimHadar	8536b44c61	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-02 16:09:06 -08:00