475 commits

Author	SHA1	Message	Date
SamGondelman	4d4294dd6a	Merge remote-tracking branch 'upstream/master' into decals	2018-02-02 16:50:01 -08:00
SamGondelman	d7f4b033e8	wip finish adding material entity	2018-02-02 16:49:33 -08:00
Seth Alves	600cc1b48e	Merge pull request #12250 from druiz17/fix-multihighlight ... Don't manually highlight tablet buttons from swipeview.	2018-01-31 09:33:33 -08:00
Dante Ruiz	be42f0cfb1	finally fix the multihighlighting	2018-01-26 13:24:44 -08:00
Dante Ruiz	f3e20e72cb	really fix multi-highlighing	2018-01-25 15:09:03 -08:00
John Conklin II	e081808ace	Merge pull request #12235 from luiscuenca/assetBrowserFix ... RC63 Fix Edit/Asset Browser in HMD mode	2018-01-25 09:38:23 -08:00
Dante Ruiz	c73c0487a0	min diff	2018-01-24 16:41:19 -08:00
Dante Ruiz	6149630ccd	don't manually highlight tablet buttons from swipeview, since the tablet button highligh themselves	2018-01-24 16:36:08 -08:00
luiscuenca	29dd24b05f	Fix GoTo app in HMD mode	2018-01-23 15:50:32 -07:00
luiscuenca	fddbf13796	Fix Asset Browser access from Create	2018-01-23 11:12:22 -07:00
Melissa Brown	991dad18ba	Merge pull request #12160 from ElderOrb/FB11241 ... FB11241 Changing options in menu causes the title “Menu” to change to…	2018-01-15 10:46:37 -08:00
Zach Fox	6920e57613	Fix 'Browse Avatars' button from Avatar Settings	2018-01-12 13:31:58 -08:00
Alexander Ivash	11e918681a	FB11241 Changing options in menu causes the title “Menu” to change to “root” ... note: fix is based on removing duplicated top-level menu entry from stack view	2018-01-12 02:08:10 +03:00
vladest	cff80e86b6	Temporarily disable magnification until further notice	2018-01-11 22:18:22 +01:00
Anthony Thibault	8d5e7dbeff	Merge pull request #12140 from hyperlogic/bug-fix/master-snapshot-app-settings ... Fix for black screen when clicking Settings from Snap app	2018-01-11 09:58:10 -08:00
Seth Alves	363b9bfe11	Merge pull request #12127 from SamGondelman/freeze ... Comment out TabletAddressDialog logging of long messages	2018-01-10 18:07:18 -08:00
Anthony J. Thibault	1deb75daf7	Fix for black screen when clicking Settings from Snap app ... (cherry picked from commit d5e3b97c93)	2018-01-10 16:31:51 -08:00
SamGondelman	a42b0cf485	comment out logging	2018-01-09 14:58:23 -08:00
Melissa Brown	19802b33eb	Merge pull request #12109 from vladest/tablet_page_indicator ... Page indicator visible only when pages more than one	2018-01-09 14:05:32 -08:00
Seth Alves	87dfe0efc3	Merge pull request #12097 from vladest/tablet_pagination_magnify ... Tablet pagination magnify	2018-01-09 08:08:02 -08:00
vladest	891663bae9	Page indicator visible only when pages more than one	2018-01-08 23:07:09 +01:00
vladest	02972c92f0	Merge branch 'master' into tablet_pagination_magnify	2018-01-05 19:12:13 +01:00
Seth Alves	2071d42d25	Merge pull request #12088 from ElderOrb/FB11008 ... 11008 GoTo app does not focus on address bar when opened	2018-01-05 10:07:36 -08:00
Andrew Meadows	c33c637f07	Merge pull request #12041 from vladest/case_10854_fix_not_loading_dialogs ... Adopt path to certain Tablet dialogs to new loading subsystem and pat…	2018-01-05 09:07:54 -08:00
vladest	67ca76baa1	Magninfication	2018-01-04 23:11:42 +01:00
Alexander Ivash	7ab7a46530	11008 GoTo app does not focus on address bar when opened	2018-01-04 23:38:10 +03:00
vladest	afc3082593	Cleanup. Errors checks	2017-12-28 13:16:51 +01:00
vladest	35fee739c5	Use buttons index	2017-12-27 23:50:15 +01:00
vladest	ffcccacfa5	Selection consistency #2	2017-12-25 23:46:06 +01:00
vladest	cb7472c270	Selection consistency #1	2017-12-25 20:14:31 +01:00
vladest	a497047666	Refactored using new GridView approach	2017-12-23 17:44:26 +01:00
vladest	7985c39f2a	Adopt path to certain Tablet dialogs to new loading subsystem and path resolver	2017-12-21 22:14:15 +01:00
vladest	2bca0939b3	Preliminary proxy model	2017-12-21 19:32:13 +01:00
vladest	d6e1a3ea41	Merge conflicts solved	2017-12-21 09:02:04 +01:00
vladest	79f9b54f6a	Store button list in the resources section of fake item instead of C++ space	2017-12-20 22:59:07 +01:00
vladest	38453afb3b	Create pages and store in global array, makes sure it will not be cleared by garbage collector whe out of scope	2017-12-18 14:56:33 +01:00
vladest	62a762b879	Merge branch 'master' into tablet_home_paginate	2017-12-16 20:32:21 +01:00
vladest	cdb9d72387	Added smart pointer for qml buttons. removed extra modifiers. page changed using left and right buttons	2017-12-16 20:27:19 +01:00
Zach Fox	3764445272	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-13 14:12:08 -08:00
vladest	e052784431	Code style	2017-12-12 14:12:03 +01:00
vladest	cc78fc1f53	Added buttons list mutex protection. Reworked keyboard tablet navigation. no more double selections	2017-12-11 17:50:16 +01:00
Alexander Ivash	cb471582e5	10334 Unable to type in Go To app search bar after UI reappears from moving Avatar	2017-12-10 01:34:03 +03:00
vladest	9b3db0725b	Retreive buttons list from tablet proxy	2017-12-07 22:36:34 +01:00
Zach Fox	b2bafed2bb	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-07 11:21:24 -08:00
vladest	3c11d29a7f	Something intermediate	2017-12-07 19:13:39 +01:00
vladest	fd9539a9e4	Using Flickable signals to remove hover state instead of timer. No more delays	2017-12-02 13:57:12 +01:00
vladest	570be69fcf	Fix warnings after apps closed	2017-12-01 09:52:45 +01:00
vladest	f510b4bcd8	Swipe area expanded to whole tablet. Icons doesnt stick together anymore	2017-11-30 21:10:12 +01:00
vladest	69264a6ea8	Merge with master. Conflicts solved	2017-11-30 15:34:21 +01:00
MiladNazeri	83d13717fe	Merge pull request #11752 from Menithal/21539 ... 21539: Add "None" option in Head Tracking section when "Use Vive in Desktop Mode" is selected	2017-11-27 16:02:01 -08:00