5197 commits

Author	SHA1	Message	Date
David Back	b82f6d0bad	lines/spacing	2018-09-06 16:54:58 -07:00
David Back	14a3eb4c97	lines/spacing	2018-09-06 16:52:58 -07:00
David Back	0a67c49ef9	remove separate new entity list with option, fix row clicking	2018-09-06 16:50:36 -07:00
David Back	3d75d4726a	scale invertly once passing minimum	2018-09-06 16:04:59 -07:00
Dante Ruiz	98dafa3b67	fix overlayParentID	2018-09-06 14:31:49 -07:00
David Back	6ac38190c1	tweak scaling multiple	2018-09-06 12:23:38 -07:00
David Back	92ff522862	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleScaleImprovements	2018-09-06 11:54:05 -07:00
Dante Ruiz	ec2d89fd25	fixing toolbar disappering	2018-09-06 11:16:58 -07:00
Roxanne Skelly	8a20969103	Fix typo	2018-09-06 10:38:10 -07:00
Dante Ruiz	200f6d540a	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-09-06 09:59:51 -07:00
luiscuenca	01424b8179	Head Collision Pick added	2018-09-06 09:39:33 -07:00
David Back	82ed57e41f	triple list structure, added columns, sorting	2018-09-05 17:59:03 -07:00
luiscuenca	abb632afda	Update capsule when scale/load and teleport without safe landing	2018-09-05 16:51:34 -07:00
Roxanne Skelly	bb8d9c5cf0	For stories, base the notification popups off of the action_string instead of a hard-coded value.	2018-09-05 16:50:08 -07:00
Ryan Huffman	335f66d165	Add filtering support to entity list	2018-09-05 14:30:48 -07:00
Ryan Huffman	739530cb85	Limit Entity List to only getting the properties it needs	2018-09-05 14:30:36 -07:00
Ryan Huffman	a9a5bf1e97	Replace entity list UI with custom, brute-force solution	2018-09-05 14:30:19 -07:00
Ryan Huffman	f2cc2f1485	Update entity list UI to be updated in a single batch	2018-09-05 14:30:19 -07:00
Ryan Huffman	f6ac755bae	Add profiling to edit.js fof the entity list	2018-09-05 14:30:19 -07:00
Ryan Huffman	133ac0662a	Move entity list qml to scripts dir	2018-09-05 14:30:19 -07:00
David Back	40d4f581f5	working scrolling	2018-09-05 13:16:23 -07:00
unknown	f941026a62	new entity list view wip	2018-09-04 19:11:09 -07:00
luiscuenca	99e6e3d112	Collision Pick added to teleport.js	2018-09-04 17:18:26 -07:00
David Rowe	c41d74621e	Merge branch 'master' into M17217-b ... # Conflicts: # interface/src/raypick/PathPointer.cpp	2018-08-31 14:26:24 +12:00
Dante Ruiz	93b0f15116	addressing some feedback	2018-08-30 13:22:17 -07:00
John Conklin II	f5ebdfa233	Merge pull request #13905 from zfox23/fixPr13870 ... Fixup PR13870: Make the feature work in Master	2018-08-30 11:08:23 -07:00
Dante Ruiz	8c77820e30	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-30 09:45:41 -07:00
David Rowe	73253977fe	Merge branch 'M17428-c' into M17428-d ... # Conflicts: # scripts/system/miniTablet.js	2018-08-30 16:21:31 +12:00
David Rowe	ec20fb7edb	Reorient and reposition mini tablet	2018-08-30 16:16:49 +12:00
David Rowe	a01a5e3b39	Merge branch 'M17428-c' into M17428-d	2018-08-30 13:44:02 +12:00
David Rowe	a5c3450bfc	Tweak mini tablet UI layout	2018-08-30 13:43:31 +12:00
Zach Fox	b8cd5dd8b9	Fixup PR13870: Make the feature work in Master	2018-08-29 16:58:19 -07:00
John Conklin II	7298cb4654	Merge pull request #13888 from dback2/editControllerMapping ... Edit mode controller mapping using new platform state variables	2018-08-29 16:06:47 -07:00
John Conklin II	47ce8be526	Merge pull request #13854 from wayne-chen/fixTabletButton-case-16847 ... MS16847: Tablet button doesn't load in HMD mode	2018-08-29 13:20:04 -07:00
David Back	96d2ba660c	Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping	2018-08-29 12:05:51 -07:00
David Back	0e53fa3f8b	only focus with selection	2018-08-29 12:05:46 -07:00
David Back	dcf2074d7e	remove [ camera key, allow F to enter camera without selection	2018-08-29 11:56:37 -07:00
David Rowe	c6d0ad39c0	Merge branch 'M17428-c' into M17428-d	2018-08-29 22:13:43 +12:00
David Rowe	15fcafa2f5	Use SVGs for buttons	2018-08-29 22:13:09 +12:00
David Rowe	b338c9f6fa	Updated tiny table model and layout	2018-08-29 22:10:24 +12:00
David Rowe	91c1e1b276	Different expansion points and delta rotations if grabbed by other hand	2018-08-29 09:59:04 +12:00
David Rowe	f5c49026ab	Expand tablet after it's been released from grab by other hand	2018-08-29 09:49:42 +12:00
David Rowe	49f5d5f2b7	Display mini tablet rotated in palm	2018-08-29 08:55:46 +12:00
David Rowe	e5c733e7f2	Merge branch 'master' into M17428-c	2018-08-29 08:20:00 +12:00
David Back	511478a563	use not Mac instead of Windows	2018-08-27 18:11:19 -07:00
David Back	f81fe6b29f	add more inputs to controller mapping	2018-08-27 16:35:36 -07:00
Seth Alves	52bbb4d2ab	fix ray-pick results on entities with non-default registration point. clean up grab scripts to correctly use this fix.	2018-08-27 16:21:01 -07:00
David 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