6707 commits

Author	SHA1	Message	Date
Kerry Ivan Kurian	505e08b841	Resolve merge conflicts	2018-09-25 00:57:43 -07:00
Zach Fox	1ac2800e18	Fix wallet dot logic	2018-09-24 17:50:37 -07:00
sam gateau	7cf7eaa7c8	Exposing the drawcall user info just a uint16 right now and use it for the skinning and blendshape	2018-09-24 17:34:42 -07:00
Zach Fox	be304ea975	Small bugfixes again	2018-09-24 17:33:23 -07:00
Kerry Ivan Kurian	697f556a60	Persist list of marketplace items in test ... The list of resources between runs of the marketplace item tester now persist between runs of the tester.	2018-09-24 16:30:49 -07:00
Zach Fox	a76c3f028d	Small bugfixes	2018-09-24 14:46:00 -07:00
Howard Stearns	71cff45fbb	Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2	2018-09-24 14:38:21 -07:00
John Conklin II	55848e6959	Merge pull request #14008 from sethalves/fix-local-angular-velocity ... fix bug that caused localAngularVelocity to get zeroed out	2018-09-24 14:32:57 -07:00
Howard Stearns	d3391b9273	Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2	2018-09-24 13:50:52 -07:00
Roxanne Skelly	6f4c376d9f	Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray	2018-09-24 13:45:24 -07:00
Roxanne Skelly	d5baadbefa	Modify --url hifiapp: behavior to trigger through appUI when first ... starting interface. Also, menu names and order follow UX documentation.	2018-09-24 13:43:55 -07:00
John Conklin II	1f6f51993d	Merge pull request #14029 from huffman/fix/keyboard-logging-in-edit ... Remove verbose logging of keyboard messages in edit.js and gridTool.js	2018-09-24 12:54:43 -07:00
John Conklin II	9916496118	Merge pull request #14041 from huffman/fix/entity-list-no-highlight-74 ... Fix entity list selection failing when selecting entities not in list	2018-09-24 11:02:36 -07:00
Zach Fox	57c303440b	Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps	2018-09-24 09:32:53 -07:00
Sam Gateau	b3112f898a	Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis	2018-09-22 18:04:24 -07:00
sam gateau	d8984dafa0	ui allows to enable/disable the deformer componenets	2018-09-21 16:45:21 -07:00
Dante Ruiz	d4450ac780	fix equip and keeping new functionallity	2018-09-21 15:59:00 -07:00
David Kelly	fe9b972c80	Do not have active buy button on invalidated items	2018-09-21 15:46:57 -07:00
John Conklin II	ea7bc26ad8	Merge pull request #14038 from wayne-chen/fixInterstitialButton ... Fix Interstitial GoTo button stretch	2018-09-21 11:44:48 -07:00
Zach Fox	6284074ff9	Don't show banner when app is open but continue updating data	2018-09-21 10:47:59 -07:00
David Rowe	b1bbcb9e5e	Tidying	2018-09-21 13:48:28 +12:00
David Rowe	9426f72652	Make mini tablet disappear when using grip the same as the trigger	2018-09-21 13:45:10 +12:00
David Rowe	eac1666e01	Disable grabbing the mini tablet with the grip button	2018-09-21 12:44:55 +12:00
sam gateau	cae2c60e7f	Factorizing the deformer code in a separate file, and now trying to control dynamically the blend shape on off	2018-09-20 17:29:31 -07:00
sam gateau	d3ff4b8630	Factorizing the deformer code in a separate file, and now trying to control dynamically the blend shape on off	2018-09-20 17:26:26 -07:00
David Rowe	0ae7fdc7b1	Remove ability to grab the mini tablet with the other hand	2018-09-21 12:02:46 +12:00
David Rowe	5719b7020d	Merge branch 'master' into M17428-f	2018-09-21 10:47:56 +12:00
Zach Fox	33c04631ea	Comments on Confluence doc	2018-09-20 14:37:46 -07:00
Kerry Ivan Kurian	ae4352f450	Rez entity in marketplace item tester	2018-09-20 13:55:22 -07:00
Ryan Huffman	1ee655c8f8	Fix sorting of entity list not working as expected	2018-09-20 13:51:00 -07:00
Thijs Wenker	d1f35c8c54	update the entityList update with newly added Entities.getMultipleEntities function	2018-09-20 22:48:56 +02:00
Ryan Huffman	72adfb7ff0	Fix entity list selection failing when selecting entities not in list	2018-09-20 13:46:22 -07:00
Zach Fox	87e91a4401	GOTO doesn't care about SINCE; reduce data for PEOPLE	2018-09-20 13:36:50 -07:00
Wayne Chen	8bd698b143	leaving button in natural dims	2018-09-20 11:13:27 -07:00
Zach Fox	ed84b49ece	Small bugfixes and using original endpoints	2018-09-19 16:15:59 -07:00
Howard Stearns	d644a63990	consistent/usefull checkout flow when you don't have enough money.	2018-09-19 16:00:40 -07:00
Ryan Huffman	8805ce49e3	Remove verbose logging of keyboard messages in edit.js and gridTool.js	2018-09-19 15:06:58 -07:00
Ryan Huffman	431daecd8e	Fix shifting of yaw rotation handle	2018-09-19 14:33:51 -07:00
Zach Fox	144771b77b	Request JSON from server	2018-09-19 11:35:17 -07:00
David Back	46c8083fb9	only call selectEntity one time per trigger	2018-09-19 10:13:15 -07:00
Zach Fox	f70ecdad16	Small bugfix	2018-09-18 17:00:53 -07:00
Zach Fox	9db11aeda7	Bugfixes and new algo for PAL notifs	2018-09-18 16:35:53 -07:00
Zach Fox	4987164706	Notifications for GOTO (using a cool algorithm)	2018-09-18 15:30:43 -07:00
Zach Fox	55a0f77697	Notifications for MARKET	2018-09-18 14:45:14 -07:00
Zach Fox	04b44d0594	Fix small since bug	2018-09-18 12:38:33 -07:00
Zach Fox	a97f9eb79a	Logic for Wallet notifications; some bugfixes	2018-09-18 12:28:03 -07:00
Zach Fox	d487914656	Prevent text notification from appearing when not necessary	2018-09-18 11:28:59 -07:00
Kerry Ivan Kurian	f2a046da91	Install marketplace item tester	2018-09-18 00:08:09 -07:00
Zach Fox	c453594eb7	Overhaul notification logic for PAL	2018-09-17 14:41:18 -07:00
Zach Fox	143a059b16	Small changes to AppUI and PAL	2018-09-17 11:11:36 -07:00
Zach Fox	23fab0985b	Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi	2018-09-17 11:11:21 -07:00
David Rowe	5b3d92e816	Persist showing mini tablet for a while after it would otherwise hide	2018-09-16 08:09:26 +12:00
Seth Alves	f86075b2dd	Revert "Fix for angularVelocity zeroing out on duplication or undo" ... This reverts commit 9c96a10f6c.	2018-09-15 09:21:12 -07:00
David Rowe	9d051b71bb	Fix mini tablet sometimes flipping when grabbed by other hand	2018-09-15 10:14:22 +12:00
John Conklin II	65ef04ae75	Merge pull request #13937 from luiscuenca/stt_teleport_wip ... Safe Teleport Target	2018-09-14 15:11:18 -07:00
Zach Fox	9c5544af39	Merge in big work from appui_notifications branch	2018-09-14 14:37:04 -07:00
Zach Fox	9e50904376	Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi	2018-09-14 14:36:22 -07:00
luiscuenca	04e6225a95	Threshold back	2018-09-14 11:22:47 -07:00
luiscuenca	8c9173b639	Safe landing for discrepancies	2018-09-14 11:06:30 -07:00
David Back	86972cf4fb	Merge pull request #13992 from dback2/entityListSearchCase ... Fix entity list search case-sensitivity and allow id search	2018-09-14 10:58:44 -07:00
Howard Stearns	4378f5bf1c	Merge pull request #13996 from howard-stearns/text-tuning-for-wallet-setup-cta ... Text tuning for wallet setup call to action	2018-09-14 10:17:22 -07:00
David Back	296e2ba488	lowercase search term at start	2018-09-14 09:57:27 -07:00
Gabriel Calero	cb49635627	Fix switch from Top View to My View	2018-09-14 13:34:04 -03:00
howard-stearns	685b2978ce	Text tuning for wallet setup call to action	2018-09-14 08:26:25 -07:00
David Rowe	45281960af	Don't display mini tablet if user is away	2018-09-14 20:30:17 +12:00
David Rowe	80aa74600f	Fix mini tablet sometimes remaining parented when it shouldn't be	2018-09-14 20:15:08 +12:00
David Rowe	ba56457663	Smooth the transition between expanded mini tablet and tablet proper	2018-09-14 20:14:54 +12:00
David Rowe	f01ebe57ea	Trial hiding the UI when it's expanding to become the tablet proper	2018-09-14 18:55:29 +12:00
unknown	f9480c24a5	store search term lower	2018-09-13 20:07:49 -07:00
unknown	ae2005b8c4	Merge branch 'master' of https://github.com/highfidelity/hifi into entityListSearchCase	2018-09-13 19:37:16 -07:00
luiscuenca	fb37e13aae	fix hat stand fail	2018-09-13 18:21:22 -07:00
David Back	b65bd6736f	also allow search using entity id	2018-09-13 18:20:11 -07:00
Wayne Chen	53582bddcd	pushing more changes	2018-09-13 17:26:08 -07:00
Wayne Chen	bf7dd94db7	button was clipped; adding higher res img	2018-09-13 17:25:33 -07:00
Wayne Chen	2b8aebdb6b	Revert "Merge branch 'master' into fixGoToButtonInterstitial" ... This reverts commit b4b0c519f3, reversing changes made to aef3ed3e01.	2018-09-13 17:21:29 -07:00
Wayne Chen	40451a1fc1	Revert "Revert "Merge branch 'master' into fixGoToButtonInterstitial"" ... This reverts commit c5468fd8e9.	2018-09-13 17:21:07 -07:00
Wayne Chen	c5468fd8e9	Revert "Merge branch 'master' into fixGoToButtonInterstitial" ... This reverts commit b4b0c519f3, reversing changes made to 77d5ebf34f.	2018-09-13 17:18:49 -07:00
Wayne Chen	b4b0c519f3	Merge branch 'master' into fixGoToButtonInterstitial	2018-09-13 17:11:34 -07:00
David Rowe	fe8c237d64	Don't display mini tablet in peripheral vision	2018-09-14 11:22:31 +12:00
David Rowe	c27bb04596	Display mini tablet when it or palm is facing the camera	2018-09-14 11:10:26 +12:00
Wayne Chen	77d5ebf34f	changing button URL - typo	2018-09-13 15:47:25 -07:00
Wayne Chen	db1acb87b8	button was clipped; adding higher res img	2018-09-13 15:38:24 -07:00
David Rowe	bbfb2b1374	Merge branch 'master' into M17428-f	2018-09-14 10:36:49 +12:00
David Back	4bc046187a	fix searching case-sensitivity	2018-09-13 15:06:14 -07:00
John Conklin II	8e5f2d0e08	Merge pull request #13983 from danteruiz/disable-interstitial ... disable interstitial by default and fix crash	2018-09-13 14:01:28 -07:00
luiscuenca	b517808bc2	Fix smaller size avatar capsule and land on detailed mesh	2018-09-12 21:24:19 -07:00
David Rowe	4978f80f43	Don't turn on laser when mini tablet is expanding	2018-09-13 12:27:30 +12:00
David Rowe	0437c50c06	Fix mini tablet not reliably being grabbed	2018-09-13 12:20:00 +12:00
David Rowe	54dd868b3c	Rotate mini tablet to keep it "vertical"	2018-09-13 11:54:59 +12:00
David Back	7768e08510	rename func	2018-09-12 16:06:14 -07:00
Zach Fox	5a1d074e2f	Goto now uses AppUi; lint	2018-09-12 16:04:37 -07:00
David Back	06504ade88	Merge branch 'master' of https://github.com/highfidelity/hifi into centerScaleCubeHMD	2018-09-12 16:04:22 -07:00
David Back	1b8e9ed906	get controller position from avatar frame	2018-09-12 16:02:43 -07:00
Zach Fox	01073ca18d	Lots of changes; marketplaces.js working now	2018-09-12 15:46:17 -07:00
Dante Ruiz	d76a2c1add	disable interstitial by default and fix crash	2018-09-12 15:31:03 -07:00
David Back	55a4c55f78	remove unused and rename var	2018-09-12 14:48:27 -07:00
David Back	3da442a8f9	allow highlights in hmd, fix center scale hmd math	2018-09-12 14:44:04 -07:00
John Conklin II	e243792cac	Merge pull request #13623 from wayne-chen/fixGrabWebSurface-case-16192 ... MS16192: Fix Near Grabbing After Using Web Entity	2018-09-12 12:50:44 -07:00
David Back	cf1c1296a7	fix center scale cube in hmd	2018-09-12 11:44:26 -07:00
Wayne Chen	521361293a	moving comment locations inside conditionals	2018-09-12 11:03:00 -07:00