4299 commits

Author	SHA1	Message	Date
Wayne Chen	2a77a29f8a	Delete LoginScreenDialog.qml	2018-12-04 17:07:03 -08:00
Wayne Chen	3951203b55	adding tablet bg/no movement in login state	2018-12-04 16:50:01 -08:00
Wayne Chen	a24cd41367	getting textfield into focus	2018-12-04 14:19:09 -08:00
Wayne Chen	e7e42e3430	adding steam linking	2018-12-04 10:03:40 -08:00
Wayne Chen	dc3381d4a9	updating artwork	2018-12-03 17:28:10 -08:00
Wayne Chen	22bf4fc5c4	removing fromBody	2018-12-03 16:11:13 -08:00
Wayne Chen	5beb810604	adding more steam login flow	2018-12-03 16:09:10 -08:00
Wayne Chen	09bc886c20	Merge branch 'master' into loginInitiative2	2018-11-30 13:05:17 -08:00
Wayne Chen	c8783776fe	removing mousearea, fixing continue button	2018-11-30 13:02:29 -08:00
Shannon Romano	1f29423a58	Merge pull request #14423 from vladest/qml_warning_fix ... Fix QML achoring warnings on Layouts	2018-11-30 10:50:30 -08:00
Shannon Romano	dacf43d70c	Merge pull request #14483 from danteruiz/keyboard-toggle-option ... Keyboard menu option in general settings	2018-11-30 09:43:10 -08:00
Wayne Chen	5e82bc78b7	fixing sign up screen	2018-11-29 20:17:18 -08:00
Wayne Chen	707339dd2a	allowing clicking any mousearea back to the textfield/disable movement ctrls	2018-11-29 17:18:40 -08:00
Wayne Chen	a80017c8c3	fixing typo	2018-11-29 15:04:34 -08:00
Wayne Chen	295d40724a	adding difference in text shown between tablet/other mode	2018-11-28 19:24:47 -08:00
Wayne Chen	34fb7159e2	Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2	2018-11-28 19:24:20 -08:00
Wayne Chen	b0fb7778cf	fixing some text, turning off lasers until they intersect login overlay	2018-11-28 19:17:30 -08:00
Wayne Chen	9deb15b9f6	Merge branch 'master' into loginInitiative2	2018-11-28 19:10:20 -08:00
Wayne Chen	527f8a2b59	UI feedback + new overlay position update	2018-11-28 15:38:37 -08:00
Wayne Chen	d8a1c4e956	reverting header in qml	2018-11-27 14:34:58 -08:00
Zach Fox	a4175b0428	Error handling in checkout	2018-11-27 14:17:28 -08:00
Dante Ruiz	29028386c8	Keyboard menu option in general settings	2018-11-27 11:56:07 -08:00
Zach Fox	67dfccafec	Show item name when sending item	2018-11-27 10:19:14 -08:00
Wayne Chen	94789d0170	standardizing font of text fields	2018-11-26 21:06:42 -08:00
Wayne Chen	1258676d56	fixing text height/toolbar coming back	2018-11-26 21:01:34 -08:00
Zach Fox	a9fd443f28	'improve' UI slightly	2018-11-26 16:03:07 -08:00
Zach Fox	31f7d747c8	Bugfixes; enable purchase asset from marketplace screen raise	2018-11-26 15:48:49 -08:00
Wayne Chen	c53febceac	adding oculus to login dialog/adding focus wip	2018-11-26 15:10:04 -08:00
Zach Fox	8df5db4239	Allow scripts to open SendAsset screen with pre-filled info	2018-11-26 13:26:17 -08:00
Wayne Chen	d12655ed7b	sfx to login mousearea/hiding desktop toolbar	2018-11-21 12:21:19 -08:00
Wayne Chen	cdee10d0b8	getting dominant hand laser + sign up working	2018-11-20 16:54:16 -08:00
Wayne Chen	4d55081184	changing the keyboard password flag appropriately	2018-11-20 10:56:34 -08:00
Wayne Chen	5f658b90ff	Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2	2018-11-20 10:44:29 -08:00
Wayne Chen	d55c9467e7	fixing keyboard offset	2018-11-20 10:37:30 -08:00
Wayne Chen	e0eba2135a	Merge branch 'master' into loginInitiative2	2018-11-19 15:23:43 -08:00
Wayne Chen	1419ec907b	adding wip	2018-11-19 13:57:55 -08:00
John Conklin II	6b25179aa9	Merge pull request #14420 from danteruiz/fix-keyboard-loging-issue ... Dismiss keyboard when backout of the login screen	2018-11-19 09:58:54 -08:00
Wayne Chen	b8d8710604	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-19 09:02:16 -08:00
vladest	db82994b4d	Merge branch 'master' into qml_warning_fix	2018-11-18 16:10:21 +01:00
vladest	932d1dbcd7	Fixed width binding loop warning	2018-11-17 17:20:02 +01:00
vladest	53b7cc1376	Fix QML achoring warnings on Layouts	2018-11-17 15:06:25 +01:00
Dante Ruiz	4388763c34	fixing keyboard not being dismissing when backout of the login screen	2018-11-16 16:04:40 -08:00
Shannon Romano	6425a474ac	Merge pull request #14378 from danteruiz/fix-case-of-infinate-loading ... Fixing case of interstitial not finishing loading	2018-11-16 14:53:01 -08:00
Howard Stearns	8e1785bd90	security settings post-oculus-store wording	2018-11-15 15:59:52 -08:00
John Conklin II	1ea2ab338e	Merge pull request #13975 from ElderOrb/FB16697 ... Fix multiple issues on 'Calibration' tab of 'Controls' dialog	2018-11-15 14:54:26 -08:00
Dante Ruiz	20ad05726e	entity server timout	2018-11-15 10:52:40 -08:00
Jeff Clinton	c72dd3d690	Merge pull request #14395 from ctrlaltdavid/M19859 ... Fix Goto app clicks not working	2018-11-15 09:56:56 -08:00
Wayne Chen	c85b840db0	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-14 14:47:56 -08:00
John Conklin II	b08283d9e9	Merge pull request #14401 from sethalves/rc76-revert-pr-14238 ... revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.	2018-11-14 14:38:34 -08:00
David Rowe	9c5d318341	Fix highlighting	2018-11-15 10:15:30 +13:00