5213 commits

Author	SHA1	Message	Date
Liv Erickson	387ff680d5	support deleted scenario	2018-03-28 18:12:30 -07:00
Liv Erickson	b78f00342e	Merge branch 'master' of github.com:highfidelity/hifi into feat/disable-add-without-url	2018-03-28 17:53:42 -07:00
vladest	70ce1b2bf7	Fix invalid scrolling detection	2018-03-28 21:48:44 +02: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
Zach Fox	0175028a88	Ensure location is correctly updated when replacing set from Checkout page	2018-03-28 11:31:51 -07:00
vladest	001b6d23ff	Merge branch 'master' into move_to_qqc2	2018-03-28 20:16:26 +02:00
Zach Fox	ca2fba675d	Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation	2018-03-28 10:28:32 -07:00
Brad Hefta-Gaub	16df773de4	Merge pull request #12721 from highfidelity/RC66 ... RC66 - Mergeback	2018-03-28 09:55:46 -07:00
John Conklin II	586fb4829c	Merge pull request #12637 from druiz17/fix-asset-server-qml ... Fix asset server qml sorting	2018-03-28 09:35:53 -07:00
Seth Alves	46fb2033f2	Merge pull request #12574 from druiz17/remap-keybaord ... changing keyboard mapping	2018-03-27 19:00:05 -07:00
David Rowe	1bcb9738f0	Miscellaneous fixes noticed in passing	2018-03-28 12:26:08 +13:00
Dante Ruiz	ad9ca0da20	fix tablet version	2018-03-27 16:03:06 -07:00
John Conklin II	a258a330d3	Merge pull request #12676 from druiz17/fix-keyboard ... fixing AddressManager keyboard when switching domains	2018-03-27 15:34:23 -07:00
John Conklin II	0862f345fe	Merge pull request #12717 from sethalves/workaround-dialog-crash ... fix -- work around asset-upload dialog crash	2018-03-27 13:35:50 -07:00
Seth Alves	4f7d856a1c	don't free dialogs to avoid crash in setKeyboardRaised	2018-03-27 09:28:55 -07:00
vladest	096b56395e	Fix crash on startup	2018-03-27 18:22:56 +02:00
Zach Fox	db2f3451bd	Support .content.zip content sets	2018-03-26 16:20:29 -07:00
Zach Fox	bf48ecda6d	Fix cert location for content sets	2018-03-26 14:48:05 -07:00
Zach Fox	a588776b47	Fix infinite loading when authing wallet during Checkout	2018-03-26 13:19:40 -07:00
Dante Ruiz	b8796db1e5	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-26 09:13:58 -07: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
vladest	56150f8962	Merge branch 'master' into move_to_qqc2	2018-03-24 15:34:49 +01:00
vladest	e0593b7799	Use Flickable instead of ScrollView	2018-03-24 15:32:46 +01:00
vladest	aefda9ef71	Merge branch 'master' into move_to_qqc2	2018-03-24 15:32:04 +01: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
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
John Conklin II	c61ed697df	Merge pull request #12552 from vladest/assetbrowser_cosmetics ... Wrap text in query dialogs. Add right margins for input field and but…	2018-03-22 17:56:47 -07:00
Dante Ruiz	1d17658c80	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-22 16:29:16 -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
Liv Erickson	1244559618	remove spaces for clean-ness	2018-03-22 15:37:12 -07:00
Liv Erickson	0647155c30	re-add experimental image removal	2018-03-22 15:33:23 -07:00
Liv Erickson	f62e1ed54e	disable add button on model until text is entered	2018-03-22 15:29:41 -07:00
Sam Gondelman	bbded2215d	Merge pull request #12665 from gcalero/android_bottombar_resize ... Android - Resize bottombar after window size changes (to always fill …	2018-03-22 11:15:02 -07:00
John Conklin II	b6920a503c	Merge pull request #12618 from vladest/hificonstants_as_object ... Hificonstants as object	2018-03-22 11:03:05 -07:00
Dante Ruiz	86cd5ffa30	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-21 08:49:25 -07:00
Zach Fox	0b810c3aa8	Various fixes	2018-03-19 14:39:50 -07:00
John Conklin II	47437c9564	Merge pull request #12651 from ctrlaltdavid/21799 ... Fix "text" overlay not clipping to right and bottom margins	2018-03-19 14:12:20 -07:00
Zach Fox	18aa95e0bb	New Checkout flow for updating specific Editions	2018-03-19 13:35:27 -07:00
Zach Fox	daa68768b9	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-19 12:18:10 -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
Dante Ruiz	652faaa116	fixing AddressManager keyboard when switching domains	2018-03-16 16:32:37 -07:00
Dante Ruiz	1dcdcffa69	hopefully the last fix	2018-03-16 13:52:08 -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
Zach Fox	eb8cfcd8e9	Bugfix	2018-03-16 13:13:38 -07:00
Zach Fox	ad33e775f1	Fix bottom anchor for listView when banner is showing	2018-03-16 11:28:03 -07:00
Cristian Luis Duarte	e6a8b322b1	Android bottom bar - remove extra semicolon	2018-03-16 15:15:00 -03:00
Cristian Luis Duarte	18682d854c	Android bottom bar - Put height up at the top of the Item definition it's clearer where relocateAndResize gets its height from	2018-03-16 15:06:12 -03:00
Cristian Luis Duarte	79ff2df860	Android - Resize bottombar after window size changes (to always fill the screen horizontally)	2018-03-16 13:03:50 -03: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
Atlante45	d96f7553d9	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2018-03-15 15:22:43 -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
David Rowe	a7cd5a240a	Fix "text" overlay not clipping to right and bottom margins	2018-03-15 17:31:02 +13:00
Zach Fox	2d57c444b6	Don't auto apply 'updatable' filter	2018-03-14 16:02:33 -07:00
Zach Fox	cc4726b24b	Some bugfixes	2018-03-14 15:47:19 -07:00
Zach Fox	f3efdda6b0	Fix content set filter	2018-03-14 14:34:15 -07:00
Zach Fox	6647475f5c	Wrong sign	2018-03-14 11:19:55 -07:00
vladest	387be7415f	WIP: do not push	2018-03-14 19:00:19 +01:00
Zach Fox	74e24ec289	Final touches?	2018-03-14 10:58:18 -07:00
Zach Fox	70b3d0fe5f	Merge branch 'filterBar' into commerce_upgrades_1	2018-03-14 09:53:02 -07:00
Zach Fox	98cdbbb3e6	Small update to dot before merging in filterBar	2018-03-14 09:45:42 -07:00
Dante Ruiz	d6b3e91de1	removing debug statement	2018-03-14 09:35:22 -07:00
Dante Ruiz	2fb1fbe027	fix sorting	2018-03-14 09:17:22 -07:00
Zach Fox	e2326a3733	Initial work for 'messages waiting' light	2018-03-13 17:05:16 -07:00
Dante Ruiz	2d85669b08	fix backedColumn width	2018-03-13 16:30:43 -07:00
Zach Fox	882e4d6b45	Parse the string that comes from the backend	2018-03-13 15:13:41 -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
Zach Fox	86115a8578	Merge branch 'master' of github.com:highfidelity/hifi into filterBar	2018-03-13 13:42:13 -07:00
Zach Fox	a949208988	Design tweaks	2018-03-13 13:23:32 -07:00
Zach Fox	5563edd957	Focus fix; Switch to QQC2	2018-03-13 13:11:59 -07:00
Zach Fox	50e709c738	Add updates; drop shadow	2018-03-13 12:13:14 -07:00
Cristian Luis Duarte	a3811c2844	Coding style corrections	2018-03-13 15:56:13 -03:00
vladest	d41dd1b18d	Merge branch 'master' into move_to_qqc2	2018-03-13 19:28:51 +01:00
Dante Ruiz	00fa5cfd06	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-13 10:08:00 -07:00
Dante Ruiz	f521a129b6	fixing issues	2018-03-13 10:07:34 -07:00
Zach Fox	bce7fb1ff1	Improvements	2018-03-12 16:54:10 -07:00
Zach Fox	9c7d857ecb	Fix some focus issues	2018-03-12 16:15:50 -07:00
Zach Fox	f1121db4da	It's working!	2018-03-12 15:54:11 -07:00
Gabriel Calero	3117ec9015	Merge remote-tracking branch 'upstream/master' into android_hifi_audio_codec	2018-03-12 19:44:24 -03:00
Zach Fox	db7eea543e	Initial progress	2018-03-12 15:11:09 -07:00
Sam Gondelman	c59d29f4ee	Merge pull request #12623 from SamGondelman/android ... Android: Fix corruption on startup	2018-03-12 15:03:07 -07:00
John Conklin II	7f7d20738a	Merge pull request #12553 from vladest/mac_combobox_misplaced ... Fix CheckBox on Mac	2018-03-12 14:47:39 -07:00
Gabriel Calero	7778ddfdcb	Merge remote-tracking branch 'upstream/master' into android_hifi_audio_codec	2018-03-12 18:33:05 -03:00
SamGondelman	9953e7051f	Merge remote-tracking branch 'upstream/master' into android	2018-03-12 14:15:31 -07:00
SamGondelman	4bef033d6f	cleanup, don't compress rcc file to fix corruption	2018-03-12 13:05:03 -07:00
Alexia Mandeville	8c9c7248d4	Reorganize of menu action items as well as QML categories	2018-03-12 12:52:12 -07:00
vladest	e84704165f	Remove reference to non existing id	2018-03-10 16:35:17 +01:00
vladest	7ca0c76b1c	QtObject dousnt support inner instances	2018-03-10 16:18:32 +01:00
vladest	d6a42a9a49	HifiConstants is not visual item, just a placeholder for constants	2018-03-10 14:49:04 +01:00
vladest	405951e411	Fix merge conflict	2018-03-10 14:45:20 +01:00
vladest	fe5d7463fe	Merge branch 'master' into move_to_qqc2	2018-03-10 14:42:51 +01:00
Cristian Luis Duarte	ce0d76be2b	Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move	2018-03-09 20:51:21 -03:00
John Conklin II	42a686ad93	Merge pull request #12578 from druiz17/use-correct-audio-api ... use correct scripting api for audio in Audio.qml	2018-03-09 13:41:20 -08:00
Cristian Luis Duarte	3d933e1810	Android - Joystick hidden when opening login and shown after Cancel.	2018-03-09 17:41:05 -03:00
John Conklin II	25b93d9fd7	Merge pull request #12606 from ElderOrb/FB12956_RC65 ... Fix for broken 'toggle audio meter' button	2018-03-09 11:20:27 -08:00
Dante Ruiz	e21c4988fb	stereo checkbox text change	2018-03-09 10:11:25 -08:00
Dante Ruiz	3a39fca268	made requested changes	2018-03-09 10:09:51 -08:00
John Conklin II	6969f014fc	Merge pull request #12601 from howard-stearns/clear-wallet-when-picking-a-new-one ... clear wallet when picking a new one	2018-03-09 10:09:41 -08:00
John Conklin II	407dfec342	Merge pull request #12603 from howard-stearns/RC65-clear-wallet-when-picking-a-new-one ... clear wallet when picking a new one	2018-03-09 10:09:24 -08:00
Zach Fox	2b137f94a6	Merge pull request #12596 from zfox23/fixFontsAgain ... Fix font loading for MacOS via completely different font loading method	2018-03-09 09:49:56 -08:00
Dante Ruiz	c49d0557fc	fixing check box issues	2018-03-09 09:29:37 -08:00
Dante Ruiz	8703e9e002	Merge branch 'master' of github.com:highfidelity/hifi into use-correct-audio-api	2018-03-09 08:42:50 -08:00
Atlante45	69fb830480	Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master	2018-03-08 17:23:17 -08:00
Alexander Ivash	b427d6c326	FB12956 - Audio Meter Toggle Button Broken	2018-03-09 02:20:34 +03:00
Zach Fox	c22d79041d	Cleanup after cherry-pick	2018-03-08 14:35:56 -08:00
howard-stearns	883528488c	clear wallet when picking a new one	2018-03-08 14:35:43 -08:00
Zach Fox	747a6b07ce	Fix font loading for MacOS via different font loading method	2018-03-08 14:31:48 -08:00
howard-stearns	9d805283d1	clear wallet when picking a new one	2018-03-08 14:24:44 -08:00
Zach Fox	086431d0e7	Merge branch 'master' of github.com:highfidelity/hifi into fixFontsAgain	2018-03-08 13:50:19 -08:00
Dante Ruiz	9f246ea314	Merge branch 'master' of github.com:highfidelity/hifi into use-correct-audio-api	2018-03-08 13:04:02 -08: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
Zach Fox	a479439b23	Merge pull request #12572 from zfox23/sendMoney_connectionInstructions ... Show Connection instructions in Send Money when 0 connections	2018-03-08 11:20:23 -08:00
Zach Fox	d0cc64f63d	Fix font loading for MacOS via different font loading method	2018-03-08 11:19:49 -08:00
Sam Gondelman	1e9cfe29f2	Merge pull request #12388 from highfidelity/android ... Android Tip	2018-03-08 10:18:35 -08:00
Zach Fox	a0eb7e0712	Don't default unknown Marketplace item types to 'Entity'	2018-03-07 15:01:12 -08:00
Zach Fox	d71fc22ed8	Support argument to available_updates endpoint	2018-03-07 14:06:29 -08:00
Zach Fox	eded8586a5	Use correct backend terminology	2018-03-07 13:40:55 -08:00
Zach Fox	0285bf9379	purposeful incorrect indentation to prevent insane diff	2018-03-07 13:27:40 -08:00
Zach Fox	a2eb13b70b	Prevent logspam	2018-03-07 13:23:13 -08:00
Gabriel Calero	109fa1d832	Add the url of each qml as on-screen debug info	2018-03-07 17:18:37 -03: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
Zach Fox	91e0af9b46	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-07 10:16:10 -08:00
Zach Fox	b764a4d404	Filter out invalid purchases	2018-03-07 09:22:57 -08:00
Dante Ruiz	13767beece	Caps change	2018-03-07 08:19:36 -08: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
NissimHadar	d72f46ec3e	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-06 16:24:53 -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
Dante Ruiz	97d283cc5f	use correct api call for audio and correct function call to set stereo input mode	2018-03-06 16:17:27 -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
Gabriel Calero	069d3e40bc	Merge branch 'android' into android_bubble_fix	2018-03-06 18:58:49 -03:00
Zach Fox	48aa862c16	Show Connection instructions in Send Money when 0 connections	2018-03-06 13:52:42 -08:00
Alexander Ivash	53e1a0cae5	forward 'maybeEnableHmdPreview' if control is not visible	2018-03-06 22:25:35 +03:00
Zach Fox	ee28983334	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-06 11:13:40 -08:00
vladest	698a224bb0	Next attempt to fix ghosted scroll bars	2018-03-06 16:13:46 +01:00
vladest	86b9e1b873	Merge branch 'master' into move_to_qqc2	2018-03-06 13:40:51 +01:00
vladest	8723b317c9	Move Keyboard under input dialog makes sure it will no shift dialogs content	2018-03-06 13:09:08 +01:00
vladest	7b9d9fad59	Merge branch 'master' into assetbrowser_cosmetics	2018-03-06 11:37:18 +01:00
Zach Fox	35b23cc954	It's working!	2018-03-05 15:54:17 -08:00
John Conklin II	7bc3848c36	Merge pull request #12533 from druiz17/stereo-checkbox ... Adding Stereo checkbox in Audio settings	2018-03-05 12:45:01 -08:00
Brad Davis	8bfc610cfb	Merge remote-tracking branch 'upstream/master' into android	2018-03-05 11:48:58 -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
vladest	43e7f282ec	cleanup	2018-03-04 20:44:46 +01:00
vladest	c2c7962f66	return styling. set implicit sizes	2018-03-04 19:49:47 +01:00
vladest	9f151566bf	temporarily remove styling	2018-03-04 18:46:27 +01:00
vladest	1d43ca48bd	remove wrap	2018-03-04 17:59:56 +01:00
vladest	12a70d57c2	Set Y pos for indicator explicetly	2018-03-04 17:24:52 +01:00
vladest	94e070eae2	Try to fix incorrectly visible scrollbars on Mac	2018-03-04 15:14:49 +01:00
vladest	148faa3a93	Merge branch 'master' into move_to_qqc2	2018-03-04 14:16:21 +01:00
vladest	2a9bbfa808	Wrap text in query dialogs. Add right margins for input field and buttons	2018-03-04 13:19:56 +01:00
NissimHadar	8536b44c61	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-02 16:09:06 -08:00
Zach Fox	f53aba2a32	Initial progress	2018-03-02 15:53:06 -08:00
John Conklin II	8f403ebc23	Merge pull request #12543 from zfox23/improveFontLoading ... Improve font loading via QRC instead of file path	2018-03-02 14:22:17 -08:00
Dante Ruiz	7ce13a3ce7	adding comment	2018-03-02 11:06:28 -08:00
Dante Ruiz	55d8cfd4c1	make sure dont make audio devices that don't use stereo use stereo	2018-03-02 10:56:44 -08:00
NissimHadar	000b08f7c0	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-02 08:07:01 -08:00
Sam Gateau	88ecfe7895	Merge pull request #12464 from jherico/android_dev ... Android Master	2018-03-01 17:22:34 -08:00
NissimHadar	0f2cf8ea85	Re-implemented shadow controls.	2018-03-01 14:24:20 -08:00
Dante Ruiz	4b572eda6b	changing Name	2018-03-01 11:05:40 -08:00
Dante Ruiz	8cae20f53d	adding stereo checkbox to audio settings	2018-03-01 11:03:18 -08:00
Zach Fox	877fa52034	Merge branch 'master' of github.com:highfidelity/hifi into improveFontLoading	2018-03-01 10:14:23 -08:00
John Conklin II	1e1836c009	Merge pull request #12502 from elisa-lj11/2dimages-update ... Image entity has correct orientation and is collisionless	2018-03-01 09:57:08 -08:00
Dante Ruiz	95e14446dd	update qml file to show the current OpenVr headset	2018-03-01 09:03:52 -08:00
vladest	8dd27a1a04	Merge branch 'master' into move_to_qqc2	2018-03-01 11:20:11 +01:00
vladest	02612e0465	cleanup and fits text to buttons	2018-03-01 11:18:18 +01:00
vladest	f51025061c	Make Edit view more consistant with original one #2	2018-03-01 11:03:56 +01:00
vladest	7cbdbe9ab0	Make Edit view more consistant with original one	2018-03-01 11:02:05 +01:00
Zach Fox	67034274fa	Improve font loading by using QRC instead of relative paths	2018-02-28 17:59:37 -08:00
Cristian Luis Duarte	9acb83632c	Android - Make joystick move up when showing the bottom bar	2018-02-28 18:52:13 -03:00
Cristian Luis Duarte	55d52f92df	Android - Make Joystick appear always when possible (not in radar mode and when not hidden by some windows)	2018-02-28 15:55:50 -03:00
samcake	9e5ed7b905	Add more timing stats in explanded mode	2018-02-28 10:48:35 -08:00
vladest	531c4dc41d	Merge branch 'master' into move_to_qqc2	2018-02-28 11:40:46 +01:00
Brad Davis	136ced98c3	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
Howard Stearns	1fb0f898b4	Merge pull request #12505 from howard-stearns/wallet-help ... new wallet help	2018-02-27 13:18:36 -08:00
Howard Stearns	0e4f3460b3	Merge pull request #12497 from howard-stearns/end-seeding ... End seeding	2018-02-27 13:18:13 -08:00
howard-stearns	30896c264b	reduced text	2018-02-27 12:04:41 -08:00
howard-stearns	53b976b400	fix typo in bank href	2018-02-27 11:46:06 -08:00
SamGondelman	0fca56eef0	Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" ... This reverts commit 3201d2ba21, reversing changes made to c0f20900a0.	2018-02-27 11:33:05 -08:00
howard-stearns	053640f216	a guess a linking bank	2018-02-27 08:36:45 -08:00
howard-stearns	ce0ae61947	Merge branch 'master' of https://github.com/highfidelity/hifi into wallet-help	2018-02-27 08:10:17 -08:00
vladest	90b891dbc3	Fix push issue due to merge errors	2018-02-27 16:42:30 +01:00
vladest	b7f146fd47	Fix clipping issues in scrolling window	2018-02-27 16:27:08 +01:00
vladest	6a5fe0d513	Merge branch 'master' into move_to_qqc2	2018-02-27 15:23:52 +01:00
Clément Brisset	2a7a71db13	Merge pull request #12477 from Atlante45/new-master ... Merge stable back into master	2018-02-26 17:18:24 -08:00
howard-stearns	eb683d4793	mail is a link	2018-02-26 17:09:33 -08:00
howard-stearns	2f6e2f6b84	new wallet help	2018-02-26 16:52:41 -08:00
Elisa Lupin-Jimenez	b56c78d36c	image has correct orientation and is collisionless	2018-02-26 14:44:46 -08:00
Zach Fox	0802bd2c21	Fix going to marketplace main page from WalletChoice	2018-02-26 14:27:59 -08:00
Brad Davis	b9387f2a21	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-26 13:18:14 -08:00
Zach Fox	8223ebf393	Correctly handle referrer from WalletChoice	2018-02-26 12:44:41 -08:00
howard-stearns	4e4aebc7ee	get WalletChoice setup flow from My Purchases and confirmation. Still ... not correct referrer.	2018-02-26 12:02:56 -08:00
John Conklin II	4feea929ce	Merge pull request #12449 from misslivirose/fix/atp-collisions ... change default add to world shape for asset browser	2018-02-26 11:15:01 -08:00
howard-stearns	2de72c125d	Merge branch 'master' of github.com:highfidelity/hifi into end-seeding	2018-02-26 10:54:22 -08:00
John Conklin II	e586a35d38	Merge pull request #12489 from vladest/fix_table_sort_indicator ... Make sure sort indicator is attached to the right of title	2018-02-26 10:33:27 -08:00
howard-stearns	a5cedde3c8	Merge branch 'master' of github.com:highfidelity/hifi into end-seeding	2018-02-26 10:33:03 -08:00
John Conklin II	3201d2ba21	Merge pull request #12407 from NissimHadar/shadowControlsOffZvork ... Shadow control for zones, models and shapes	2018-02-26 10:13:40 -08:00
howard-stearns	30a6cca4b3	Merge branch 'master' of github.com:highfidelity/hifi into end-seeding	2018-02-26 09:26:09 -08:00
howard-stearns	dee3df5299	remove debugging	2018-02-25 15:26:18 -08:00
howard-stearns	300f611c47	working, with soft reset	2018-02-25 14:06:06 -08:00
vladest	931696322f	Fixed stucked mouse pointer in QQC2 toolbar mode	2018-02-25 08:58:05 +01:00
vladest	62f2ba0dad	More intellectual calculation of title positions taking in account actual sort indicator glyph size	2018-02-24 09:32:08 +01:00
vladest	b1070f85f0	Merge branch 'master' into move_to_qqc2	2018-02-24 02:59:40 +01:00
howard-stearns	726c1ed816	receiveAt with new key	2018-02-23 17:05:46 -08:00
Zach Fox	fe515e949b	New UI for new HFC users	2018-02-23 16:36:20 -08:00
Zach Fox	cc98eb6424	Fix lightbox stuck	2018-02-23 16:14:42 -08:00
howard-stearns	f66e688f41	Merge branch 'master' of github.com:highfidelity/hifi into end-seeding	2018-02-23 16:12:41 -08:00
howard-stearns	53614a1d9f	almost working	2018-02-23 16:12:01 -08:00
Zach Fox	47b25740de	Update commerceLightBox	2018-02-23 15:23:51 -08:00
howard-stearns	34253082d4	always reset when asked	2018-02-23 15:11:08 -08:00
Zach Fox	432e647f7a	Fix 'What's This' link	2018-02-23 15:08:33 -08:00
howard-stearns	3c2626894c	fixes	2018-02-23 14:54:03 -08:00
howard-stearns	050df2ac2a	merge	2018-02-23 14:46:13 -08:00
Zach Fox	9b54ab1080	UI changes, V1	2018-02-23 14:42:05 -08:00
howard-stearns	09091d29f7	more logic framework	2018-02-23 14:35:30 -08:00
howard-stearns	84f9bff330	basic element, but not pretty and not functioning	2018-02-23 13:56:56 -08:00
Brad Davis	0550138609	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
Alexander Ivash	f9de255fa7	FB12523 - HMD: Commerce specific disabled preview is not dismissed when user leaves page without entering credentials	2018-02-23 20:07:09 +03:00
vladest	b8102cfbd7	Make sure sort indicator is attached to the right of title	2018-02-23 10:06:16 +01:00
Bradley Austin Davis	12d1885dff	Merge pull request #12428 from gcalero/android_ui_fixes ... Android ui fixes	2018-02-22 18:28:18 -08:00
Brad Davis	aeb29db37d	Merge remote-tracking branch 'upstream/stable' into android_stable	2018-02-22 17:35:00 -08:00
Zach Fox	249f0568a1	New loader	2018-02-22 17:14:23 -08:00
howard-stearns	1aaae94cc1	checkpoint	2018-02-22 17:04:27 -08:00
Zach Fox	e3ccfc9935	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_apps	2018-02-22 16:39:26 -08:00
Zach Fox	f14673bc50	Fixup Checkout for apps	2018-02-22 16:38:38 -08:00
Zach Fox	33f73fef0d	YAY!	2018-02-22 16:26:35 -08:00
Zach Fox	10fa3fa346	It's working!	2018-02-22 16:09:01 -08:00
John Conklin II	730dce31e3	Merge pull request #12444 from zfox23/commerce_extendedCerts_1 ... Commerce: Extended Certificate Support, V1	2018-02-22 15:19:57 -08:00
Atlante45	7bad82818b	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2018-02-22 14:45:41 -08:00
Zach Fox	de0eee52d6	cool	2018-02-22 14:45:32 -08:00
Zach Fox	4d2d7fa51f	lots of fun initial progress!	2018-02-22 13:56:46 -08:00
NissimHadar	c6580f642a	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork	2018-02-22 13:45:00 -08:00
Zach Fox	3d4e6de6ab	Quick bugfix	2018-02-22 10:49:11 -08:00
Liv	478ec48b63	Merge pull request #12463 from misslivirose/fix/edit-bugs ... Fix two bugs with Create Menu	2018-02-22 09:43:50 -08:00
Zach Fox	90f05f4db7	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-22 09:23:49 -08:00
vladest	7d7c3bb1f5	Change new material dialog to QQC2	2018-02-22 10:30:42 +01:00
Liv Erickson	aba1cae36d	get rid of magic number	2018-02-21 16:19:50 -08:00
Liv Erickson	990e848de6	fix typo that was breaking popup dialog	2018-02-21 15:54:00 -08:00
Liv Erickson	68f0c0391a	Initial fix - need a little style fixing	2018-02-21 15:44:23 -08:00
Gabriel Calero	2d4bb3bad3	Change color to QML debug info	2018-02-21 20:23:54 -03:00
Gabriel Calero	f2ce3d0268	Fix focus hack. Add QML debug info	2018-02-21 20:10:03 -03:00
Nissim Hadar	b519ebd6f1	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork	2018-02-21 12:36:56 -08:00
Zach Fox	74655bde49	Fix skeletonmodelURLchanged signal	2018-02-21 12:12:20 -08:00
Cristian Luis Duarte	6411d1b35b	Android - Avoid overlapping between hint and input in Go To by clearing text when closing the window	2018-02-21 16:52:57 -03:00
Zach Fox	b548567f5a	Apps protection	2018-02-21 11:17:47 -08:00
Zach Fox	1fbc16aae2	Fix noPermissionGlyph margin	2018-02-21 10:52:17 -08:00
SamGondelman	4dde178b93	fix new material UI	2018-02-21 10:33:15 -08:00
Seth Alves	220d9abbfc	Merge pull request #12435 from vladest/fix_flickable_tablethome ... Make sure Flickable for GridView for TabletHome will not flick	2018-02-21 09:21:45 -08:00
vladest	05fab77189	Merge branch 'master' into move_to_qqc2	2018-02-21 11:57:19 +01:00
Nissim Hadar	af484d0af6	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork	2018-02-20 23:48:12 -08:00
Nissim Hadar	6f84e4c977	Moved shadows and ambient occlusion to menu checkboxes.	2018-02-20 23:45:07 -08:00
Liv Erickson	5cd184ddc3	change default add to world shape for asset browser	2018-02-20 17:55:30 -08:00
Cristian Luis Duarte	00958965bc	Android- Center login dialog in both big (Pixel XL, Huawei Mate 9 Pro) and smaller screens (Pixel)	2018-02-20 19:25:41 -03:00
Zach Fox	f08c66e3ac	Remove debug code	2018-02-20 14:16:55 -08:00
Zach Fox	fd6f4b569f	Fix active focus issue	2018-02-20 13:19:31 -08:00
Zach Fox	eb29bdf5d2	Don't allow tabs or newlines	2018-02-20 13:06:10 -08:00
Zach Fox	2daa30f125	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-20 12:41:12 -08:00
Zach Fox	9bde9f5a4f	Fix height of Optional Message in Send Money	2018-02-20 12:36:11 -08:00
Gabriel Calero	5e3ad3fe9a	Disable VPAD on bottom bar tapping and modes bar tapping	2018-02-20 17:20:48 -03:00
Zach Fox	11f897beb0	Initial app support	2018-02-20 10:39:36 -08:00
John Conklin II	aa67a98d02	Merge pull request #12426 from ElderOrb/FB11508 ... fix for toolbar slowly drifting on switching between HMD/Desktop modes	2018-02-20 09:30:01 -08:00
Gabriel Calero	4839a8c720	Remove Forgot labels in login dialog	2018-02-20 12:59:06 -03:00
vladest	c320761900	Merge branch 'master' into move_to_qqc2	2018-02-20 06:01:59 +01:00
Gabriel Calero	94a8aad712	Avoid keyboard appearing on startup	2018-02-19 16:52:51 -03:00
Sam Gateau	fd49c0d100	Merge pull request #12401 from SamGondelman/decals ... Material Entities	2018-02-19 10:58:02 -08:00
vladest	e5f953c103	Make sure Flickable for GridView for TabletHome will not flick	2018-02-17 16:52:32 +01:00
Cristian Luis Duarte	5f1fc37684	Android - Support display with smaller resolution than 1440p for Go To window	2018-02-16 18:29:22 -03:00
Alexander Ivash	2eb8ebcdbc	FB11508 - toolbar slowly sides downward	2018-02-16 20:22:16 +03:00
Zach Fox	c4e9c76258	Small UIT tweaks	2018-02-15 16:03:49 -08:00
Dante Ruiz	a194c8bc03	Merge branch 'master' of github.com:highfidelity/hifi into fix-qml-tablet-apps	2018-02-15 15:46:16 -08:00
Zach Fox	811ecf9db8	Fix	2018-02-15 14:44:33 -08:00
Zach Fox	8072372822	Lots of changes	2018-02-15 13:27:13 -08:00
vladest	a500ba8f2d	Merge branch 'master' into move_to_qqc2	2018-02-15 20:42:17 +01:00
Zach Fox	b8fb08dc74	Avatar support	2018-02-15 11:24:22 -08:00
Zach Fox	3c620282b1	Merge pull request #12393 from zfox23/fixAvailabilityMouseArea ... PAL: Prevent opening of Availability from WebView	2018-02-15 11:10:05 -08:00
Sam Gondelman	15cdfef16a	Merge branch 'master' into decals	2018-02-14 17:33:01 -08:00
SamGondelman	324eefc914	remove fresnel, add unlit, fix overlays, cleanup	2018-02-14 17:02:07 -08:00
Zach Fox	5a8b8d4ac8	Lots of changes	2018-02-14 16:44:02 -08:00
Seth Alves	93d8a6f00d	Merge pull request #12402 from druiz17/fix-tablet-create-rotation ... Fix tablet rotation when going into and out of create mode	2018-02-14 16:10:10 -08:00
Alexander Ivash	611c67bf2f	FB12297 - HMD: Disabled preview mode only occurs during step 2 of the wallet setup wizard	2018-02-15 02:00:51 +03:00
Cristian Luis Duarte	674af54a82	Android - Scale up Sign In and Sign Up windows.	2018-02-14 17:02:03 -03:00
vladest	d71448d217	Merge branch 'master' into move_to_qqc2	2018-02-14 20:47:37 +01:00
John Conklin II	6187731fdc	Merge pull request #12291 from 1P-Cusack/FogBugz/Case_10865 ... [Case 10865] Make Asset Browser multi-select work with Ctrl/Cmd/Shift+Click	2018-02-14 11:14:26 -08:00
Zach Fox	0fca843667	Integrate 'alreadyOwned' endpoint	2018-02-14 10:24:34 -08:00
Dante Ruiz	2a8101a944	Merge branch 'master' of github.com:highfidelity/hifi	2018-02-14 09:35:53 -08:00
Zach Fox	2f0c9e1acb	Merge pull request #12394 from zfox23/commerce_fixRecentActivityWrap ... Commerce: Fix wrap mode for very long P2P memos	2018-02-14 09:14:21 -08:00
Zach Fox	a477a3da70	Done with My Purchases flow for now	2018-02-13 15:04:31 -08:00
Dante Ruiz	119a7554ee	Prevent add the same tablet url app to the tabletApps list	2018-02-13 14:33:15 -08:00
SamGondelman	4500ed17e7	merge from master	2018-02-13 13:58:39 -08:00
Zach Fox	ae8a8a48eb	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-13 13:55:32 -08:00
Zach Fox	3e41229e8c	Commerce: Fix wrap mode for very long P2P memos	2018-02-13 13:30:17 -08:00
Zach Fox	8cd00c49d6	PAL: Prevent opening of Availability from WebView	2018-02-13 13:21:40 -08:00
vladest	e8959b4cc0	Merge branch 'master' into move_to_qqc2	2018-02-13 22:01:16 +01:00
Elisa Lupin-Jimenez	a61021f46c	Merge pull request #12272 from elisa-lj11/2d-images ... 2d images (JPG and PNG) are now supported as (quasi) entities	2018-02-13 11:44:02 -08:00
Zach Fox	0809210dc3	No permission card	2018-02-13 11:16:48 -08:00
Dante Ruiz	cf3d8e4463	remove cached file	2018-02-13 11:07:15 -08:00
Zach Fox	95e9eb8e4a	Lots of progress	2018-02-12 17:06:57 -08:00
Zach Fox	ffea8104fc	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-09 15:59:38 -08:00
Zach Fox	abdd50fb45	it's a start	2018-02-09 15:56:28 -08:00
John Conklin II	88094cae87	Merge pull request #12363 from zfox23/commerce_inspectionCertRedesign_v2 ... Commerce: Inspection Certificate Redesign (Fixed!)	2018-02-09 15:51:46 -08:00
Cristian Luis Duarte	017f99837a	Android - Sign in, Sign up and Sign out. Note: It's still desktop scaled, being some components small for a phone	2018-02-09 17:32:13 -03:00
Cristian Luis Duarte	8c1a1eba02	Android - Fix modes bar layout when expanded	2018-02-09 17:32:13 -03:00
Cristian Luis Duarte	bb4f57f982	Android - Avatar selection window accessible from the bottom bar. Only hardcoded avatars, no marketplace.	2018-02-09 17:32:12 -03:00
Gabriel Calero	d5e101c2e8	Add mode selector (my view / radar), not finished	2018-02-09 17:32:12 -03:00
Gabriel Calero	8093ed7c5c	Add audio bar to mute/unmute the mic	2018-02-09 17:32:12 -03:00
Gabriel Calero	a7c77a5247	Fix undefined color in address bar	2018-02-09 17:32:12 -03:00
Gabriel Calero	0f07d0b493	Add bottom bar and address dialog (Android)	2018-02-09 17:32:12 -03:00
SamGondelman	84cd0e1529	wip live material swapping on model entities, model overlays, avatars, ... and albedo swap on shape entities	2018-02-09 12:00:08 -08:00
Zach Fox	ecc0a2f43b	Bugfix.	2018-02-08 10:41:22 -08:00
Zach Fox	679d53e2cf	This works, but is it correct?	2018-02-08 10:41:10 -08:00
Zach Fox	3a7e626463	Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign ... Commerce: Inspection Certificate Redesign	2018-02-08 10:41:04 -08:00
Zach Fox	a92e614aff	Bugfix.	2018-02-08 10:35:34 -08:00
Zach Fox	e01e88d4ae	This works, but is it correct?	2018-02-07 15:13:22 -08:00
Zach Fox	2270dcd79d	Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign ... Commerce: Inspection Certificate Redesign	2018-02-07 13:52:20 -08:00
Zach Fox	3c34d13ec6	Revert "Commerce: Inspection Certificate Redesign"	2018-02-07 13:22:09 -08:00
Zach Fox	a40244b5d2	Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign ... Commerce: Inspection Certificate Redesign	2018-02-07 10:19:30 -08:00
David Back	26a56f0173	Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials	2018-02-06 16:12:30 -08:00
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
Elisa Lupin-Jimenez	e2bf8ad231	reverted to S3 for model URL	2018-02-02 15:36:28 -08:00
Zach Fox	2a0d85a119	Merge pull request #12315 from zfox23/commerce_SendMoneyNearbyParticle ... Commerce: Send Money Nearby particle effect!	2018-02-02 14:17:48 -08:00
Elisa Lupin-Jimenez	d20ff0955c	qml doesn't work, .js might not work on osx	2018-02-02 11:26:21 -08:00
Zach Fox	f26477b3e1	Slight wording change to Optional Message placeholder	2018-02-02 11:00:32 -08:00
Zach Fox	19235b8d94	Fix a bug where hover events incorrectly propagate under popups	2018-02-02 10:50:35 -08:00
Elisa Lupin-Jimenez	73fde4333e	new local reference to image model	2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez	d7a847930d	added image icon	2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez	f71d9e4d6a	snapshot referenced locally, won't work on OS	2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez	cc4bafb46f	image entities shown as images in entity list	2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez	9f8e2017ce	can add image directly from asset server	2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez	2ff47fa454	images auto-add to asset server, started asset browser add link	2018-02-02 10:27:42 -08:00
Elisa Lupin-Jimenez	d390e20139	removed extraneous commenting and image class	2018-02-02 10:27:42 -08:00
Elisa Lupin-Jimenez	fdca8ab93e	added image button to edit.js, working on connecting to cpp	2018-02-02 10:08:39 -08:00
Zach Fox	dd2b7eb107	Send Money Effect & Lightbox	2018-02-01 15:17:50 -08:00
Zach Fox	fa69ea0352	Small comment addition	2018-02-01 13:57:05 -08:00
Zach Fox	ce79504f03	Fix checkbox	2018-02-01 11:51:08 -08:00
Zach Fox	268c12e47a	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_SendMoneyNearbyParticle	2018-02-01 11:38:47 -08:00
Zach Fox	bd26c9dfc0	More improvements	2018-02-01 09:36:41 -08:00
Zach Fox	14051bce0c	This logic is insane	2018-01-31 17:20:20 -08:00
Zach Fox	fb5308e517	This logic is insane	2018-01-31 17:06:29 -08:00
Zach Fox	ab3a91a1da	Oooooh it's so pretty	2018-01-31 16:53:23 -08:00
Zach Fox	7879fb293f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign	2018-01-31 13:19:39 -08:00
vladest	1c63bcf02e	Merge branch 'master' into move_to_qqc2	2018-01-31 22:13:52 +01:00
Zach Fox	90c2371f0c	It's working!	2018-01-31 12:09:23 -08:00
Seth Alves	50e6864988	Merge pull request #12138 from Triplelexx/21669_prompt_keyboard ... WL#21669: Allow better keyboard navigation of prompt windows such as Window.prompt()	2018-01-31 11:19:49 -08:00
Zach Fox	8a729e3cf0	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_SendMoneyNearbyParticle	2018-01-31 10:54:32 -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
Zach Fox	05fe33e417	Initial work	2018-01-30 18:01:46 -08:00
Atlante45	bc819c698e	Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back	2018-01-30 16:09:30 -08:00
Zach Fox	d13d0e6ba2	Minor fixes	2018-01-30 14:30:50 -08:00
LaShonda Hopper	70e23f3ce8	[Case 10865] Bringing in multi-select fix from Desktop AssetServer. ... Changes Committed: modified: interface/resources/qml/hifi/dialogs/TabletAssetServer.qml	2018-01-30 14:44:34 -05:00
LaShonda Hopper	dfdf28f37e	[Case 10865] Some cleanup for multi-selection (details below). ... * Remove setCurrentIndex call when looping over current selection. * Changed selectedItems var name to selectedItemCount to clarify what it represents. * Change path arg name to paths to clarify that there can be more than a single path contained within it. Changes Committed: modified: interface/resources/qml/hifi/AssetServer.qml	2018-01-30 14:44:34 -05:00
LaShonda Hopper	5a771e3a16	[Case 10865] Ctrl/Cmd/Shift+Click Multi-Select for Asset Browser. ... * Removes manual selectionModel update from controls-uit/Tree.qml * This was interfering with the Key+Click functionality. It was introduced via Commit 99617600c4 to address a selection issue; however, it's unclear what that issue was. Selection within the Asset Browser works without it at present. * Amends the ContextMenu within the AssetBrowser to work in conjunction with the multi-selection changes. * ContextMenu will _only_ display when triggered within the current selection be it one or more items as opposed to previous behavior of selecting the item the menu was triggered on. * CopyURL is only enabled when the selection size is 1 * Rename is only enabled when the selection size is 1 * Delete is enabled when the selection size is greater than 0 Changes Committed: modified: interface/resources/qml/controls-uit/Tree.qml modified: interface/resources/qml/hifi/AssetServer.qml	2018-01-30 14:44:34 -05:00
Gabriel Calero	999e3a39fa	Add mode selector (my view / radar), not finished	2018-01-30 14:48:37 -03:00
Gabriel Calero	7fb28f4296	Add audio bar to mute/unmute the mic	2018-01-30 14:48:37 -03:00
Gabriel Calero	7e874510e3	Fix undefined color in address bar	2018-01-30 14:48:37 -03:00
Gabriel Calero	07a542e35d	Add bottom bar and address dialog (Android)	2018-01-30 14:48:37 -03:00
Zach Fox	b60a45d358	Inspection Certificate Redesign	2018-01-29 15:14:29 -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
Zach Fox	f117dd33a8	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixSortingAgain	2018-01-25 15:04:28 -08:00
Dante Ruiz	07842f8e54	Merge branch 'master' of github.com:highfidelity/hifi into fix-multihighlight	2018-01-25 13:30:45 -08:00
Zach Fox	afc71a5ac5	Fix Purchases sorting (again); Fix (i) icon loading	2018-01-25 12:17:34 -08:00
Andrew Meadows	289356dfe7	Merge pull request #12227 from ZappoMan/sendDataDescription ... some settings cleanup	2018-01-25 11:30:14 -08:00
ZappoMan	cb01bd14b9	Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescription	2018-01-25 10:39:43 -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
Zach Fox	94e1c425ab	Fix MacOS Security Pic visibility; fix incorrect button state when changing pic	2018-01-24 17:03:16 -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
Zach Fox	6f54921cb1	Merge pull request #12236 from zfox23/commerce_fixSecurityImageSelectionClear ... Fix security image index clear after back nav	2018-01-24 13:43:49 -08:00
Zach Fox	6566c5c5e6	Merge pull request #12238 from zfox23/commerce_fixPurchasesFilter ... Fix the text filter in My Purchases	2018-01-24 08:42:55 -08:00
luiscuenca	29dd24b05f	Fix GoTo app in HMD mode	2018-01-23 15:50:32 -07:00
Zach Fox	1920bedaf3	Fix the text filter in My Purchases	2018-01-23 13:42:38 -08:00
luiscuenca	fddbf13796	Fix Asset Browser access from Create	2018-01-23 11:12:22 -07:00
Zach Fox	86ce9766f3	Fix security image index clear after back nav	2018-01-23 10:11:23 -08:00
Brad Davis	8ae0b09ea2	Merge remote-tracking branch 'upstream/master' into android	2018-01-22 15:07:30 -08:00
vladest	9fa6b8da6a	Merge branch 'master' into move_to_qqc2	2018-01-22 21:45:34 +01:00
vladest	b947504849	Merge conflicts	2018-01-22 21:42:32 +01:00
John Conklin II	8d028d4bd4	Merge pull request #12220 from RebeccaStankus/API-Debugger-UI ... Updated UI to fit Toolkit Standards	2018-01-22 10:30:48 -08:00
John Conklin II	8b461b960f	Merge pull request #12223 from zfox23/commerce_sendMoney2 ... Commerce: Pixel-perfect "Send Money" UI	2018-01-22 09:39:23 -08:00
ZappoMan	4ad5d34a10	more preferences cleanup, removing some dead code from ScriptEngines/ScriptModel	2018-01-20 17:20:42 -08:00
Zach Fox	1dde640a40	-_-	2018-01-19 16:06:01 -08:00
Zach Fox	89e403d438	Balance text in send money	2018-01-19 15:39:57 -08:00
RebeccaStankus	5db5f24043	Updated UI to fit Toolkit Standards	2018-01-19 14:52:44 -08:00
Zach Fox	4d408a8df5	Nearby UI	2018-01-19 14:49:28 -08:00
vladest	e7a035f954	Fix indent	2018-01-19 23:01:41 +01:00
vladest	c235deb6f0	Merge branch 'master' into move_to_qqc2	2018-01-19 23:01:04 +01:00
Triplelexx	4c27538fa2	change file dialog keyboard navigation ... Allowed navigating with keyboard to home and up buttons in file dialog.	2018-01-19 12:30:00 +00:00
Triplelexx	f1147948cb	add focused color to GlyphButton	2018-01-19 12:28:27 +00:00
Triplelexx	44740d5716	add sound on button focus changed ... Feels more consistent with hovering	2018-01-19 12:27:49 +00:00
Triplelexx	e69fdba6ad	add padding to sorting glyph ... the file dialog sorting glyphs are clipping on the right margin for me, adding 10 extra pixels fixes it	2018-01-19 12:18:29 +00:00
Zach Fox	495c4f56e2	Only small tweaks remaining?	2018-01-18 17:51:08 -08:00
Triplelexx	faf18fcaa8	improve file dialog navigation	2018-01-19 01:49:24 +00:00
Zach Fox	6b5389a167	go go go go go	2018-01-18 17:37:26 -08:00
Brad Davis	bdfa1273ba	Merge remote-tracking branch 'upstream/master' into android	2018-01-18 17:33:10 -08:00
Zach Fox	c6429f4f33	Path towards pixel perfection	2018-01-18 17:05:36 -08:00
David Kelly	2e4fc5e58c	Merge pull request #12207 from davidkelly/dk/placesInHfcTransferHistory ... nearby hfc transfers should send the location	2018-01-18 16:46:34 -08:00
David Kelly	844ec6a863	eliminate dash in history, replace with 0 HFC	2018-01-18 16:02:40 -08:00
Clément Brisset	37504eca15	Merge pull request #12186 from ctrlaltdavid/21702 ... Add Window.protocolSignature() as a replacement for location.protocolVersion()	2018-01-18 15:20:03 -08:00
Brad Hefta-Gaub	77837e2cf0	Merge pull request #12194 from misslivirose/feat/exp-gif ... change ImageOverlay to use AnimatedImage instead of Image	2018-01-18 14:57:39 -08:00
David Rowe	13bbd1fcbf	Update places feed to use new function	2018-01-19 10:10:33 +13:00
Triplelexx	cede8ed597	add focused color ... keyboard navigation uses focusedColor	2018-01-18 19:56:55 +00:00
Brad Davis	cbb2d9d854	Merge remote-tracking branch 'upstream/master' into android	2018-01-17 17:51:39 -08:00
David Back	d4db63f8f8	Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials	2018-01-17 17:02:29 -08:00
Zach Fox	5ce768f402	Merge pull request #12151 from zfox23/commerce_sendMoney1 ... Commerce: P2P Transfer Iteration 1	2018-01-17 16:41:56 -08:00
Liv Erickson	88ba5e5a00	change ImageOverlay to use AnimatedImage instead of Image to support .gif files in image overlay objects	2018-01-17 13:45:56 -08:00
Seth Alves	8edded7059	Merge pull request #12164 from ctrlaltdavid/21695 ... Remove old ToolWindow code	2018-01-17 13:43:59 -08:00
Zach Fox	1d747bc0e4	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-17 11:56:00 -08:00
Brad Davis	6a06bf405a	Merge remote-tracking branch 'upstream/master' into android	2018-01-16 18:24:44 -08:00
Zach Fox	8cc427a374	Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1	2018-01-16 15:07:53 -08:00
Zach Fox	8cc5a0a7cb	Add UserInfoViewer	2018-01-16 15:06:51 -08:00
David Kelly	a9fc63da4c	fix error when pending	2018-01-16 15:04:05 -08:00
Zach Fox	d64b35729f	Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1	2018-01-16 13:44:29 -08:00
vladest	b3b7a7636f	Merge branch 'master' into move_to_qqc2	2018-01-16 21:08:49 +01:00
David Kelly	d8f8f9ff1a	First cut at alan's new design	2018-01-16 11:19:10 -08:00
Clément Brisset	1949471dad	Merge pull request #12182 from highfidelity/stable ... Merge stable (RC62) to master	2018-01-16 11:01:07 -08:00
Zach Fox	6b90ceaeb4	Quick bugfix and code change for clarity	2018-01-16 10:40:51 -08: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	f7ed8c10fa	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-15 10:13:07 -08:00
Brad Davis	bee869d88e	Merge remote-tracking branch 'upstream/master' into android	2018-01-14 13:53:47 -08:00
Zach Fox	bd3474de68	Merge pull request #12166 from zfox23/fixSnapshotSocialSharing ... Fix social media sharing buttons on Snapshot app	2018-01-12 15:52:56 -08:00
Zach Fox	e627925bd3	Fix 'Browse Avatars' button from Avatar Settings	2018-01-12 15:14:42 -08:00
Zach Fox	522007af9d	Fix social media sharing buttons on Snapshot app	2018-01-12 14:58:14 -08:00
David Kelly	579a4d85b3	Merge branch 'commerce_sendMoney1' of https://github.com/zfox23/hifi into dk/senderAndRecipientInTxnHistory	2018-01-12 14:37:46 -07:00
Zach Fox	6920e57613	Fix 'Browse Avatars' button from Avatar Settings	2018-01-12 13:31:58 -08:00
David Rowe	1fa31d3c10	Remove old ToolWindow code	2018-01-13 10:27:43 +13:00
Zach Fox	b7f4fe2ba3	Merge pull request #12149 from howard-stearns/do-not-delete-wallet-file ... Do not delete wallet file	2018-01-12 09:44:40 -08:00
Brad Davis	7579451c24	Merge remote-tracking branch 'upstream/master' into android	2018-01-11 23:31:45 -08:00
David Back	5d96559579	Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials	2018-01-11 17:01:00 -08:00
Zach Fox	c216144015	Remove unnecessary comments	2018-01-11 16:21:59 -08:00
Zach Fox	464bbe5d43	Bugfixes, refactoring, and improvements	2018-01-11 15:26:51 -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
Zach Fox	1e608b13b2	Show username when admin (this probably isn't the way to get username	2018-01-11 14:45:43 -08:00
John Conklin II	96babdf2e2	Merge pull request #12135 from luiscuenca/palVolumeSlider ... RC62 Pal volume slider fix	2018-01-11 13:36:03 -08:00
vladest	cff80e86b6	Temporarily disable magnification until further notice	2018-01-11 22:18:22 +01:00
vladest	45144bece6	Fix Properties does not fit in Create tab	2018-01-11 22:05:11 +01:00
Zach Fox	df58065e75	Silly bug	2018-01-11 13:02:00 -08:00
vladest	d8d12e362f	Merge branch 'master' into move_to_qqc2	2018-01-11 21:55:08 +01:00
Zach Fox	d25ef074e1	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-11 12:35:18 -08:00
howard-stearns	c39771d995	do not delete wallet file when things go wrong, and remove obsolete ... reset machinery	2018-01-11 11:50:23 -08:00
Zach Fox	d577b2e9e8	Actually add the API calls	2018-01-11 11:45:43 -08:00
luiscuenca	54a1da8d73	Only mod my card	2018-01-11 11:55:28 -07: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
vladest	b5f3631c21	Merge branch 'master' into move_to_qqc2	2018-01-11 18:54:40 +01: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
Seth Alves	457fcd6f40	Merge pull request #12129 from SamGondelman/doubleClick ... Move key logic from onClicked to onReleased	2018-01-10 18:03:23 -08:00
Seth Alves	568c27d6e0	Merge pull request #12039 from luiscuenca/currentAPI ... Fix and improve currentAPI.js	2018-01-10 17:55:08 -08:00
Brad Davis	560fd38547	Merge remote-tracking branch 'upstream/master' into android	2018-01-10 17:31:50 -08:00
MiladNazeri	c77d2f4e58	Merge pull request #12121 from cain-kilgore/21667 ... WL 21667 - Window.browseDir() dialog doesn't let user use Esc to cancel	2018-01-10 17:11:54 -08:00
Zach Fox	939012a2d0	Hook up the endpoints!	2018-01-10 17:10:05 -08:00
Zach Fox	0d137d62c8	HMD tweaks	2018-01-10 16:37:47 -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
Zach Fox	b3e3af4ee7	Add character count :)	2018-01-10 16:23:29 -08:00
Zach Fox	260aee42a8	Improvements	2018-01-10 16:18:34 -08:00
Anthony J. Thibault	d5e3b97c93	Fix for black screen when clicking Settings from Snap app	2018-01-10 16:03:53 -08:00
Zach Fox	c15b1669b1	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-10 15:53:23 -08:00
Zach Fox	93b15c0aa6	Payment Failure	2018-01-10 15:53:13 -08:00
Zach Fox	6812010660	The skeleton is there	2018-01-10 15:33:18 -08:00
Zach Fox	22631065e4	Serious flow state	2018-01-10 15:09:15 -08:00
Triplelexx	24f1fc3546	fix Ui keyboard navigation ... various fixes to allow some support for keyboard navigation in message boxes and dialogs	2018-01-10 22:30:43 +00:00
Brad Davis	2c35242af1	Merge remote-tracking branch 'upstream/master' into android_nov	2018-01-10 13:40:12 -08:00
Cain Kilgore	104ac0ffae	Indents, man	2018-01-10 20:30:41 +00:00
Zach Fox	c5a5bddbc9	More progress	2018-01-10 12:21:12 -08:00
vladest	04d45be0a9	Merge branch 'master' into move_to_qqc2	2018-01-10 21:21:03 +01:00
luiscuenca	e54f7d5a45	Fix Pal Master Volume overlap	2018-01-10 13:03:54 -07:00
Cain Kilgore	057c708637	Spaces instead of Tabs ... (Damnit VS Re-install!)	2018-01-10 19:24:52 +00:00
Zach Fox	e5abdc77d9	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-10 10:02:56 -08:00
Howard Stearns	fafc98f51c	Merge pull request #12098 from ElderOrb/FB11123 ... FB11123 Make the certificate GOLD (and change title to Proof of Prove…	2018-01-10 10:01:15 -08:00
Zach Fox	f366fdf695	Beginnings of nearby	2018-01-10 09:58:23 -08:00
Brad Davis	fb59a0a56f	Merge remote-tracking branch 'upstream/master' into android_nov	2018-01-09 20:02:55 -08:00
Brad Davis	105dffebaf	Fixing UI	2018-01-09 18:36:42 -08:00
SamGondelman	c46531296f	move key logic from onClicked to onReleased	2018-01-09 18:28:54 -08:00
Zach Fox	928e3d2ef7	Merge pull request #12108 from zfox23/commerce_pagination ... Commerce: Support pagination at History endpoint; improve Purchases scrolling	2018-01-09 15:57:34 -08:00
Zach Fox	5469025113	More more more	2018-01-09 15:53:25 -08:00
Zach Fox	530df5447d	Even more proress	2018-01-09 15:19:50 -08:00
SamGondelman	a42b0cf485	comment out logging	2018-01-09 14:58:23 -08:00
Zach Fox	40a3f8b31b	Progress	2018-01-09 14:13:36 -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
Zach Fox	a6259a5ef5	Initial progress	2018-01-09 13:39:28 -08:00
Brad Davis	d6dd29b952	Merge remote-tracking branch 'upstream/master' into android_nov	2018-01-09 11:43:03 -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
Cain Kilgore	4534419e53	Merge branch 'master' of https://github.com/highfidelity/hifi into 21667	2018-01-09 09:45:28 +00:00
Cain Kilgore	f78ee7c167	WL 21667 - Window.browseDir() dialog doesn't let user use Esc to cancel	2018-01-09 09:44:12 +00:00
Alexander Ivash	0f6b93eaea	FB11123 Make the certificate GOLD (and change title to Proof of Provenance License)	2018-01-09 03:13:31 +03:00
vladest	891663bae9	Page indicator visible only when pages more than one	2018-01-08 23:07:09 +01:00
Zach Fox	611f25d542	Improve scrolling thru My Purchases	2018-01-08 13:17:04 -08:00
Zach Fox	dcfceab078	Remove all work done on paginating purchases	2018-01-08 12:03:56 -08:00
Zach Fox	2231bf2bdd	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_pagination	2018-01-08 11:45:20 -08:00
Zach Fox	cdd62c7119	I don't think auto-refresh and pagination of inventory is possible	2018-01-08 11:29:41 -08:00
David Back	6083978e5e	Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials	2018-01-08 10:29:41 -08:00
Zach Fox	99510f522d	Merge pull request #12095 from ElderOrb/FB10621 ... FB10621 "HIFI-Commerce Login" page title change to "Log in to continue"	2018-01-08 10:05:53 -08:00
Bradley Austin Davis	68cd768a65	Merge branch 'android' into android_render_pr	2018-01-08 12:49:52 -05:00
Howard Stearns	724db93389	Merge pull request #12002 from howard-stearns/consistent-goToUser ... Consistent go to user	2018-01-07 11:07:39 -08:00
vladest	00b1d4b0ea	Merge branch 'master' into move_to_qqc2	2018-01-05 23:40:36 +01:00
David Back	4985c9db83	Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials	2018-01-05 13:55:43 -08: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
Seth Alves	fd8b521c50	Merge pull request #12038 from ElderOrb/audio_name_conflict_fix ... Audio name conflict fix (fix for https://github.com/highfidelity/hifi/issues/11963)	2018-01-05 08:15:48 -08:00
Alexander Ivash	437b78dce5	FB10621 "HIFI-Commerce Login" page title change to "Log in to continue"	2018-01-05 13:35:19 +03:00
Zach Fox	4612ef3d7c	Use atYBeginning	2018-01-04 15:41:01 -08:00
vladest	67ca76baa1	Magninfication	2018-01-04 23:11:42 +01:00
Zach Fox	14447c26a0	Prevent visual data loss	2018-01-04 13:47:31 -08:00
David Back	8f7c3d5a24	Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials	2018-01-04 13:16:39 -08:00
Alexander Ivash	7ab7a46530	11008 GoTo app does not focus on address bar when opened	2018-01-04 23:38:10 +03:00
Zach Fox	10d494b51d	Pagination for Recent Activity	2018-01-04 12:32:30 -08:00
Ryan Downe Karpf	eada0b1ff7	Merge pull request #11546 from vladest/tablet_home_paginate ... Tablet home paginate	2018-01-03 18:12:32 -08:00
David Back	17fdf9698c	Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials	2018-01-03 15:51:20 -08:00
David Back	cbaba86881	more texture options	2018-01-03 15:50:24 -08:00
Gabriel Calero	ef8ba1cad0	Include config.h in ResourceImageItem.cpp. Minor fixes	2018-01-03 16:40:14 -03:00
Gabriel Calero	d31346c047	Use qml engine	2018-01-03 16:40:14 -03:00
Zach Fox	6f077f3a92	Fix Security Pic Change dialog after QML security changes	2018-01-03 11:28:39 -08:00
David Back	c1757d6b45	merge	2018-01-03 10:10:12 -08:00
Zach Fox	681b5173cd	Merge pull request #12082 from MiladNazeri/Fix-GitIgnore ... Add .jsc and remove duplicate qmlc from ignore, and remove Utils.jsc binary that was created	2018-01-03 09:34:14 -08:00
milad	63801ce802	add .jsc, remove duplicate qmlc, and remote Utils.jsc	2018-01-02 17:15:23 -08:00
Zach Fox	917db14879	Add a link to My Purchases from Wallet Home	2018-01-02 15:26:11 -08:00
Zach Fox	47a209dc4c	Make things slightly better?	2018-01-02 13:11:00 -08:00
vladest	a84e585679	Merge	2018-01-02 21:49:00 +01:00
vladest	09c3f93c74	Switch moved	2017-12-31 15:17:44 +01:00
vladest	c953251cfe	TextField moved. Fixed sound on hovering check box	2017-12-30 19:55:52 +01:00
unknown	7531a2ef3b	map_bump wip	2017-12-29 18:00:07 -08:00
vladest	f5f19ea67f	Move RadioButton	2017-12-28 15:53:16 +01:00
vladest	2fbd0a41b1	Move Slider	2017-12-28 15:39:22 +01:00
vladest	afc3082593	Cleanup. Errors checks	2017-12-28 13:16:51 +01:00
David Back	5e45ee456c	more ka	2017-12-27 16:55:45 -08:00
vladest	35fee739c5	Use buttons index	2017-12-27 23:50:15 +01:00
Elisa Lupin-Jimenez	01c1032540	fixed constant names, added another URL check	2017-12-27 10:51:58 -08: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	9fa78bae0d	Merge branch 'master' into tablet_home_paginate	2017-12-23 17:46:51 +01:00
vladest	a497047666	Refactored using new GridView approach	2017-12-23 17:44:26 +01:00
Zach Fox	808b9cbc31	Merge pull request #12047 from zfox23/commerce_dataTracking3 ... Commerce Data Tracking: Iteration 3 (Purchases)	2017-12-22 14:31:03 -08:00
Zach Fox	ef71470d85	Small change	2017-12-21 17:03:04 -08:00
Zach Fox	2acea75db3	Commerce: Checkout Layout Revisions	2017-12-21 16:09:46 -08:00
Zach Fox	618e5c9032	Commerce Data Tracking: Iteration 3 (Purchases)	2017-12-21 15:46:01 -08:00
luiscuenca	38bfddf786	Added filter for QT autogenerated functions and integrated it to Developers menu	2017-12-21 16:26:06 -07:00
vladest	7985c39f2a	Adopt path to certain Tablet dialogs to new loading subsystem and path resolver	2017-12-21 22:14:15 +01:00
Alexander Ivash	bd3a056f4e	rename exposed to QML "Audio" context object to "AudioScriptingInteface" to avoid naming conflict ... note: I'm not sure what exactly causes naming conflict - importing QtMultimedia in ForceLoad.qml, or the fact of existance of Audio.qml, but starting with Qt 5.10.0 'Audio' already exists in global scope	2017-12-21 20:03:38 +00:00
luiscuenca	54297e00a8	button size fix	2017-12-21 12:48:21 -07:00
luiscuenca	d93828f2f0	Fix an improve currentAPI.js	2017-12-21 11:50:02 -07: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
Zach Fox	e02e6790fe	Fix error state for Commerce passphrase TextInputs	2017-12-20 13:46:02 -08:00
Zach Fox	08edc52932	Merge pull request #12025 from zfox23/commerce_fixWalletSetupCancel ... Commerce: Fix the behavior of the 'cancel' button in Wallet Setup	2017-12-20 09:18:10 -08:00
Zach Fox	a72ed27a25	CR feedback	2017-12-19 16:57:48 -08:00
Zach Fox	5da49d156e	Commerce: Fix the behavior of the 'cancel' button in Wallet Setup	2017-12-19 16:26:58 -08:00
vladest	012f65a87f	Merge branch 'master' into tablet_home_paginate	2017-12-19 21:40:47 +01:00
vladest	5877eeea0b	cleanup	2017-12-19 21:35:11 +01:00
vladest	1cf82b7725	SpinBox now works	2017-12-19 21:28:28 +01:00
howard-stearns	bb499000a6	trailing semicolon	2017-12-19 10:51:32 -08:00
howard-stearns	16a58ddf5a	Merge branch 'master' of https://github.com/highfidelity/hifi into consistent-goToUser	2017-12-19 10:48:34 -08:00
Zach Fox	18d5be147c	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-19 09:48:15 -08:00
Zach Fox	6fc58b713e	Merge pull request #12009 from zfox23/commerce_dataTracking2 ... Commerce: Add Passphrase Auth Status data tracking	2017-12-18 16:26:59 -08:00
Zach Fox	a2fe2797ff	Merge pull request #11982 from zfox23/commerce_staticCertVersioning ... Commerce: staticCertificateVersion; Seal serverScripts JSON property; getStaticCertificateJSON()	2017-12-18 15:20:23 -08:00
Zach Fox	afd3cf7045	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-18 14:08:09 -08:00
vladest	29a17d366e	Merge branch 'master' into move_to_qqc2	2017-12-18 20:57:04 +01:00
Zach Fox	e075cd79fb	Add Passphrase Auth Status data tracking	2017-12-18 11:51:12 -08:00
Brad Davis	9f7b6f543d	Merge remote-tracking branch 'upstream/master' into HEAD	2017-12-18 11:17:07 -08: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
howard-stearns	d730b7b87b	consistent goToUser behavior in PAL, and be able to go to flying user.	2017-12-15 17:00:54 -08:00
Zach Fox	89795272c7	More security images!	2017-12-15 16:26:13 -08:00
Alexander Ivash	32acc8ad47	8992 Login window is small in tablet	2017-12-14 23:53:33 +00:00
Zach Fox	af346f2ced	Protocol change	2017-12-14 10:09:10 -08:00
Zach Fox	3764445272	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-13 14:12:08 -08:00
Seth Alves	d3e24d3629	Merge pull request #11960 from ElderOrb/FB10334 ... 10334 Unable to type in Go To app search bar after UI reappears from …	2017-12-13 09:06:53 -08:00
vladest	99a6b12828	Merge branch 'master' into tablet_home_paginate	2017-12-13 16:02:29 +01:00
vladest	2770650b65	Merge branch 'master' into move_to_qqc2	2017-12-12 18:48:41 +01:00
vladest	e052784431	Code style	2017-12-12 14:12:03 +01:00
Zach Fox	2225352b1e	Fix wallet setup	2017-12-11 17:15:15 -08:00
Howard Stearns	8e36228c12	Merge pull request #11948 from MandatoryMania/noFundsSymbol ... Provides a nice alert in case of insufficient funds to make a purchase	2017-12-11 11:45:27 -08:00
Zach Fox	b81cdf49ef	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-11 09:52:32 -08:00
vladest	e797f5cda0	Merge branch 'master' into tablet_home_paginate	2017-12-11 17:53:21 +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
Zach Fox	8485503063	Merge pull request #11958 from humbletim/fix-pal-connections ... Fix for Connections UI lockup	2017-12-08 18:34:25 -08:00
humbletim	abba85ac54	add missing colonsemi	2017-12-08 18:14:30 -05:00
humbletim	34243f4239	disable connections console.log to prevent UI lag	2017-12-08 17:10:57 -05:00
vladest	3aaf666295	Merge branch 'master' into tablet_home_paginate	2017-12-08 19:59:41 +01:00
Sam Gondelman	352c11d7c4	Merge pull request #11358 from vladest/fix_google_vr_height ... Momentum aka flickable for WebView	2017-12-08 10:46:52 -08:00
Zach Fox	a81a981676	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-08 09:44:52 -08:00
Seth Alves	91b2d8df8a	Merge pull request #11874 from luiscuenca/audioscope ... Improve Audio Scope	2017-12-08 07:15:28 -08:00
Seth Alves	eda63e5758	Merge pull request #11919 from ElderOrb/FB9706 ... 9706 Editing Attachments Results In Attachments Window Scrolling To Top	2017-12-08 07:01:00 -08:00
H Q	4ce784291c	Provides a nice alert in case of insufficient funds to make a purchase	2017-12-07 15:13:01 -08: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	c9f86e4b6b	Merge branch 'master' into tablet_home_paginate	2017-12-07 19:16:13 +01:00
vladest	3c11d29a7f	Something intermediate	2017-12-07 19:13:39 +01:00
Brad Hefta-Gaub	88ed15aaaa	Merge pull request #11942 from ctrlaltdavid/21633 ... Fix image overlay's subImage property's width and height support	2017-12-07 09:19:43 -08:00
David Rowe	efd72be96f	Fix image overlay's subImage property's width and height support	2017-12-07 12:05:46 +13:00
Zach Fox	3183a1a8b9	Add setupAttemptID to every step (thanks Dave)	2017-12-05 16:48:30 -08:00
Zach Fox	902064ed37	Cleanup debug stuff	2017-12-05 15:26:55 -08:00
Zach Fox	c807fc80e3	Add marketplace cta referrer	2017-12-05 15:25:05 -08:00
Zach Fox	7521e4870e	Bugfixes	2017-12-05 14:56:47 -08:00
Zach Fox	668f6d50b5	Add data tracking for wallet setup	2017-12-05 14:13:48 -08:00
Zach Fox	4334bf8222	Add data tracking for purchase and rez	2017-12-05 13:09:09 -08:00
Zach Fox	c80039ea87	Merge pull request #11929 from zfox23/commerce_fixGraySecurityImage1 ... Fix gray/incorrect security image after relog	2017-12-05 11:21:06 -08:00
Zach Fox	1507620fd5	Merge pull request #11921 from ElderOrb/FB10024 ... 10024 Wallet: TextField Focus Problems	2017-12-05 10:52:08 -08:00
Zach Fox	d59c9bd73a	Fix gray/incorrect security image after relog	2017-12-05 10:27:40 -08:00
luiscuenca	d70a3685b8	Clean up	2017-12-04 15:29:13 -08:00
luiscuenca	390c59b45c	Change menu and minor fixes	2017-12-04 15:29:01 -08:00
Alexander Ivash	f7328f05fb	remove keyboard-hiding logic as keyboard hides should be handled by focus change listener in 'onFocusObjectChanged' in the OffscreenQmlSurface	2017-12-05 00:51:42 +03:00
Zach Fox	4c96fc2d9d	Merge pull request #11905 from zfox23/commerce_resetWalletBeforeCreation ... Call reset() on Wallet before creating new wallet	2017-12-04 13:05:36 -08:00
Alexander Ivash	8a5904373b	remove 'collapse keyboard' hack as now there is dedicated 'collapse keyboard' button	2017-12-05 00:04:46 +03:00
Alexander Ivash	c67ff3b5d8	10024 Wallet: TextField Focus Problems ... note: removed excessive MouseArea-s	2017-12-05 00:03:48 +03:00
vladest	a0878298d5	Merge branch 'master' into tablet_home_paginate	2017-12-04 20:55:38 +01:00
vladest	b52163cb24	Intitial SpinBox port	2017-12-04 20:54:35 +01:00
vladest	3e118c58a1	Moved RadiButton and Slider	2017-12-04 12:51:57 +01:00
Brad Hefta-Gaub	06cf194ec7	Merge pull request #11910 from ctrlaltdavid/21626 ... Fix erroneous 2D overlay unhandled property messages for bounds property	2017-12-03 18:09:17 -08:00
vladest	0f4329be69	Added keyboard support. Cleanup	2017-12-03 22:45:57 +01:00
Alexander Ivash	d60f082796	9706 Editing Attachments Results In Attachments Window Scrolling To Top	2017-12-03 23:24:34 +03:00
luiscuenca	4030688e7a	added record wav files	2017-12-03 11:54:37 -07:00
vladest	f2d7e2f607	Merge branch 'master' into move_to_qqc2	2017-12-02 22:41:19 +01:00
vladest	e1df38784b	Merge branch 'master' into tablet_home_paginate	2017-12-02 22:40:10 +01:00
Brad Hefta-Gaub	3f705a7baf	Merge pull request #11858 from vladest/fix_tablet_scrollbars ... Use ScrollBars from QQC2, which supports mouse and touch events	2017-12-02 12:51:14 -08:00
vladest	fd9539a9e4	Using Flickable signals to remove hover state instead of timer. No more delays	2017-12-02 13:57:12 +01:00
Howard Stearns	e2efe062fe	Merge pull request #11893 from zfox23/commerce_sameInfoDontRefresh ... Don't refresh Inventory or Recent Activity if data hasn't changed	2017-12-01 13:57:34 -08:00
Zach Fox	ebb2e50d01	Fix month display in commerce...	2017-12-01 09:29:19 -08:00
vladest	570be69fcf	Fix warnings after apps closed	2017-12-01 09:52:45 +01:00
David Rowe	fd76c7a88b	Fix erroneous 2D overlay unhandled property messages for bounds property	2017-12-01 17:40:34 +13:00
Zach Fox	24e5994f20	The nuclear option is a bad option.	2017-11-30 15:55:09 -08:00
Zach Fox	009d3a18a3	Call reset() on Ledger and Wallet before creating new wallet	2017-11-30 15:40:20 -08: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
vladest	74c002d1f5	Merge conflicts. Return back web console messages. For flickable in web engine core its enougth to add timestamp to touch events	2017-11-30 12:52:26 +01:00
vladest	dfeefe53b8	Make scroll bar handle centered on shaft. Width chaned on par with entities list html view	2017-11-30 11:40:02 +01:00
vladest	ac7a5ebc94	ComboBox: fix closing popup. Started to implement keyboard support	2017-11-30 10:39:01 +01:00
vladest	8c9e530adf	Merge branch 'master' into move_to_qqc2	2017-11-29 16:33:59 +01:00
Zach Fox	3c892920e3	Prevent seeding text from flashing	2017-11-28 17:00:15 -08:00
Zach Fox	5dc8715879	Bugfix	2017-11-28 16:14:17 -08:00
Zach Fox	489d11d5fd	Remove logging	2017-11-28 16:01:58 -08:00
Zach Fox	3e5a2addd2	Use same logic for Recent Activity	2017-11-28 16:00:46 -08:00
Zach Fox	e769d2fbc3	Don't refresh Inventory or Recent Activity if data hasn't changed	2017-11-28 15:44:42 -08:00
vladest	7283f0127b	return back square background for scroll bars	2017-11-28 22:21:52 +01:00
vladest	94937374c5	Make selection not visible under rounded scrollbar	2017-11-28 21:33:13 +01:00
vladest	b2ec2aab15	Merge branch 'master' into fix_tablet_scrollbars	2017-11-28 20:41:07 +01:00
vladest	80eb203008	More precise handle placing. some logging added	2017-11-28 20:20:58 +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
vladest	da5090fd49	Implemented more close to QQC2 ideology	2017-11-27 19:43:17 +01:00
Menithal	693da50a68	21539: Fixed None Checkmark being on Desktop mode	2017-11-27 07:59:04 +02:00
Menithal	5d52b9936b	21539: Updated Logic to match request	2017-11-27 07:42:18 +02:00
luiscuenca	027d2d323c	Measure tool and corrections	2017-11-26 22:28:34 -07:00
Menithal	ba1cd74ffe	21539: Moved Desktop HMD to None	2017-11-26 21:58:16 +02:00
vladest	3f0de940a4	Merge branch 'master' into move_to_qqc2	2017-11-26 10:18:44 +01:00
vladest	6136a4cea6	Rounded background	2017-11-25 10:03:56 +01:00
vladest	73a557a8a4	Added Scroll Bar for Trees. Fixed some anchoring issues. Fixed headerless views	2017-11-24 15:58:27 +01:00
vladest	b69b580a68	Use ScrollBar from QQC2 which is supports both mouse and touch events	2017-11-23 23:08:43 +01:00
luiscuenca	5bf8367126	add resources	2017-11-22 18:17:50 -07:00
Zach Fox	fada02a76c	Merge pull request #11864 from zfox23/commerce_newHelpText ... New Help questions/answers/link	2017-11-22 12:53:16 -05:00
Zach Fox	d2ebfbf064	New Help questions/answers/link	2017-11-21 18:55:48 -05:00
samcake	84ff40c717	Merging with master	2017-11-21 14:12:47 -08:00
Brad Hefta-Gaub	5914f27027	Merge pull request #11706 from luiscuenca/webAudioDev_fresh ... QML & Web generated audio now follow the client audio device selection	2017-11-21 11:29:48 -08:00
Howard Stearns	4018b99118	Merge pull request #11848 from zfox23/commerce_flipTheSwitch ... Turn Commerce on by default!	2017-11-20 16:18:53 -08:00
vladest	4e38b3bace	Started working on ComboBox. Add background for scroll bar	2017-11-20 20:35:41 +01:00
Dante Ruiz	76935c1457	fixing merge conflict	2017-11-20 09:51:10 -08:00
vladest	f20a723a7d	Merge branch 'master' into move_to_qqc2	2017-11-20 17:04:26 +01:00
vladest	f991379c9c	Fix scroll bar	2017-11-20 17:02:34 +01:00
vladest	50ed9e2b2a	Port CheckBox to QQC2	2017-11-19 22:03:38 +01:00
vladest	6b640bd028	Resolve merge conflicts	2017-11-19 20:52:39 +01:00
Brad Hefta-Gaub	e070033ce4	Merge pull request #11793 from ElderOrb/FB9032 ... 9032 - Current display mode can be deselected in the toolbar/tablet menu	2017-11-19 11:25:35 -08:00
Brad Hefta-Gaub	ff8ca6da4c	Merge pull request #11303 from vladest/webbrowser_updates ... Webbrowser updates	2017-11-19 11:11:09 -08:00
vladest	b21f66f666	Port PlaySampleSound to QQC2. Fix crash on press down key in scroll window	2017-11-19 20:09:07 +01:00
Brad Hefta-Gaub	1de6ecec30	Merge pull request #11830 from ElderOrb/FB8244 ... 8244 Rename captionColorOverride to captionColor	2017-11-18 14:28:32 -08:00
vladest	19f9af0576	Port avatar preferences	2017-11-18 23:03:52 +01:00
vladest	68b08f429c	Port Attachments to QQC2	2017-11-18 22:49:16 +01:00
vladest	d92f461f12	Port ControllerSettings	2017-11-18 20:44:52 +01:00
vladest	41f338e6ad	Port ScrollingWindow and TabletDebugWindow	2017-11-18 20:18:17 +01:00
vladest	c8d864465f	Merge branch 'master' into move_to_qqc2	2017-11-18 18:54:08 +01:00
vladest	34fe517c67	Merge conflicts	2017-11-18 18:48:33 +01:00
Brad Hefta-Gaub	28b75abcee	Merge pull request #11816 from druiz17/fix-bringing-up-logs ... Fix issue of User is unable to bring up the High Fidelity Interface log.	2017-11-17 17:02:50 -08:00
Brad Hefta-Gaub	0678a7c9df	Merge pull request #11718 from kencooke/audio-louder-mastergain ... Adjustable master avatar volume	2017-11-17 16:58:27 -08:00
SamGondelman	033f658fff	Merge remote-tracking branch 'upstream/master' into pointers	2017-11-17 16:10:20 -08:00
Zach Fox	d31578abae	FIXME LATER! Remove mouseareas from passphrase screens	2017-11-17 15:47:02 -08:00
Zach Fox	7d34b3fe67	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-11-17 15:45:03 -08:00
Zach Fox	ec16f16757	Remove debug buttons from wallet	2017-11-17 15:21:18 -08:00
Zach Fox	4cc8db8aff	Merge pull request #11843 from zfox23/commerce_fixMyItems ... Fix 'My Items' display	2017-11-17 12:59:51 -08:00
vladest	dbd6ec0dff	Port Edit.qml to QQC2 as well as some tablet preferences compinents	2017-11-17 20:46:21 +01:00
Dante Ruiz	4de0fdf7d1	Merge pull request #11768 from ctrlaltdavid/21596 ... Add instructions and cursor to GOTO dialog input	2017-11-17 11:45:40 -08:00
Zach Fox	f570e3c874	Fix 'My Items' display	2017-11-17 11:27:00 -08:00
vladest	cfacf3b47d	Port web glyph button to QQC2	2017-11-16 21:58:09 +01:00
Zach Fox	7f64ede940	Fix skipping wallet setup step in certain cases	2017-11-16 11:44:52 -08:00
vladest	2aae8edde0	Merge branch 'master' into move_to_qqc2	2017-11-16 19:08:15 +01:00
vladest	b4f6c25f4d	Implement QQC1-compatible Action component	2017-11-16 19:04:35 +01:00
SamGondelman	e3aa79990b	merge with master	2017-11-16 09:45:32 -08:00
Alexander Ivash	c5d2f598d7	8244 Rename captionColorOverride to captionColor	2017-11-16 15:46:49 +03:00
SamGondelman	7eb22b372f	merge with master	2017-11-15 14:35:30 -08:00
Zach Fox	9f80a5f081	Merge pull request #11817 from zfox23/commerce_rezFix ... Fix rezzing non-JSON marketplace items	2017-11-15 14:17:05 -08:00
Brad Davis	bb2e061d77	Fixing global declarations in JS	2017-11-15 12:00:52 -08:00
Brad Davis	26a745be6f	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-15 11:59:06 -08:00
vladest	0e53afc346	Merge branch 'master' into move_to_qqc2	2017-11-15 20:53:14 +01:00
Brad Davis	1167be4102	Reverting tablet API rename, cleaning up duplicated code	2017-11-15 11:52:55 -08:00
vladest	2852375285	Make QueryDioalogs buttons works	2017-11-15 20:32:28 +01:00
Zach Fox	e8c4878c8f	Fix rezzing non-JSON marketplace items	2017-11-15 11:25:18 -08:00
Dante Ruiz	d83f3152dd	Merge pull request #11809 from ElderOrb/FB8984 ... 8984 Opening tablet with "Enter" key displays the audio menu	2017-11-15 11:16:49 -08:00
Dante Ruiz	b633968865	fix-bringing-up-logs	2017-11-15 10:47:06 -08:00
Howard Stearns	1c293c4c48	Merge pull request #11813 from zfox23/commerce_removeEditJSDependency ... Remove Marketplace's dependency on Edit.js for REZ/WEAR	2017-11-14 16:33:35 -08:00
Zach Fox	f5994375cf	Remove Marketplace's dependency on Edit.js for rez	2017-11-14 14:29:49 -08:00
Zach Fox	c42003a374	Merge pull request #11794 from ElderOrb/FB4684_3 ... 4684 Add collapse button on the virtual keyboard	2017-11-14 12:22:42 -08:00
Alexander Ivash	e201e203b8	8984 Opening tablet with "Enter" key displays the audio menu	2017-11-14 22:18:48 +03:00
Zach Fox	5290ee3b4e	Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-11-14 10:07:44 -08:00
Brad Davis	d71fd151c5	Fixing button model exposure	2017-11-13 16:45:27 -08:00
Zach Fox	a3332e15b7	Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-11-13 15:01:26 -08:00
SamGondelman	2fb1981c4a	merge with master	2017-11-13 14:34:39 -08:00
Brad Davis	69029b49f3	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-13 14:29:49 -08:00
Brad Davis	8f85c7650b	Make sure loaded components get the right parent context	2017-11-13 14:16:04 -08:00
vladest	6b732804eb	Button as QQC2	2017-11-13 21:15:31 +01:00
Zach Fox	641c4656c4	Fix bug with disappearing certificate info	2017-11-13 10:53:16 -08:00
Brad Davis	5cf9c1bb33	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-13 10:48:21 -08:00
vladest	4c1bbdacec	Fix merge conflicts	2017-11-13 16:45:10 +01:00
vladest	0c13c2b6e2	Remove unused QQC1 imports	2017-11-13 16:37:28 +01:00
Ryan Downe Karpf	f8b1c7978c	Merge pull request #11772 from 1P-Cusack/FogBugz/Case_6569 ... [Case 6569]: Silent failure is possible during Model Creation	2017-11-12 08:36:10 -08:00
vladest	50ea08f3d5	VR stylus and laser need longer timeout than mouse	2017-11-11 16:10:00 +01:00
vladest	9dbcff040d	Tune press delay to be able to swipe tablet pages easier	2017-11-11 09:43:34 +01:00
Brad Davis	7bf1b176d7	Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem	2017-11-10 14:21:24 -08:00
vladest	637a4ff357	Merge branch 'master' into tablet_home_paginate	2017-11-10 21:12:34 +01:00
Brad Davis	92a3c209aa	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-10 11:44:29 -08:00
beholder	d1969d649a	fix not collapsing keyboard	2017-11-10 21:20:00 +03:00
beholder	0bc95998c4	a few more adjustments based on discussion with Mukul	2017-11-10 21:20:00 +03:00
beholder	4d11f9a434	increase font pixel size for 'collapse keyboard' to 34px	2017-11-10 21:20:00 +03:00
beholder	db3ed81513	adjust to changed requirements: ... 1. The keyboard collapse button is moved to the lower right, replacing the keys there 2. The button next to m is a hyphen instead of a underscore, it turns to a underscore when the user clicks on shift 3. The input text at the top occupies the full width and is center aligned, when you start typing the text moves in both directions the left and the right	2017-11-10 21:20:00 +03:00
beholder	eb4214fb4c	add API for unfocusing input fields in HTML, unfocus WebEngine-based QML items on lowering keyboard	2017-11-10 21:20:00 +03:00
beholder	fb14e4dc4d	Fixed programmatical lowering of 'TabletAddressDialog'	2017-11-10 21:20:00 +03:00
beholder	a9fe3596cf	4684 Add collapse button on the virtual keyboard	2017-11-10 21:20:00 +03:00
beholder	87519cd26f	use conditional bindings to avoid intermediate binding states	2017-11-10 19:53:54 +03:00
beholder	908faa1334	refactoring: simplify code & fix the issue with menu-es sometimes losing checked state	2017-11-10 19:53:54 +03:00
LaShonda Hopper	0e90c92cf5	[Case 6569] Minor: Break up line to pass column count guidelines. ... Changes Committed: modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml	2017-11-08 18:35:12 -05:00
LaShonda Hopper	a057cb914f	[Case 6569] Fixes clipping of cancel button by window edge. ... Changes Committed: modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml	2017-11-08 18:27:25 -05:00
LaShonda Hopper	dac2ae19a4	[Case 6569] Add protection for dynamic vs static collision type (details below). ... When creating a model, it was possible to elect Exact collision with the dynamic property even though this combination is prohibited. This combination would silently fail rather than notifying the user of the error. This commit implements safeguards against the invalid combination: * If the user elects the Exact collision type and the dynamic field is unchecked, then dynamic field is disabled. * If the user elects a different collision type and the dynamic filed is unchecked, then the dynamic field is enabled. * If the user has checked the dynamic field and subsequently elects the Exact collision type, then the selection is void and the previous collision selection is retained; however, an error dialog is presented informing the user of the error. Changes Committed: modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml	2017-11-08 18:27:24 -05:00
Brad Davis	25df649b44	Fix desktop mode script URL injection	2017-11-08 14:55:34 -08:00
David Rowe	c5c1ead400	Fix GOTO dialog's connection status and location not always updating	2017-11-09 10:51:21 +13:00
Zach Fox	a5dff0160b	Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-11-08 13:30:55 -08:00
Zach Fox	38fde43009	...simplify your life	2017-11-08 13:19:47 -08:00
Zach Fox	3190fe1f32	Use keyfilepath instead of cached public keys	2017-11-08 12:30:48 -08:00
Brad Davis	1a58aee385	Fix scripting URL injection, I hope	2017-11-08 12:00:29 -08:00
Zach Fox	72fa0823ba	Logic changes	2017-11-08 11:01:54 -08:00
Zach Fox	b7163bb8fc	Frontend changes	2017-11-08 10:25:11 -08:00
Zach Fox	845ff64c1e	Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-11-08 09:32:09 -08:00
Zach Fox	085355222f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-11-08 09:31:09 -08:00
Ken Cooke	addcb51ed9	Change slider label from "master gain" to "master volume"	2017-11-08 07:50:35 -08:00
David Rowe	0d21e0be11	Delete old, no longer used file	2017-11-08 17:14:17 +13:00
David Rowe	055470296d	Move current location in GOTO dialog and add placeholder text to input	2017-11-08 17:13:40 +13:00
Brad Davis	b7f31eb5b9	Fixing desktop QML loading, tablet clickthrough bugs	2017-11-07 12:42:26 -08:00
Zach Fox	f248eb5518	Change wallet home when 0 transactions	2017-11-07 11:30:09 -08:00
SamGondelman	f970eb2302	merge with pointers branch	2017-11-06 14:49:50 -08:00
SamGondelman	7d420f5242	isLeftHand, isRightHand, isMouse	2017-11-06 12:29:21 -08:00
Zach Fox	b54627594b	Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-11-06 09:29:26 -08:00
Zach Fox	149c8fbeb2	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-11-06 09:25:30 -08:00
David Rowe	9db0dd6fea	Fix Asset Browser's "Copy URL" context menu	2017-11-05 20:38:37 +13:00
Menithal	ac1df7b815	21539: Allow HMD to turned off in Desktop Mode	2017-11-05 01:02:08 +02:00
Brad Davis	d162e1cff6	Whitelist functionality for tablet apps	2017-11-04 15:14:06 -07:00
Brad Hefta-Gaub	c1dfa24c12	Merge pull request #11743 from kencooke/audio-peakmeters-bugfix ... Fix the audio input device peak meters	2017-11-04 13:55:08 -07:00
Melissa Brown	a14e98053e	Merge pull request #11138 from Nex-Pro/21466 ... Fix Avatar Rotation upon Teleporting Using PAL	2017-11-03 11:58:15 -07:00
Nex-Pro	3171418173	Update NameCard.qml	2017-11-03 17:21:35 +00:00
vladest	6659565c39	Merge branch 'master' into tablet_home_paginate	2017-11-03 14:41:54 +01:00
vladest	659afcc43b	Make page indicators non clickable. Attempt to enable swipe even over buttons	2017-11-03 14:38:46 +01:00
Ken Cooke	babaef8399	Fix the audio input device peak meters	2017-11-03 05:59:59 -07:00
Zach Fox	6f3c61c4e0	Slightly modify invalid cert language	2017-11-02 17:59:36 -07:00
Zach Fox	19945c5991	Update cert UI	2017-11-02 10:22:00 -07:00
Zach Fox	56cb98d96f	Make inspection cert work	2017-11-01 12:02:57 -07:00
Zach Fox	b335ba9a75	Timeout timer	2017-11-01 11:34:29 -07:00
vladest	215e64d702	Merge branch 'master' into tablet_home_paginate	2017-11-01 18:51:01 +01:00
Ken Cooke	82d9827571	Merge branch 'master' into audio-louder-mastergain	2017-11-01 08:10:55 -07:00
Ken Cooke	3a2780bdf6	Enable gain slider in PAL menu to control Avatar MASTER Gain	2017-10-30 10:42:26 -07:00
vladest	d3c62db65d	Merge branch 'master' into webbrowser_updates	2017-10-30 18:17:19 +01:00
vladest	586dde7dd7	Removed GPL code. Added own implementation of suggestions engine. Fixed Google maps different issues	2017-10-30 18:15:42 +01:00
Ryan Downe Karpf	28a99fe685	Merge pull request #11655 from dback2/tabletcontextualmode ... add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place	2017-10-30 08:56:26 -07:00
vladest	950ac3540a	Fix mute unmute. Scrolling thru suggestions popup now set popup's contains into url. Fixed reload timer	2017-10-29 14:05:47 +01:00
vladest	865c241a13	Merge branch 'master' into webbrowser_updates	2017-10-28 12:31:26 +02:00
vladest	b1601dcd4c	fix typo in tablet avatar browser	2017-10-28 12:07:29 +02:00
vladest	567a219e9c	Cleanup. Remove unused functionality	2017-10-28 12:01:37 +02:00
vladest	6fb1a9954e	Merge branch 'master' into fix_google_vr_height	2017-10-28 10:35:29 +02:00
Brad Hefta-Gaub	8322631a6d	Merge pull request #11695 from luiscuenca/case6719 ... 6719 Avatar attachment window will update when attachments are modified	2017-10-27 17:01:05 -07:00
Brad Hefta-Gaub	d61ede2a4e	Merge pull request #11697 from ElderOrb/FB8211 ... 8211 Add very short haptic feedback when highlighting letters on keyboard	2017-10-27 13:26:41 -07:00
Zach Fox	5ab737f66d	Merge pull request #11658 from zfox23/pop_dynamicTestsMaster ... Commerce: Owner Verification for Certified Entities	2017-10-27 12:28:04 -07:00
luiscuenca	70b37f2e8a	Cleaning some old tabs	2017-10-27 11:32:44 -07:00
luiscuenca	f32282afdd	Clean update bug 8027	2017-10-27 11:03:02 -07:00
Zach Fox	9481824d0a	Fix enabled status of wear button	2017-10-26 17:02:09 -07:00
beholder	6093cef6f0	add comments to explain '-1'	2017-10-27 01:25:26 +03:00
beholder	f6fa85fed2	adjust to coding standards	2017-10-27 01:25:25 +03:00
Zach Fox	c62eb2bf3c	Merge branch 'feature/qml_whitelist_2' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-10-26 14:58:43 -07:00
Brad Davis	ffc51d5387	Working on QML whitelist functionality	2017-10-26 14:20:13 -07:00
Zach Fox	3e95484c4c	Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting	2017-10-26 13:58:50 -07:00
beholder	5969e0b118	8211 Add very short haptic feedback when highlighting letters on keyboard	2017-10-26 23:03:06 +03:00
vladest	794355dc35	Merge branch 'master' into webbrowser_updates	2017-10-26 21:18:00 +02:00
vladest	320ab2e682	Rework using StackView. Now backward takes in account popups as well	2017-10-26 21:14:44 +02:00
Zach Fox	c1e990e7be	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-10-26 10:37:31 -07:00
luiscuenca	f0eab58ebd	Bug 6719 fixed	2017-10-26 09:41:24 -07:00
Ken Cooke	4eb8b826c2	Merge pull request #11681 from luiscuenca/case6443 ... 6443 Audio Menu Sample Sound won't play while domain is loading	2017-10-26 08:40:30 -07:00
luiscuenca	3d3077978e	Simplyfied and fixed null pointer	2017-10-25 18:47:10 -07:00
Zach Fox	5898f0bd0c	Gotta do some fancy stuff with anchors for this to work	2017-10-25 15:04:47 -07:00
Zach Fox	dafa830c0d	First steps	2017-10-25 14:44:59 -07:00
luiscuenca	a1c9285c90	Fixed bug on case 6443	2017-10-25 13:13:50 -07:00
Zach Fox	14150c09ac	Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting	2017-10-25 12:59:36 -07:00
vladest	9f32b6c634	Merge branch 'master' into webbrowser_updates	2017-10-25 21:46:39 +02:00
vladest	505c281cd3	Merge branch 'master' into tablet_home_paginate	2017-10-25 21:19:16 +02:00
Brad Hefta-Gaub	18a74cea91	Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023 ... 2017-10-23: Merge RC57 into Master	2017-10-24 21:19:01 -07:00
Zach Fox	7998984d8e	Missed tons of spots!	2017-10-24 14:30:47 -07:00
Dante Ruiz	f29937fb88	Merge branch 'master' of github.com:highfidelity/hifi into crash-keyboard	2017-10-24 13:54:21 -07:00
Dante Ruiz	92f765fe52	property set echomode for keyboard for wallet and webviews	2017-10-24 13:53:50 -07:00
Zach Fox	48c8d52c09	Cleanup	2017-10-24 13:30:27 -07:00
vladest	874b9149e7	Popupd support reworked	2017-10-24 22:04:25 +02:00
Zach Fox	c64c2e17c8	First pass at consolidation	2017-10-24 12:01:05 -07:00
Zach Fox	1f6d989044	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023	2017-10-23 17:37:43 -07:00
Dante Ruiz	0242e8e4ba	fixed crash and login password	2017-10-23 16:33:49 -07:00
David Back	b5f1793863	add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place	2017-10-23 14:21:18 -07:00
vladest	a33b2986cd	Merge branch 'master' into webbrowser_updates	2017-10-23 22:34:31 +02:00
vladest	fd41299efc	Disable profile and custom user agent which broke nav bars	2017-10-23 22:34:22 +02:00
Zach Fox	03b46c5e62	Merge pull request #11652 from cain-kilgore/21508 ... WL 21508 - Improve upon Skybox Changer (Updated)	2017-10-23 12:22:21 -07:00
Zach Fox	30bffdea32	Quick bugfix	2017-10-23 11:45:51 -07:00
Cain Kilgore	b60b58ff35	zFox Changes	2017-10-23 19:40:43 +01:00
Cain Kilgore	3b4185fdb3	WL 21508 - Improve upon Skybox Changer ... This involved a second PR, due to optimizing the way the Skyboxes are laid out. All of the Skyboxes will now appear at once, with the random button being removed. You are able to scroll up and down the list and choose which Skybox you'd like to pick.	2017-10-23 19:30:36 +01:00
Zach Fox	5c8451a626	Auto-refresh Wallet Home & Purchases on 4s timer	2017-10-23 10:36:23 -07:00
Melissa Brown	20787c9c7c	Merge pull request #11644 from cain-kilgore/21508 ... WL 21508 - Improve upon Skybox Changer	2017-10-23 10:30:55 -07:00
Cain Kilgore	b42afdaff0	WL 21508 - Cleanup from Code Review	2017-10-23 16:27:28 +01:00
vladest	b791dcba7f	Add sound cues to create app	2017-10-22 14:59:53 +02:00
vladest	cf7b050680	Sound cues for GoTo interface	2017-10-21 20:47:56 +02:00
Cain Kilgore	bc772a2f9a	WL 21508 - Improve upon Skybox Changer	2017-10-21 19:42:53 +01:00
vladest	d46578e572	Merge branch 'master' into webbrowser_updates	2017-10-21 19:12:23 +02:00
Brad Hefta-Gaub	f6af1d1ecf	Merge pull request #11387 from vladest/tablet_extended_sounds ... Tablet extended sounds	2017-10-20 13:49:06 -07:00
vladest	908d601a43	Code style fixes #1	2017-10-20 20:00:11 +02:00
Seth Alves	9d00606505	Merge pull request #11635 from druiz17/fix-hud-issues ... actually fix toolbar from completely dispersing	2017-10-20 10:22:34 -07:00
vladest	fa349a694c	Code style fixes	2017-10-20 15:12:09 +02:00
vladest	ea6c2e1bb5	Merge branch 'master' into tablet_extended_sounds	2017-10-20 14:46:02 +02:00
vladest	83c14bba5c	Fix popups misbehavior, wrong links with double http etc	2017-10-20 11:55:41 +02:00
druiz17	f2ad61934b	fix toolbar from completely dispearing	2017-10-19 14:02:21 -07:00
Zach Fox	aa48215933	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_OctoberFixes2	2017-10-19 10:54:31 -07:00
Brad Hefta-Gaub	f951a23356	Merge pull request #11627 from druiz17/reload-script ... fixed toolbar disapearing after reloading default scripts	2017-10-19 09:32:36 -07:00
vladest	92fc6daecc	Merge branch 'master' into webbrowser_updates	2017-10-19 14:56:31 +02:00
Zach Fox	dc1b3aef8f	Don't show purchases tutorial if user clicks what is rez	2017-10-18 16:25:06 -07:00
Zach Fox	322bac035c	Don't show 'no permission' text on wearables	2017-10-18 16:19:54 -07:00
druiz17	36912f1cd4	fixed toolbar disapearing after reloading default scripts	2017-10-18 16:03:32 -07:00
Zach Fox	1b7b35fe91	What does Rez mean?	2017-10-18 15:44:06 -07:00
Zach Fox	91ac2ab58c	LowerKeyboard button changes	2017-10-18 15:31:12 -07:00
Zach Fox	a993386613	Change color of 'Instructions Opened on Desktop' to disabled gray	2017-10-18 15:13:28 -07:00
Zach Fox	33508b6b2b	Update help text	2017-10-18 14:55:45 -07:00
Zach Fox	e829bd2919	Fix 'Recent Activity' indentation	2017-10-18 14:47:14 -07:00
Zach Fox	6f5fafb62f	Add 'showDebugButtons' switch on Help ta	2017-10-18 14:12:43 -07:00
Zach Fox	876001146a	Get categories from backend instead of site	2017-10-18 14:05:47 -07:00
Zach Fox	de50eef9c7	Fix rez certified...	2017-10-18 13:54:46 -07:00
Zach Fox	949da17046	Wear It button for items with category 'Wearables'	2017-10-18 13:51:58 -07:00
Zach Fox	a669aff453	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171018	2017-10-18 10:45:30 -07:00
vladest	556fa7d0e5	Merge branch 'master' into fix_google_vr_height	2017-10-17 18:32:17 +02:00
vladest	48cd60887e	Merge branch 'master' into tablet_home_paginate	2017-10-17 17:30:13 +02:00
John Conklin II	42a018c2c5	Merge pull request #11606 from ElderOrb/case8213 ... 8213 Keyboard Input Field: Reveals Passwords (RC-57)	2017-10-16 16:14:43 -07:00
Brad Hefta-Gaub	c4e672d6b8	Merge pull request #11582 from ElderOrb/case8213 ... 8213 Keyboard Input Field: Reveals Passwords	2017-10-16 14:57:18 -07:00
vladest	c84d0e74b3	Merge branch 'master' into tablet_home_paginate	2017-10-14 22:36:33 +02:00
vladest	654a861ddf	Merge branch 'master' into fix_google_vr_height	2017-10-14 22:01:53 +02:00
Zach Fox	6b7c997a4c	Minor text tweak	2017-10-13 13:37:11 -07:00
Zach Fox	051019a57a	Fix certificate username text eliding too early	2017-10-13 12:10:37 -07:00
Brad Hefta-Gaub	60030c08fa	Merge pull request #11573 from druiz17/bug-hud-module ... hud module intersects with dev stats window	2017-10-13 11:48:06 -07:00
Zach Fox	95a9675220	Final help QA - minus link to blockchain docs	2017-10-13 10:58:15 -07:00
druiz17	2422c9d9f3	made requested changes	2017-10-13 10:45:24 -07:00
vladest	f2847168a4	Use MouseArea for interacting instead of default one to be able interact in HMD mode	2017-10-13 19:12:42 +02:00
vladest	ed49489a4e	Merge branch 'master' into tablet_home_paginate	2017-10-13 12:57:26 +02:00
vladest	f524f8a50f	Remove commented code	2017-10-13 12:56:08 +02:00
vladest	77ce5234cf	Merge branch 'master' into fix_google_vr_height	2017-10-13 12:53:35 +02:00
druiz17	83d2a54b0f	fixed some bugs	2017-10-12 13:48:21 -07:00
beholder	c31aa6bcdb	8213 Keyboard Input Field: Reveals Passwords	2017-10-12 22:08:46 +03:00
vladest	45f1f074df	Reduce combobox dropdown height taking keyboard in account	2017-10-12 20:52:40 +02:00
Zach Fox	30d6c78e4e	Merge pull request #11580 from ElderOrb/case8210 ... 8210 Keyboard Input Field: Pressing Space should Clear Field	2017-10-12 11:49:18 -07:00
vladest	67ee4a7679	Merge branch 'master' into webbrowser_updates	2017-10-12 20:15:53 +02:00
Zach Fox	1227168939	Merge pull request #11575 from ElderOrb/QTBUG-49297 ... workaround for https://bugreports.qt.io/browse/QTBUG-49297	2017-10-12 10:56:45 -07:00
druiz17	a6bc6a09a5	Merge branch 'master' of github.com:highfidelity/hifi into bug-hud-module	2017-10-12 10:34:17 -07:00
vladest	2d010980b0	Removed special sound for Mute and replace it with hover and click sounds	2017-10-12 19:15:09 +02:00
vladest	35b146b59a	Added sounds in Audio menu	2017-10-12 19:01:38 +02:00
vladest	b965049651	Do not produce sound and highlight on disabled items and menu separators	2017-10-12 18:39:26 +02:00
vladest	145149fedd	Merge branch 'master' into tablet_extended_sounds	2017-10-12 18:01:23 +02:00
vladest	337a74b281	Merge branch 'master' into fix_google_vr_height	2017-10-12 15:18:24 +02:00
beholder	f31316b0aa	8210 Keyboard Input Field: Pressing Space should Clear Field	2017-10-12 15:03:32 +03:00
beholder	dcdf85b08e	workaround for https://bugreports.qt.io/browse/QTBUG-49297	2017-10-12 02:10:09 +03:00
druiz17	42cab19ab2	generialze window search	2017-10-11 16:04:35 -07:00
vladest	85f2606582	Merge branch 'master' into tablet_home_paginate	2017-10-11 22:16:42 +02:00
vladest	726377db45	Refactor to SwipeView	2017-10-11 22:14:01 +02:00
druiz17	8f3fa08b1e	hud module intersects with stats window	2017-10-11 11:41:10 -07:00
Zach Fox	99109fe8e5	Merge pull request #11567 from zfox23/commerce_daveIntegration3 ... 2017-10-10 Commerce Frontend Updates	2017-10-11 11:07:03 -07:00
Zach Fox	3f0ec73be6	Fix date displays	2017-10-11 10:55:14 -07:00
Zach Fox	5e383e2b1c	My Item certificates	2017-10-10 14:56:17 -07:00
Dante Ruiz	742cf0debe	Merge pull request #11383 from ElderOrb/case7384 ... 7384 On Domains without Edit Access, Create Button Text still Highlights	2017-10-10 14:30:49 -07:00
Sam Gateau	f143c28625	Merge pull request #11542 from SamGondelman/bubbleBoy ... Move HUD and HUD overlay rendering out of display plugin	2017-10-10 14:26:20 -07:00
Zach Fox	702528a8cc	Fully integrate cert properties	2017-10-10 13:27:17 -07:00
vladest	33f74103b8	Merge branch 'master' into tablet_home_paginate	2017-10-10 21:55:04 +02:00
Zach Fox	1c0a564155	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_daveIntegration3	2017-10-10 12:36:06 -07:00
Zach Fox	b105248dd7	Merge pull request #11555 from zfox23/commerce_daveIntegration2 ... 2017-10-09 Commerce Frontend Updates	2017-10-10 12:34:30 -07:00
Zach Fox	be2b241629	Lots of progress; don't yet have some things	2017-10-10 12:20:48 -07:00
Zach Fox	8d0d9a159f	Bugfixes	2017-10-10 10:38:19 -07:00
Gerard Maguire	e5f65b5fb1	Merge branch 'master' of https://github.com/highfidelity/hifi into 21466	2017-10-10 17:44:27 +01:00
Gerard Maguire	afb03b3d2d	Avatar pitch and roll cleared	2017-10-10 16:19:31 +01:00
Cain Kilgore	583b0c521e	Open	2017-10-10 03:40:48 +01:00
Cain Kilgore	e9f4dee56d	WL 21562 - Fix the error in the Asset Browser	2017-10-10 03:39:13 +01:00
Zach Fox	b81a8a95ea	Final fixes	2017-10-09 15:23:22 -07:00
Zach Fox	38b95b5403	Instructions HTML file and flow	2017-10-09 15:07:14 -07:00
Zach Fox	733df8391f	Round 2	2017-10-09 12:27:56 -07:00
Zach Fox	acdd1e32e4	First round	2017-10-09 12:11:07 -07:00
druiz17	cd97ab0fdf	fixed looping sample sound bug	2017-10-09 11:39:57 -07:00
vladest	999e9aafa9	Merge branch 'master' into tablet_home_paginate	2017-10-08 16:12:07 +02:00
vladest	f2abb369c8	Tablet paginator initial	2017-10-08 16:09:01 +02:00
Thijs Wenker	77a36bf788	Merge pull request #10892 from ctrlaltdavid/vr-edit-a ... VR edit app	2017-10-07 02:19:00 +02:00
SamGondelman	7e6d5d9d98	merge with master	2017-10-06 14:57:08 -07:00
Gerard Maguire	93caa7e259	Merge branch 'master' of https://github.com/highfidelity/hifi into 21466	2017-10-06 17:52:42 +01:00
Zach Fox	051b63503c	Merge pull request #11534 from zfox23/commerce_daveIntegration1 ... Commerce backend changes sync, October 5 2017	2017-10-06 09:45:45 -07:00
vladest	abcaefae17	Merge branch 'master' into fix_google_vr_height	2017-10-06 14:54:55 +02:00
David Rowe	28c7ef2e97	Merge branch 'master' into vr-edit-a	2017-10-06 11:54:08 +13:00
Zach Fox	0b600a74c3	Fix passphrase input focus problem; fix getting inventory and balance after logging in on Checkout	2017-10-05 14:34:53 -07:00
Zach Fox	9290a51685	Fix confirmed text	2017-10-05 14:03:56 -07:00
Andrew Meadows	05f2dfbbc3	Merge pull request #11529 from vladest/fix_audiotab_name_alignment ... Fix alignment of audio devices input header	2017-10-05 13:50:29 -07:00
Zach Fox	8e82095135	Number sold and limited run	2017-10-05 12:46:20 -07:00
Zach Fox	d605bd9ef4	Preprocess inventory endpoint result	2017-10-05 11:01:15 -07:00
Ryan Huffman	f0c9badbd6	Fix misspelling in lost-connection-to-atp error	2017-10-05 09:10:46 -07:00
vladest	9a92b5635d	Fix too wide web view	2017-10-05 15:17:37 +02:00
vladest	91176f4659	Merge branch 'master' into fix_google_vr_height	2017-10-05 14:38:58 +02:00
vladest	193dc83b99	Fix alignment of audio devices input header	2017-10-05 13:59:42 +02:00
Zach Fox	9d51d40af4	Merge pull request #11489 from vladest/login_dialog_rework ... Login dialog rework	2017-10-04 15:47:44 -07:00
David Rowe	63e7521711	Merge branch 'master' into vr-edit-a	2017-10-05 11:29:49 +13:00
vladest	86e8076362	Fix puntuation mode	2017-10-04 20:30:25 +02:00
vladest	0a505617df	Implemented single keyboard instance for all Tablet login dialog items	2017-10-04 19:33:36 +02:00
Zach Fox	fcafbef109	Fix buying free items using Commerce system	2017-10-04 09:34:32 -07:00
SamGondelman	fa838e4715	merge from master	2017-10-03 15:53:33 -07:00
vladest	6fddf49988	Merge branch 'master' into login_dialog_rework	2017-10-03 21:39:38 +02:00
Zach Fox	ea3da6c9dd	Merge pull request #11495 from zfox23/pop_interfaceChanges2 ... Commerce: One step closer!	2017-10-03 11:56:00 -07:00
Sam Gateau	ab8757eeb2	Merge pull request #11504 from AndrewMeadows/main-loop-stats-audit ... Tweak debug stats for more clarity	2017-10-03 11:23:16 -07:00
Zach Fox	e64b0861a1	Change passphrase working	2017-10-03 10:53:10 -07:00
David Rowe	f52df6667a	Merge branch 'master' into vr-edit-a	2017-10-03 21:50:49 +13:00
druiz17	86f580919c	remove what space	2017-10-02 17:43:43 -07:00
Zach Fox	11d0062104	Progress on buy endpoint	2017-10-02 16:57:41 -07:00
druiz17	8a0ecf4e6f	propertly determine is laser intersects with HUD UI	2017-10-02 16:46:43 -07:00
druiz17	68780f56b7	Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module	2017-10-02 14:06:26 -07:00
Andrew Meadows	8d2153d2f3	cleanup debug stats, use more correct names	2017-10-02 13:08:17 -07:00
Zach Fox	1d1b846f39	Better 'view backup instructions' behavior	2017-10-02 12:44:51 -07:00
Zach Fox	15c0a21e0e	Varied commit - styling changes, beginnings of new Wallet endpoint, etc	2017-10-02 12:19:24 -07:00
Andrew Meadows	0fc6bf1e89	Merge pull request #11471 from Atlante45/feat/auto-bake ... Asset Browser tweaks	2017-10-02 11:29:36 -07:00
vladest	bf39eb9a77	Test Tablet keyboard specific	2017-10-02 20:02:55 +02:00
Zach Fox	1ec0f5d9a0	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2	2017-10-02 09:26:59 -07:00
vladest	07ba2cce5b	Merge branch 'master' into login_dialog_rework	2017-10-02 18:24:12 +02:00
vladest	e360c1363e	Merge branch 'master' into tablet_extended_sounds	2017-10-02 18:03:49 +02:00
David Rowe	829cc8e5e6	Merge branch 'master' into vr-edit-a	2017-10-02 17:08:27 +13:00
vladest	ad32e7bdf5	Merge branch 'master' into login_dialog_rework	2017-10-01 19:27:23 +02:00
vladest	9a00468ea9	semicolons, yes	2017-10-01 19:21:30 +02:00
vladest	feafd441b1	Make sure keyboard will be rised after lowering on another click	2017-10-01 18:54:07 +02:00
vladest	c3bc67b72d	Merge branch 'master' into fix_walletsetup_focus	2017-10-01 18:24:38 +02:00
David Rowe	0daa5012ca	Enable toolbar and tablet icons to load from local script directory	2017-09-30 15:00:15 +13:00
druiz17	20918641f4	saving work	2017-09-29 16:48:25 -07:00
Zach Fox	e6ea76eefe	Tiny language fix - Thanks Cain!	2017-09-29 15:44:44 -07:00
Zach Fox	4668294389	Fix login flow regression	2017-09-29 15:25:24 -07:00
Zach Fox	bbbce96407	Fix gray securityimage	2017-09-29 14:30:02 -07:00
Zach Fox	63396a2fc3	WalletScriptingInterface; wallet status refactor	2017-09-29 13:42:04 -07:00
vladest	7f6773b1f4	Added semicolons	2017-09-29 21:12:21 +02:00
SamGondelman	f7af581c71	track traversal time, rename entity server stat	2017-09-29 11:34:35 -07:00
SamGondelman	247764b679	add total entity packets in stat (kbps)	2017-09-29 11:34:34 -07:00
SamGondelman	b59ec07171	move hud rendering to render thread, still need to separate out hud overlays	2017-09-29 09:49:08 -07:00
vladest	01a0b26b90	Remove mouse area for text fields. use activeFocusOnPress property instead	2017-09-29 17:14:35 +02:00
vladest	d3cd034d61	Cleanup	2017-09-29 16:33:52 +02:00
Atlante45	af69222fdb	Fix icon name change	2017-09-28 18:34:42 -07:00
Zach Fox	a1ae13489e	Slight changes to tutorial	2017-09-28 16:41:29 -07:00
Zach Fox	2cff5c1fa6	First time Purchases tutorial	2017-09-28 15:12:55 -07:00
Zach Fox	66be558a04	My Items Interface	2017-09-28 14:04:57 -07:00
vladest	4023c40149	Cleanup	2017-09-28 22:55:01 +02:00
Zach Fox	3a537cdcc3	Make usernameDropdown collapse when clicking anywhere outside it	2017-09-28 13:21:55 -07:00
Zach Fox	3742ccbdd3	Fix keyboard focus during setup while tip is up	2017-09-28 13:12:42 -07:00
Zach Fox	751dca0761	styling updates for purchases	2017-09-28 13:06:37 -07:00
Zach Fox	68c08969ae	Update Purchases	2017-09-28 12:49:38 -07:00
vladest	769c57208c	Signup ready	2017-09-28 21:35:41 +02:00
Zach Fox	8d74487393	Use edition number; fix CONFIRMED timer	2017-09-28 10:25:05 -07:00
vladest	8d23bf38ac	Merge branch 'master' into login_dialog_rework	2017-09-28 14:55:12 +02:00
vladest	4f907aba1e	sign in reworked	2017-09-28 14:49:48 +02:00
Zach Fox	60823903cf	You own X others	2017-09-27 17:05:07 -07:00
Zach Fox	7b7e0bc78b	Updated Recent Activity	2017-09-27 16:35:35 -07:00
Atlante45	eb06c33187	Naming coding standard fix	2017-09-27 15:32:53 -07:00
Zach Fox	7ad3a5a1e3	Commerce: Tons of Interface changes (#11463) ... * canRez(Tmp)Certified() * CertifiedItem beginnings * Skeleton of verifyOwnerChallenge() * Controlled failure; updateLocation() skeletion * Controlled failure on checkout page with ctrl+f * Skeleton Purchases first-use tutorial * Initial progress on new setup * Security pic tip * Skeleton Certificate page * Updates to Certificate * General progress; setup is nearly complete * Better buttons; last step almost done * Initial progress on wallet home * Completed recent transactions * Security page * Scrollbar * Fix auth error text * PassphraseSelection * Change security pic * Minor layout changes; beginnings of emulated header * Various layout changes; wallet nav bar * Help screen * Quick onaccepted change * First pass at new purchases * Small style updates * Some error progress * Lightbox in purchases * Collapse other help answers when clicking on another * REZZED notif * Commerce Lightbox * Lots of new interactions in Purchases * Hook up 'view certificate' * Fix errors, fix close button on cert * Purchases timer; much faster filter * Add debugCheckout * Purchase updates * GlyphButton; separator; Checkout Success; Ledger fix; debug modes * Lock glyph below security pic should be white * Various fixes, round 1 * Circular mask * Passphrase change button fix; TextField error edge highlighting * Recent Activity fixes * Various changes * Standard Security Pic location * Color changes * Filter bar changes * Styling for multiple owned items * Minor language change * Header dropdown (harder than expected) * Small fixes * View backup instructions * marketplaces.js onCommerceScreen * Beginnign of new injection * Marketplace injection changes * Purchase button style changes * More button styling * MY PURCHASES button * marketplace onUsernameChanged * New help QA * Help text changes etc * Downscale security image, reducing filesize * Lots of bugfixes * Cleanup before PR * Only open cert during inspection if commerce switch is on * Help text changes * Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey * Quick glyph change * New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet	2017-09-27 14:43:51 -07:00
beholder	3677718e48	7926 Create Mode: the keyboard tray is not styled correctly	2017-09-27 21:33:18 +03:00
Atlante45	73483eef94	Update information sentence	2017-09-26 19:19:34 -07:00
Atlante45	bf984e8d1a	Fix tablet asset browser	2017-09-26 19:05:36 -07:00
Atlante45	03bd887f9a	Re-sync files	2017-09-26 18:42:50 -07:00
Atlante45	dda715e171	Update TabletAssetServer	2017-09-26 18:25:20 -07:00
Atlante45	acb0bf8d20	Asset Browser tweaks	2017-09-26 17:26:46 -07:00
anshuman64	ca4d5ef807	Merge pull request #11454 from ElderOrb/case7877 ... 7877 Unexpected Behavior when pressing Enter on Input Field	2017-09-26 16:26:42 -07:00
Andrew Meadows	909e5e86b1	Merge pull request #11442 from vladest/fix_dde_visibility ... Fix dde visibility	2017-09-26 14:19:47 -07:00
beholder	5502a639e2	7877 Unexpected Behavior when pressing Enter on Input Field	2017-09-26 01:07:47 +03:00
vladest	083b52abaf	CHeck containsMouse property for mouse area instead on hovered	2017-09-25 21:15:05 +02:00
vladest	1a2d38e31f	Removed sounds for tablet in and out, added sounds for stylus instead. Added logging for testing semi-pressed laser and keyboard sounds	2017-09-25 17:11:44 +02:00
vladest	b5f0c4d940	Added settings controls sounds	2017-09-25 16:46:36 +02:00
vladest	5a452fa981	Merge branch 'master' into tablet_extended_sounds	2017-09-25 15:40:40 +02:00
Ryan Huffman	883bdc6003	Merge pull request #11425 from Atlante45/feat/auto-bake ... Asset Browser auto-refresh	2017-09-22 13:17:04 -07:00
vladest	5aab9bf5b0	Merge branch 'master' into fix_dde_visibility	2017-09-22 21:10:21 +02:00
vladest	4d530ef173	Make sure menu items vill be created even its not visible at the moment. Cleanup warnings on app close	2017-09-22 21:08:34 +02:00
Atlante45	6cdbf0c44a	Fix RunningScripts in tablet mode	2017-09-21 15:53:27 -07:00
Atlante45	1a571d0991	Add Asset Server auto refresh	2017-09-21 14:41:59 -07:00
Andrew Meadows	6b3b3a7448	Merge pull request #11382 from ElderOrb/case6618 ... 6618 [Worklist] Add Input Field On Top of Keyboard	2017-09-21 08:54:11 -07:00
Ryan Huffman	a56303a3fe	Merge pull request #11379 from highfidelity/feat/auto-bake ... Add auto baking to Asset Server and mesh compression for FBXs	2017-09-21 08:33:51 -07:00
vladest	c48aba423a	Rename check box	2017-09-20 22:48:39 +02:00
vladest	3376786288	Added text selection on focus. Added basic check for text within url input field to decide is this something for search or for goto. Limited popup list height to do not cover virtual keyboard	2017-09-20 17:02:54 +02:00
vladest	56e6c8674a	Merge branch 'master' into webbrowser_updates	2017-09-20 14:38:09 +02:00
vladest	7a36894f76	Make sure audio device not gets unchecked	2017-09-19 23:25:41 +02:00
vladest	10f7f08171	Added peak model, missed during merging	2017-09-19 21:42:52 +02:00
vladest	6297448e90	Build fix	2017-09-19 19:49:19 +02:00
vladest	6c32783a09	Merge branch 'master' into audio_devices_split	2017-09-19 17:43:03 +02:00
vladest	e26118254f	Implemented Audio injector in Tablet scripting interface. Added missed sound events	2017-09-18 19:40:06 +02:00
vladest	bb214d7bf3	Merge branch 'master' into tablet_extended_sounds	2017-09-17 16:16:03 +02:00
Seth Alves	765031bf89	Merge pull request #11377 from vladest/create_resize ... Add resizable flag. Use the flag for Create only	2017-09-16 11:14:40 -07:00
Seth Alves	04b99ef8a5	Merge pull request #11352 from 1P-Cusack/FogBugz/Case_6107 ... [QML] Fixes FogBugz Case 6107: Can't sort on import menu (details below).	2017-09-16 11:08:59 -07:00
beholder	353bab5277	7384 On Domains without Edit Access, Create Button Text still Highlights ... (override color in states if captionColorOverride was specified)	2017-09-16 16:50:45 +03:00
beholder	871b169128	6618 [Worklist] Add Input Field On Top of Keyboard	2017-09-16 16:17:36 +03:00
Atlante45	a37642ba44	Pull Auto-Baking changes to TabletAssetServer.qml	2017-09-15 14:43:15 -07:00
Atlante45	c4d018504b	Pull Auto-Baking changes to TabletAssetServer.qml	2017-09-15 13:28:51 -07:00
vladest	de4f34aacb	Add resizable flag. Use the flag for Create only	2017-09-15 21:49:38 +02:00
Atlante45	8711823a9b	Sync up AssetServer.qml and TabletAssetServer.qml	2017-09-15 11:44:08 -07:00
Atlante45	ae14f1f88e	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake	2017-09-14 15:34:20 -07:00
LaShonda Hopper	24b6cd71fc	[Case 6107] Fixes Tablet import sorting (details below). ... This ports the fix from FileDialog to TabletFileDialog. * There appears to be 2 versions of this file: * qml/dialogs/TabletFileDialog.qml * qml/hifi/tablet/tabletWindows/TabletFileDialog.qml Testing the tablet within desktop mode works without this fix most likely because it uses qml/hifi/tablet/tabletWindows/TabletFileDialog.qml which didn't receive the same refactor pass via d3282a4e. Tested on Vive: Menu -> Edit -> Import Entities Changes Committed: modified: interface/resources/qml/dialogs/TabletFileDialog.qml	2017-09-14 14:49:49 -04:00
Seth Alves	10494cf3e0	Merge pull request #11359 from vladest/fix_runningscripts_selection ... use selection model of TreeView	2017-09-14 11:22:08 -07:00
Seth Alves	11df5a447e	Merge pull request #11310 from ElderOrb/case6718 ... 6718 PR11082: Help text cannot be dismissed by clicking on the text i…	2017-09-14 11:17:48 -07:00
vladest	61b283743e	Merge branch 'master' into tablet_extended_sounds	2017-09-14 19:52:35 +02:00
vladest	7233c47257	use selection model of TreeView	2017-09-14 15:36:12 +02:00
vladest	1860a2cb16	Experimentsl CSS injector	2017-09-14 14:40:22 +02:00
LaShonda Hopper	33c8e90e34	[QML] Fixes FogBugz Case 6107: Can't sort on import menu (details below). ... Looking through the log revealed the following warning: ".../qml/dialogs/FileDialog.qml:489: Error: Cannot assign to non-existent property 'sortOrder'" There was some refactoring to address some HMD functionality in 51b44d90 which resulted in an update to fileTableView's model. This appears to be the point at which sorting stopped working. This updates the fileTableView's sorting methods to use fileTableModel as opposed to fileTableView's model(filesModel). This appears safe given fileTableModel internally wraps around filesModel and is responsible for updating its value. I'm relatively new to QML/Qt; any comments or suggestions are welcome. Tagging @vladest since they may want to be aware given 51b44d90. Case Link: https://highfidelity.fogbugz.com/f/cases/6107 Reviewed-by: Leander Hasty <leander@1stplayable.com> Changes Committed: modified: interface/resources/qml/dialogs/FileDialog.qml	2017-09-13 16:25:36 -04:00
Atlante45	c04a6b5b88	Add error tooltip	2017-09-13 09:54:56 -07:00
Atlante45	2e84f48539	Fix QML errors	2017-09-13 09:54:55 -07:00
Atlante45	9f2b0258e9	Update baking status with the correct checkmark glyph	2017-09-13 09:54:55 -07:00
vladest	1ccf2ef690	Merge branch 'master' into fix_google_vr_height	2017-09-12 22:51:54 +02:00
vladest	92a83328c0	Follow naming convention	2017-09-12 19:17:49 +02:00
vladest	58c0141f27	Remove unnecessary code	2017-09-12 19:00:00 +02:00
vladest	08deba35ae	Take in account current WebEngine profile to make sure all features are in place, like download	2017-09-12 16:22:53 +02:00
vladest	17a923b9de	Temporarily disable WebView flickable until new solution will be investigated	2017-09-12 15:48:47 +02:00
vladest	00038664a6	Merge branch 'master' into fix_google_vr_height	2017-09-11 19:43:10 +02:00
Howard Stearns	54deef8f32	Merge pull request #11329 from davidkelly/dk/walletSSLFix ... fix wallet for new openssl	2017-09-11 10:07:12 -07:00
Andrew Meadows	a9feca18ca	Merge pull request #11317 from vladest/fix_flickable_on_wheel ... Add flickable on mouse wheel to web pages	2017-09-11 09:32:31 -07:00
vladest	ab59144018	Merge branch 'master' into fix_google_vr_height	2017-09-11 16:19:23 +02:00
vladest	c6d3bce704	Switch off Flickable	2017-09-10 18:33:04 +02:00
David Kelly	1903f65e45	oops	2017-09-08 16:58:12 -07:00
David Kelly	0a3958f743	cr feedback	2017-09-08 16:06:30 -07:00
David Kelly	99cdbbe306	and lets fix the purchases flow too	2017-09-08 14:00:09 -07:00
David Kelly	db0ecb61fd	Merge pull request #11325 from davidkelly/dk/UserHfcAccountRework ... Use new hfc account endpoint	2017-09-08 09:03:53 -07:00
David Kelly	45c8dd9dd4	cr feedback	2017-09-08 05:28:41 -07:00
vladest	832e4aa5eb	Introducong tablet audio events	2017-09-08 09:51:10 +02:00
David Kelly	efdc340c5c	Use new hfc account endpoint	2017-09-07 18:15:04 -07:00
Stephen Birarda	5e1decb02b	Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake	2017-09-07 12:06:53 -07:00
Brad Hefta-Gaub	c5098abfb9	Merge pull request #10937 from kencooke/zzmp-audio/peak-values ... Add peak values for all input devices in selection dialog	2017-09-07 11:58:50 -07:00
Howard Stearns	a0ae9ee747	Merge pull request #11311 from davidkelly/dk/walletCleanup ... wallet cleanup	2017-09-06 14:29:24 -07:00
anshuman64	94e1545e58	Merge pull request #11298 from ElderOrb/case7382 ... 7382 Create Menu does not Work on Tablet	2017-09-06 14:09:41 -07:00
vladest	31a23acb1a	Add flickable on mouse wheel to web pages	2017-09-06 23:04:58 +02:00
vladest	e17f05a337	Correct UI	2017-09-06 14:52:08 +02:00
vladest	57643bd904	Merge branch 'master' into audio_devices_split	2017-09-06 14:20:41 +02:00
David Kelly	89cda8d306	oops -- === not ==	2017-09-05 17:15:25 -07:00
David Kelly	1fd30b1e0f	fix passphrase reset	2017-09-05 17:03:11 -07:00
David Kelly	350cee5f35	Wallet cleanup	2017-09-05 16:33:16 -07:00
beholder	41d014ca0c	6718 PR11082: Help text cannot be dismissed by clicking on the text inside the box.	2017-09-06 02:11:40 +03:00
vladest	85a3771a98	Remove commented out code	2017-09-05 22:19:38 +02:00
vladest	dd6d530853	Merge branch 'master' into flickable_web_pages	2017-09-05 22:14:52 +02:00
Dante Ruiz	e69227aef8	Merge pull request #11209 from vladest/tablet_login_button ... Added login button to Tablet	2017-09-05 12:59:02 -07:00
David Kelly	3bc45aefb1	Reset passphrase fix	2017-09-05 10:04:16 -07:00
vladest	87a5a6a5b9	Merge branch 'master' into webbrowser_updates	2017-09-05 13:12:27 +02:00
vladest	6de00c7969	Implemented suggestions popup. Cleanup	2017-09-05 13:11:52 +02:00
vladest	748ef8bb87	Enable edit in combobox	2017-09-03 18:10:53 +02:00
beholder	b5faa8ac56	7382 Create Menu does not Work on Tablet	2017-09-02 18:20:00 +03:00
Atlante45	28402be37c	Fix status glyphs	2017-09-01 14:17:28 -07:00
David Kelly	90316e275a	Merge branch 'commerce_walletPassphraseModal' of https://github.com/zfox23/hifi into commerce_walletPassphraseModal	2017-09-01 13:33:23 -07:00
David Kelly	9fe6ce0337	working change passphrase. some cleanup to come	2017-09-01 13:11:56 -07:00
Zach Fox	3cf0df518f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal	2017-09-01 11:53:47 -07:00
Zach Fox	51699c9a6a	Minor changes to fonts and colors	2017-09-01 11:44:46 -07:00
Zach Fox	8fcdfa171d	Add debug button to clear passphrase	2017-08-31 16:51:39 -07:00
Zach Fox	1bfc767daf	Quick fixes	2017-08-31 16:42:14 -07:00
Atlante45	9b857eb53b	Ensure "enabled" binding stays in place	2017-08-31 16:16:43 -07:00
Atlante45	2fd2bb1e92	Auto reload after changing baking enabled	2017-08-31 16:00:55 -07:00
Zach Fox	fa25c434ca	Messages to marketplaces.js	2017-08-31 15:50:42 -07:00
Zach Fox	0a9e3e8967	Remove unnecessary code	2017-08-31 15:46:37 -07:00
Zach Fox	2c2500875f	Fixes and improvements	2017-08-31 15:39:58 -07:00
Zach Fox	eab2947d40	Auth flow	2017-08-31 15:16:29 -07:00
Zach Fox	ce32d2d420	Checkout and Purchases	2017-08-31 14:12:05 -07:00
David Kelly	cdadaa8c9c	missed one	2017-08-31 13:41:53 -07:00
David Kelly	de2ce1cd5f	warning	2017-08-31 13:23:38 -07:00
Zach Fox	21a73b2f39	Changes in what I think are the right direction	2017-08-31 13:16:10 -07:00
Atlante45	a9cfc01df3	Set Baking Enabled API	2017-08-31 13:11:27 -07:00
druiz17	98b1fe6138	Merge pull request #11266 from ElderOrb/case6819 ... 6819 - Create button not disabled	2017-08-31 12:36:08 -07:00
Zach Fox	914a6bae00	Commerce: Wallet Passphrase Modal	2017-08-31 12:18:38 -07:00
David Kelly	8fbdd207c8	display hfc in "pennies"	2017-08-31 12:10:12 -07:00
vladest	6faab9fb1c	Switch flickable on by default for list and grid tabs	2017-08-31 19:21:38 +02:00
vladest	d6a7e69275	Merge branch 'master' into webbrowser_updates	2017-08-31 15:50:04 +02:00
vladest	a80d9a22df	Added option to disable flickable for web view	2017-08-31 12:20:20 +02:00
David Kelly	962d1fc81d	Merge branch 'master' of https://github.com/highfidelity/hifi into reset-wallet	2017-08-30 15:30:29 -07:00
David Kelly	988ee8c8d1	fix image provider, couple other things	2017-08-30 15:23:54 -07:00
vladest	46ce512e3d	Merge branch 'master' into flickable_web_pages	2017-08-30 23:17:05 +02:00
vladest	b547b2573e	Added logged in property	2017-08-30 23:15:39 +02:00
Zach Fox	17d999e721	Fixes	2017-08-30 13:25:34 -07:00
vladest	903036a709	Merge branch 'master' into tablet_login_button	2017-08-30 22:12:03 +02:00
Zach Fox	580865fa5a	Add skeleton for infinite scroll	2017-08-30 12:54:26 -07:00
Zach Fox	7a7d7f95d7	Polish transaction history and prepare for whatever new design	2017-08-30 12:45:13 -07:00
Zach Fox	fb4b0f60fa	Remove most dependencies on 'onVisibleChanged'	2017-08-30 11:55:29 -07:00
howard-stearns	b8da08ca42	reset wallet	2017-08-30 11:29:43 -07:00
vladest	88b045e3a9	Switched off overboundings. More accurate calculate height	2017-08-30 20:17:11 +02:00
Zach Fox	f366743be7	Login; punctuationMode; new images	2017-08-30 11:07:03 -07:00
Zach Fox	1b48319a3f	Merge pull request #11267 from zfox23/commerce_zachsPunchlist1 ... Commerce: Zachs Punchlist 01	2017-08-30 10:10:56 -07:00
Zach Fox	6ee634b90a	Lock overlay on top of security image	2017-08-29 17:19:34 -07:00
druiz17	2a97257698	Merge pull request #11140 from ElderOrb/case6788 ... 6788: You can deselect your current view mode	2017-08-29 17:15:51 -07:00
Zach Fox	5d1170c5d6	Only make message appear after inventory received	2017-08-29 16:17:59 -07:00
Zach Fox	a9c99854f9	Haven't purchased anything yet UI	2017-08-29 15:39:07 -07:00
Zach Fox	c7ad875485	Virtual keyboard and logic	2017-08-29 15:27:53 -07:00
Zach Fox	50241078ae	Buncha punchlist items checked off	2017-08-29 14:30:00 -07:00
beholder	180acbc188	6819 - Create button not disabled	2017-08-29 23:49:44 +03:00
beholder	a0a43ebf26	show checkbox or radiobutton dependently on exclusiveGroup presence	2017-08-29 23:23:16 +03:00
vladest	fe44abdb62	Merge branch 'master' into flickable_web_pages	2017-08-29 20:49:39 +02:00
vladest	55eed37698	Start working on autocompletion	2017-08-29 20:47:09 +02:00
David Kelly	84126d8f95	cr feedback	2017-08-29 08:46:13 -07:00
David Kelly	67f25adac0	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay	2017-08-29 08:02:53 -07:00
David Kelly	a7af114144	fix wallet, use text from server in history (for now)	2017-08-28 17:04:19 -07:00
Zach Fox	22d3857501	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory	2017-08-28 15:10:17 -07:00
Zach Fox	37b6099f36	Hook up root_file_url	2017-08-28 12:46:01 -07:00
Zach Fox	1c1b841a86	Fix security images; actually do the right thing when wallet not set up	2017-08-28 12:18:53 -07:00
Atlante45	ca62e7168c	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake	2017-08-28 11:41:23 -07:00
Zach Fox	ceb38e261d	HMD Keyboard for purchases filterBar	2017-08-28 10:45:08 -07:00
David Kelly	3955624e63	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay	2017-08-28 10:13:21 -07:00
Zach Fox	ea00668725	Again to Another	2017-08-28 10:04:26 -07:00
Zach Fox	67f3b5c027	Remove quantity	2017-08-28 09:58:45 -07:00
Zach Fox	52cb1dd893	Correctly handle non-JSON items	2017-08-28 09:54:51 -07:00
Zach Fox	e293d122b1	Add security image to Checkout and Purchases	2017-08-28 09:33:30 -07:00
vladest	d8fb7300c3	Merge branch 'master' into tablet_login_button	2017-08-28 16:59:35 +02:00
vladest	e38075f7ba	Disable web engine scrollbars	2017-08-28 16:27:33 +02:00
vladest	9baf518c6a	Merge branch 'master' into flickable_web_pages	2017-08-27 12:00:05 +02:00
vladest	d4332e7776	Adopting according comments from designers	2017-08-26 20:55:16 +02:00
vladest	7796946343	Merge branch 'master' into audio_devices_split	2017-08-26 20:00:00 +02:00
Zach Fox	4c16366562	Ints aren't floats, silly!	2017-08-25 16:55:50 -07:00
Zach Fox	50f7f91d4e	Close the loop.	2017-08-25 16:49:02 -07:00
Zach Fox	a03f9592c1	Inventory to Purchases	2017-08-25 16:34:48 -07:00
druiz17	06ab8ddbb2	Merge pull request #11251 from elisa-lj11/blocks ... Blocks app accommodates updated Blocks website	2017-08-25 16:32:14 -07:00
Zach Fox	b1378816d5	Revert "MUCH faster filter!" ... This reverts commit 5173774db0.	2017-08-25 16:23:36 -07:00
Zach Fox	5173774db0	MUCH faster filter!	2017-08-25 16:15:07 -07:00
Zach Fox	ee8f5d6e7b	Filter	2017-08-25 16:08:32 -07:00
Zach Fox	d19377d2d4	Saving	2017-08-25 15:56:30 -07:00
Zach Fox	153c131482	Initial inventory progress	2017-08-25 15:28:35 -07:00
Atlante45	8a291f16ff	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake	2017-08-25 15:26:38 -07:00
Zach Fox	5487179a79	So much progress	2017-08-25 15:06:14 -07:00
David Kelly	b942faa60e	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay	2017-08-25 14:16:31 -07:00
David Kelly	f015ac3c68	get transaction history into qml	2017-08-25 13:55:38 -07:00
Zach Fox	dd9bb17791	Progress!	2017-08-25 12:13:51 -07:00
Zach Fox	e606e3dfb3	Squashed commit of the following: ... commit 453897b9e2 Author: Zach Fox <fox@highfidelity.io> Date: Fri Aug 25 10:56:53 2017 -0700 Huge cleanup!	2017-08-25 11:45:37 -07:00
Zach Fox	453897b9e2	Huge cleanup!	2017-08-25 10:56:53 -07:00
Atlante45	348be788f7	Add BakingEnabled protocol	2017-08-25 10:56:27 -07:00
Atlante45	9e6502fe92	More UI work	2017-08-25 10:54:34 -07:00
vladest	26026cb2b5	Added logout. Truncate username to 8 characters	2017-08-25 17:37:10 +02:00
vladest	be56cab8e1	Merge branch 'master' into tablet_login_button	2017-08-25 15:50:10 +02:00
vladest	36879f83eb	Added scroll bar. Cleanup	2017-08-25 15:44:07 +02:00
vladest	df09c80cd9	Merge branch 'master' into flickable_web_pages	2017-08-25 13:15:30 +02:00
Elisa Lupin-Jimenez	3a512e3072	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-24 16:50:58 -07:00
beholder	cbbe03cee7	6788: You can deselect your current view mode	2017-08-25 02:33:11 +03:00
Zach Fox	8d3c394d00	More progress	2017-08-24 16:21:41 -07:00
Elisa Lupin-Jimenez	e71823a8b5	forgot to track a file	2017-08-24 15:46:22 -07:00
Elisa Lupin-Jimenez	77f93ae84b	user agent switch allows downloads	2017-08-24 15:44:22 -07:00
Zach Fox	bdc1f7b236	Progress	2017-08-24 15:39:26 -07:00
Zach Fox	e2c74d8b88	Initial progress	2017-08-24 15:22:30 -07:00
vladest	d6079e70fb	Binding to width to make sure it will follow Tablet with when rotating	2017-08-24 23:44:53 +02:00
David Kelly	eb9436ba96	Merge pull request #11235 from davidkelly/dk/encryptFile ... Initial wallet app plus some encryption of security image	2017-08-24 13:17:14 -07:00
vladest	311dc9f0be	Merge branch 'master' into flickable_web_pages	2017-08-24 21:39:01 +02:00
vladest	c7fe845403	Move common webview flickable code to separate core file	2017-08-24 21:35:47 +02:00
David Kelly	698644c3b4	Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile	2017-08-24 10:37:58 -07:00
Zach Fox	3d0fd76997	Temp fix for inventory and buy	2017-08-24 10:24:06 -07:00
David Kelly	138534c3ff	encrypt security image	2017-08-23 15:01:09 -07:00
David Kelly	f655bf2713	Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile	2017-08-23 14:53:05 -07:00
beholder	9cd784990c	5830: Go-To menu shows up blank except for address bar	2017-08-23 23:27:02 +03:00
Zach Fox	a489267cec	Hide behind switch and remove dead code	2017-08-23 10:48:47 -07:00
David Kelly	591c031e7b	first pass still broken...	2017-08-22 16:24:25 -07:00
David Kelly	8bb7ea900a	Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile	2017-08-22 16:23:23 -07:00
David Kelly	0bd3f1728d	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/encryptFile	2017-08-22 14:40:10 -07:00
vladest	f7a704d9f4	Added current tab selection according to context	2017-08-22 23:33:09 +02:00
vladest	6f0229f450	Reworked according to designers request. Do not fall back to default audion output	2017-08-22 23:26:27 +02:00
Zach Fox	763ce73306	Taking a break now	2017-08-22 12:26:46 -07:00
Zach Fox	a31088b60f	More progress	2017-08-22 12:16:17 -07:00
Zach Fox	f1da7a6381	Checkpoint	2017-08-22 11:53:37 -07:00
vladest	e403f7266a	Merge branch 'master' into audio_devices_split	2017-08-22 20:46:03 +02:00
Zach Fox	db16035f26	Parse balance correctly	2017-08-21 15:07:54 -07:00
vladest	43d3544a0d	Fix width of html pages in Create mode	2017-08-21 17:07:24 +02:00
vladest	9fd2a742a9	Fix QML warning. Fix AddressBar info scroll	2017-08-21 16:45:47 +02:00
vladest	3be684b973	Fixed spinner in center. Flicking only vertically	2017-08-21 16:31:25 +02:00
vladest	78e9bb6020	almost works for marketplace	2017-08-20 23:06:23 +02:00
vladest	56dedea66c	1st experimental approach	2017-08-20 17:57:14 +02:00
vladest	bad8c39444	Align user/login text right border with tablet buttons	2017-08-19 17:46:52 +02:00
vladest	3783b8a57c	Merge branch 'master' into tablet_login_button	2017-08-19 17:27:46 +02:00
Zach Fox	512a08f67f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp	2017-08-18 17:05:56 -07:00
Zach Fox	6e171d38ce	Bugfixes	2017-08-18 17:04:46 -07:00
Zach Fox	a07598c738	Bugfixes	2017-08-18 16:36:11 -07:00
Zach Fox	94da149ac8	Almost there	2017-08-18 16:28:02 -07:00
druiz17	42f6333948	Merge pull request #11206 from vladest/goto_remove_snap ... Switch off snap behavior	2017-08-18 16:14:59 -07:00
David Kelly	1904bd3f2b	encrypting image, rough first pass, lots left	2017-08-18 16:14:10 -07:00
Zach Fox	c42a658bde	Almost-working change pages	2017-08-18 16:06:39 -07:00
Howard Stearns	188cbee781	Merge pull request #11212 from howard-stearns/asynchronous-commerce-2 ... Asynchronous Ledger Interactions with Server	2017-08-18 15:40:24 -07:00
Zach Fox	f28544e405	Show real balance	2017-08-18 14:53:55 -07:00
Zach Fox	a91c0cb169	Add 'exchange' tab	2017-08-18 14:22:25 -07:00
Zach Fox	4ff1fb8df0	Filling out home	2017-08-18 14:18:05 -07:00
howard-stearns	bd37679b65	working	2017-08-18 14:03:40 -07:00
Zach Fox	9636fad679	Updates from wireframes	2017-08-18 13:45:30 -07:00
Zach Fox	1a62f60348	Commit early and often.	2017-08-18 11:30:25 -07:00
Zach Fox	ace1e00158	MOREEEE PROGRESS	2017-08-18 10:52:42 -07:00
howard-stearns	6e34ab45d6	Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce-2	2017-08-18 10:03:33 -07:00
howard-stearns	3d401129fb	checkpoint	2017-08-18 10:03:00 -07:00
vladest	2e5e0c94f1	Added login button to Tablet	2017-08-18 15:34:15 +02:00
vladest	4eba09214c	Delegate highlighting to delegate item. Make sure ListView will not snap highlighted item	2017-08-18 08:11:29 +02:00
Zach Fox	ccf81f801d	All the pieces!	2017-08-17 17:06:48 -07:00
Zach Fox	05648bdbcb	Passphrases working	2017-08-17 16:53:38 -07:00
Zach Fox	d052b49a54	Login and picture selection done	2017-08-17 16:34:33 -07:00
Zach Fox	5f69f30551	MOAR PROGRESS	2017-08-17 16:20:50 -07:00
Zach Fox	9135e37078	Go go go go gog o	2017-08-17 15:20:17 -07:00
Zach Fox	eab16fc28c	Initial progress	2017-08-17 15:01:25 -07:00
vladest	f3969b0909	Switch off snap behavior	2017-08-17 22:28:42 +02:00
vladest	855f9d8a95	Missed qml file added	2017-08-17 21:47:48 +02:00
vladest	f77b913a14	Added input meter	2017-08-17 20:55:00 +02:00
Elisa Lupin-Jimenez	2b44608ece	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-17 10:18:40 -07:00
vladest	1a32a6fac3	Merge branch 'master' into audio_devices_split	2017-08-17 17:20:11 +02:00
vladest	d6c426d064	Reworking according new design	2017-08-17 17:17:02 +02:00
Chris Collins	9c9bcd80b8	Merge pull request #11191 from SamGondelman/logging ... Miscellaneous logging fixes	2017-08-16 15:46:32 -07:00
vladest	2cca584e58	Merge branch 'master' into audio_devices_split	2017-08-16 22:47:06 +02:00
Zach Fox	2fa1bd25a8	Clipping and mipping!	2017-08-15 16:45:46 -07:00
Zach Fox	984a5aea2c	You can now spawn infinite copies of items you've previously purchased	2017-08-15 16:32:23 -07:00
Zach Fox	5c157a7397	Move security image to top left	2017-08-15 16:24:14 -07:00
Zach Fox	ccf2d71036	V1 done	2017-08-15 16:11:34 -07:00
Zach Fox	29a9ae28e9	Fixes	2017-08-15 15:36:28 -07:00
Zach Fox	768eb7f91c	Getting closer	2017-08-15 15:02:28 -07:00
Zach Fox	b7282cc776	Lots of fixes	2017-08-15 13:46:20 -07:00
Zach Fox	528d2072f9	Bugfixes and improvements	2017-08-15 12:14:32 -07:00
Zach Fox	bddce9328b	V1	2017-08-15 11:08:03 -07:00
Elisa Lupin-Jimenez	3d7995da34	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-15 10:01:24 -07:00
SamGondelman	1c27335193	a couple logging fixes	2017-08-14 17:34:32 -07:00
Seth Alves	21cef482a5	Merge pull request #11190 from druiz17/fix-table-dialog ... Fixed unable to select items in a TreeView	2017-08-14 17:05:42 -07:00
Dante Ruiz	459f2c5cdc	fixed tab issue	2017-08-14 16:03:12 -07:00
Dante Ruiz	99617600c4	fix selection issue for TreeView.qml	2017-08-14 15:58:28 -07:00
Zach Fox	823f2fb252	Merge pull request #11181 from cain-kilgore/skybox-changer ... WL 21447 - Create a Skybox Changer	2017-08-14 15:08:03 -07:00
Cain Kilgore	e7a4bff705	Made Changes per Review, added js	2017-08-14 22:47:18 +01:00
druiz17	97aa92bc44	Merge pull request #11170 from cain-kilgore/web-browser-assets ... Added Assets for Web Browser MP Script	2017-08-14 13:50:11 -07:00
Zach Fox	199ba3bff0	Use new JSON inventory format	2017-08-14 11:55:21 -07:00
Cain Kilgore	28c81534c4	Updated Text at Top	2017-08-14 05:11:53 +01:00
vladest	b22745d57a	Fix binding loops	2017-08-12 12:52:35 +02:00
Cain Kilgore	8c9f3ae977	Skybox Changer PR	2017-08-12 01:35:48 +01:00
Zach Fox	0835b7b8e6	Bugfix	2017-08-11 16:36:26 -07:00
Zach Fox	d8e5f7a067	Small improvements	2017-08-11 16:32:35 -07:00
Zach Fox	c38837c200	Remove fixmes	2017-08-11 16:21:39 -07:00
Zach Fox	9120e678f1	Use asynchronous commerce API	2017-08-11 16:17:13 -07:00
howard-stearns	d7f83a2fdf	Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce	2017-08-11 15:53:53 -07:00
Zach Fox	a21ff75a49	Big progress!	2017-08-11 12:54:55 -07:00
howard-stearns	8ee54c7b36	Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce	2017-08-11 11:46:20 -07:00
howard-stearns	551ea921cd	Make API asynchronous, for communicating with server	2017-08-11 11:45:40 -07:00
vladest	af39b5660b	Merge branch 'master' into audio_devices_split	2017-08-11 20:42:49 +02:00
vladest	560696e41c	Split logic and interface for HMD and desktop devices. Added CheckBox control based on QQC2	2017-08-11 20:39:17 +02:00
Zach Fox	080c6da71a	Get HFC balance from QmlCommerce API	2017-08-11 10:49:11 -07:00
Zach Fox	e1064938cd	Add inventory; also fix some bugs	2017-08-11 10:31:32 -07:00
Elisa Lupin-Jimenez	6c2bf63392	Back button works	2017-08-10 17:51:19 -07:00
Elisa Lupin-Jimenez	da5bb03187	Trying to add in a back button	2017-08-10 16:34:37 -07:00
Cain Kilgore	4e81ebf85c	Added Assets for Web Browser MP Script	2017-08-10 22:53:35 +01:00
Seth Alves	d812c293e8	Merge pull request #11120 from mukulHF/bug-lock-default-scripts ... Disable the ability for a user to edit default scripts if developer settings is not enabled - adjusting values	2017-08-10 12:29:23 -07:00
druiz17	005c5a9278	Update TabletRunningScripts.qml	2017-08-10 12:26:57 -07:00
Seth Alves	f125ef04f1	Merge pull request #11150 from ElderOrb/Case6742 ... 6742: Multiple highlighted buttons	2017-08-09 17:53:55 -07:00
Zach Fox	65f9b0052f	Working buy button	2017-08-09 13:59:21 -07:00
beholder	802b5733c5	6742: Multiple highlighted buttons	2017-08-09 22:26:13 +03:00
howard-stearns	a726b01263	remove duplicated line	2017-08-09 12:11:12 -07:00
howard-stearns	1cf81495ab	basic commerce infrastructure	2017-08-09 11:50:52 -07:00
Zach Fox	4f85923517	Tons of fixes and improvements!	2017-08-08 17:58:41 -07:00
Zach Fox	871a5ff1ab	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_CheckoutQMLInvestigation	2017-08-08 15:53:22 -07:00
Gerard Maguire	47b37ac04e	Bool	2017-08-08 15:35:14 +01:00
Gerard Maguire	356f055b53	fixed missing bool	2017-08-08 15:26:21 +01:00
Gerard Maguire	6facc02125	Merge branch 'master' of https://github.com/highfidelity/hifi into 21466	2017-08-08 13:58:32 +01:00
Gerard Maguire	6f81dd53f2	Fixed avatar rotation upon teleportation using Pal ... Added "VisitUserFromPAL" to LookupTrigger enum and bool "shouldMatchOrientation" to goToUser()	2017-08-08 05:08:20 +01:00
Zach Fox	1493a310af	Beginning of stack stuff	2017-08-07 17:02:24 -07:00
Zach Fox	45424f0cfe	Prototype V1	2017-08-07 16:25:42 -07:00
Zach Fox	7e922cb2c2	Layout	2017-08-07 16:16:17 -07:00
Zach Fox	517128a939	More steps	2017-08-07 16:03:42 -07:00
Seth Alves	60895872ca	Merge pull request #11123 from vladest/attachment_speedup ... Remove snap to item. Add caching for scrolling speedup	2017-08-07 13:18:50 -07:00
Seth Alves	af1e27dc36	Merge pull request #11053 from hyperlogic/feature/secondary-pose-support ... Improved support for Vive Trackers on biceps	2017-08-07 13:11:48 -07:00
mukulHF	780644fa38	Update TabletRunningScripts.qml	2017-08-07 11:37:27 -07:00
mukulHF	fadc19d8bb	Update RunningScripts.qml	2017-08-07 11:36:37 -07:00
mukulHF	cf7b2ba547	Update LetterboxMessage.qml	2017-08-07 11:35:42 -07:00
mukulHF	3ca2bc0571	Update DesktopLetterboxMessage.qml	2017-08-07 11:35:27 -07:00
mukulHF	e9f268ff26	Update LetterboxMessage.qml	2017-08-07 10:01:50 -07:00
mukulHF	4382f22622	Update DesktopLetterboxMessage.qml	2017-08-07 10:01:26 -07:00
Brad Davis	1ecca9fd29	Merge branch 'master' into zzmp-audio/peak-values	2017-08-06 17:21:00 -07:00
vladest	3a013bf86e	Remove snap to item. Add caching for scrolling speedup	2017-08-05 13:28:08 +02:00
mukulHF	1ce1e29368	Update DesktopLetterboxMessage.qml	2017-08-04 17:44:43 -07:00
mukulHF	7aad4af533	Update LetterboxMessage.qml	2017-08-04 17:44:16 -07:00
Anthony J. Thibault	98bbe887b9	Merge branch 'master' into feature/secondary-pose-support	2017-08-04 16:11:13 -07:00
Dante Ruiz	9be60ee658	made more requested changes	2017-08-04 17:57:53 +01:00
Dante Ruiz	b72ac63662	Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts	2017-08-04 17:19:06 +01:00
vladest	9058a8e2ca	Cleanup top menu on menu reinstantiation	2017-08-04 16:36:00 +02:00
vladest	b049b0f415	Merge conflicts	2017-08-03 19:43:42 +02:00
Dante Ruiz	1e1ddf2941	making requested changes	2017-08-02 22:22:55 +01:00
druiz17	6680be2a03	Merge pull request #11103 from vladest/fix_toolbar_apps_switch ... Fix toolbar apps switch	2017-08-02 12:59:31 -07:00
vladest	7d361c69c2	Audio mic bar show only rectangle on mouse over	2017-08-02 19:52:47 +02:00
vladest	4330e31212	Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create	2017-08-02 16:32:09 +02:00
Dante Ruiz	51652482a4	Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts	2017-08-01 20:51:56 +01:00
Anthony J. Thibault	2383933252	Merge branch 'master' into feature/secondary-pose-support	2017-07-31 10:55:40 -07:00
vladest	e30e0b1a5f	Make sure Tablet will be shown with opened running scripts dialog. Fixed potential stack corruption	2017-07-31 16:45:21 +02:00
utkarshgautamnyu	f407bf6f5a	Merge pull request #11064 from highfidelity/bug/6513 ... Enabled multiple selection and deletion in Asset Browser	2017-07-28 09:46:34 -07:00
Anthony J. Thibault	6c2b6674bb	load and save shoulderConfig to settings.	2017-07-27 17:33:54 -07:00
utkarshgautamnyu	1beec26003	Update TabletAssetServer.qml	2017-07-27 15:55:55 -07:00
utkarshgautamnyu	a6a4bd5923	Update AssetServer.qml	2017-07-27 15:55:30 -07:00
utkarshgautamnyu	07fc9a6dc3	Indentation fixes	2017-07-27 14:53:49 -07:00
utkarshgautamnyu	4680911264	Enabled multiple selection and multiple deletion in asset browser	2017-07-27 14:47:30 -07:00
Anthony J. Thibault	78c6564174	Merge branch 'master' into feature/secondary-pose-support	2017-07-27 09:09:32 -07:00
Anthony J. Thibault	8dc9714282	Pass armCircumference and shoulderWidth to qml.	2017-07-27 09:08:34 -07:00
utkarshgautamnyu	71ddf1e7c1	Removed Compound Collision type	2017-07-26 10:20:17 -07:00
utkarshgautamnyu	24f4468fd5	added additional collision types to asset browser in tablet mode	2017-07-25 17:12:13 -07:00
utkarshgautamnyu	65192aa620	added additional collision types to asset browser and new model dialog	2017-07-25 17:12:13 -07:00
Anthony J. Thibault	572213daaf	Added shoulder config to Controller Settings UI ... All offset values in Controller Settings UI are now in cm.	2017-07-25 17:05:07 -07:00
Andrew Meadows	9d1fba3a3b	Merge pull request #10821 from ctrlaltdavid/21418 ... Don't execute body of controllers' plugin update methods if not enabled	2017-07-25 08:51:17 -07:00
Ryan Huffman	9421e6ebb6	Merge pull request #11029 from cain-kilgore/dominant-hands ... WL 21453 - Add a "Dominant Hand" setting	2017-07-25 08:01:31 -07:00
Cain Kilgore	f9204a7034	Now it should appear..	2017-07-25 09:03:47 +01:00
Cain Kilgore	2f857a6d1a	Forgot a file	2017-07-25 06:05:06 +01:00
Cain Kilgore	280a7a7e42	Fixing Styling, added Preference to Tablet, Moved Location to Avatar Tuning	2017-07-25 01:48:55 +01:00
Cain Kilgore	84609f27e3	Final Change - They're now Radio Boxes.	2017-07-24 23:53:03 +01:00
Cain Kilgore	9c152ddc6f	Ticking left will keep it on left, not right	2017-07-24 22:30:43 +01:00
Cain Kilgore	e6fd85f45a	Some code cleanup	2017-07-24 19:02:40 +01:00
Cain Kilgore	42742ba1f9	Changed the Return to a String "left/right" instead.	2017-07-24 18:31:16 +01:00
Stephen Birarda	26be7e1a01	Merge pull request #10999 from birarda/bug/html-path-on-mac-build ... fix create tab load on OS X	2017-07-24 10:12:40 -07:00
Cain Kilgore	a4cf27402d	Tabs and Cleanup of Code	2017-07-24 06:27:14 +01:00
Cain Kilgore	630922dd95	Dominant Hands Branch Initial Commit ... Adds a new option in the Avatar Basics section of the Avatar Settings. API Accessible Functions: MyAvatar.getUseAlternativeHand() MyAvatar.setUseAlternativeHand() Defaults to false (Right Hand). Will return True if set to Left Hand.	2017-07-24 06:18:24 +01:00
Dante Ruiz	95299244cf	fixed running scripts popup	2017-07-22 00:24:24 +01:00
Dante Ruiz	7bf3f45e39	finished the locked default scripts	2017-07-21 23:32:25 +01:00
Dante Ruiz	625b7e535a	Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts	2017-07-21 17:20:03 +01:00
Dante Ruiz	3c862c34b2	disable reload default scripts by default	2017-07-20 21:15:00 +01:00
Stephen Birarda	3936ee93f0	use default scripts path in EditTabView to fix load on OS X	2017-07-19 16:34:04 -07:00
utkarshgautamnyu	ce5ff23e70	made changes to size of content to dosplay 'choose file' button	2017-07-19 16:15:34 -07:00
Chris Collins	e99683fdcf	Merge pull request #10985 from jherico/audio_deadlock ... Trying to resolve QML / Audio deadlocks	2017-07-18 12:40:03 -07:00
Brad Davis	aab56cf2a9	Trying to resolve QML / Audio deadlocks	2017-07-17 16:21:28 -07:00
Dante Ruiz	93d1725b3c	make cursor position change based on mouse click position	2017-07-14 19:30:35 +01:00
Zach Fox	a9197509d8	Merge pull request #10965 from CainFoool/avatar-scaler ... WL 21422 - Add a scale slider for avatar size	2017-07-14 10:30:33 -07:00
Cain Kilgore	c60c8c7b13	Missed two tabs..	2017-07-14 00:59:25 +01:00
Cain Kilgore	4f8d958831	Some code cleaning, added comment for reasoning of specifying min and max in the qml	2017-07-14 00:56:42 +01:00
Cain Kilgore	d74c834f12	Fixed colour scheming and changed to a reload icon	2017-07-13 22:40:37 +01:00
Cain Kilgore	60300f5d7b	changed to icon (hopefully)	2017-07-13 22:06:44 +01:00
Cain Kilgore	f91a8c0f53	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler	2017-07-13 21:25:39 +01:00
Cain Kilgore	247e7b8bed	indentation!!!	2017-07-13 19:25:31 +01:00
Cain Kilgore	092725ad1a	a thing	2017-07-13 19:24:30 +01:00
Cain Kilgore	5329c1ce42	Fixed Indentation, removed old debug code	2017-07-13 19:23:28 +01:00
Cain Kilgore	521babb6bd	Avatar Scaler - should be PR Ready.	2017-07-13 19:18:51 +01:00
Cain Kilgore	43782a29c7	Avatar Scaler - WIP	2017-07-12 22:04:58 +01:00
Zach Fox	d786820670	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-11 16:16:37 -07:00
Ken Cooke	0da19af6f3	Stop all capture devices when Audio.qml is not visible. ... Otherwise, Windows will continue to capture audio from all attached devices (possibly causing mic audio glitches) until Interface shutdown.	2017-07-11 10:06:38 -07:00
Ken Cooke	d6eb731f3a	Merge branch 'master' into audio/peak-values	2017-07-10 21:55:11 -07:00
Zach Fox	ea62ef165c	Fix image container background	2017-07-10 16:13:45 -07:00
Zach Fox	4a74522884	Ensure tablet button shows up; protections for controller mapping	2017-07-10 15:16:16 -07:00
David Kelly	b87d69b15d	Insure spectator camera preview is up when reopening tablet	2017-07-10 13:16:08 -07:00
Dante Ruiz	89a072cfee	fixed hmd keyboard for goto	2017-07-10 19:05:07 +01:00
David Kelly	1c9c36a8c8	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreview	2017-07-10 10:22:31 -07:00
David Kelly	4843b91f47	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-10 09:50:17 -07:00
druiz17	6e44c95d53	Merge pull request #10906 from druiz17/audio-qml-fix ... Made the output audio listview dynamically change height base on content size	2017-07-07 16:48:15 -07:00
Zach Fox	dbb48cd1aa	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-07 16:03:04 -07:00
Zach Fox	e222753aac	Merge pull request #10911 from zfox23/PAL_adminFix2 ... Set admin status even if QML can't find user in PAL	2017-07-07 10:24:53 -07:00
Seth Alves	fc8b7c7cc5	Merge pull request #10904 from druiz17/window-root-spam ... fixed log spamming from windowRoot.qml in toolbar mode	2017-07-07 07:17:08 -07:00
Zach Fox	ee9cdaff90	Set admin status even if QML can't find user in PAL	2017-07-06 23:26:40 -07:00
David Kelly	b41c470064	first cut, still stereo	2017-07-06 15:59:24 -07:00
Dante Ruiz	1ac415aa14	dynamic listview height	2017-07-06 23:50:32 +01:00
druiz17	b4182fe7ac	Merge pull request #10899 from druiz17/calibration-update-2.0 ... Updates to the Calibration UI	2017-07-06 14:24:45 -07:00
Dante Ruiz	b0130896d1	fixed spamming from windowRoot.qml	2017-07-06 22:01:08 +01:00
Dante Ruiz	1fcb3b32d6	fixed letter cap	2017-07-06 20:55:19 +01:00
Seth Alves	0374d24b15	Merge pull request #10901 from druiz17/goto-keyboard-fix ... Fixed the keyboard not showing up for goto in HMD mode	2017-07-06 12:46:13 -07:00
Dante Ruiz	2d876377d5	keyboard know disappears when you click of the address line	2017-07-06 20:04:44 +01:00
Dante Ruiz	de5802418f	fixed some keybaord logic	2017-07-06 19:27:48 +01:00
Dante Ruiz	4e3dba1767	goto HMD keyboard fix	2017-07-06 19:12:52 +01:00
Dante Ruiz	9e4b5693c7	fixed merge conflicts	2017-07-06 18:49:46 +01:00
Dante Ruiz	6e1f9d275c	chnaged default head offset	2017-07-06 17:54:06 +01:00
Dante Ruiz	258c21838e	finished calibration-ui updates	2017-07-06 17:32:40 +01:00
David Rowe	cfd155c198	Merge branch 'master' into 21418	2017-07-06 16:56:10 +12:00
Dante Ruiz	6c15dffb9d	added new glyph	2017-07-06 00:45:59 +01:00
Zach Fox	39bdc20b4f	On checkbox language change	2017-07-05 16:13:36 -07:00
Zach Fox	f6583a1b87	Use correct text color for checkboxes	2017-07-05 14:46:59 -07:00
Zach Fox	0af53bb4a5	Instructions and cool static :)	2017-07-05 14:46:59 -07:00
Zach Fox	aea5779ed6	When a display texture isn't set, show preview instructions	2017-07-05 14:46:58 -07:00
Zach Fox	44cb48b17d	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-05 09:59:57 -07:00
David Kelly	373bd0cc8a	aspect ratio preserved upon blitting, minor qml tweak, warnings fixed	2017-07-03 14:23:23 -07:00
David Kelly	5f015ec77f	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-07-03 13:57:25 -07:00
Zach Fox	9411c2e732	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-03 10:24:02 -07:00
Dante Ruiz	063984f573	Merge branch 'master' of github.com:highfidelity/hifi into calibration-ui-update	2017-07-03 16:44:47 +01:00
David Kelly	073eae39b2	timer now resumes when visible again	2017-06-30 18:44:32 -07:00
Dante Ruiz	6f30cb1825	Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop	2017-07-01 00:48:49 +01:00
Dante Ruiz	51792769b5	finished vive in desktop mode	2017-07-01 00:48:36 +01:00
David Rowe	07697c5083	Merge branch 'master' into 21418 ... # Conflicts: # interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml # interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml Removed stray "Vive Controller Picks" configuration item which no longer exists.	2017-07-01 11:19:00 +12:00
Brad Davis	31d2c9980e	Merge pull request #10797 from ctrlaltdavid/21396 ... Make Leap Motion a plugin	2017-06-30 14:37:23 -07:00
David Kelly	09d959bdeb	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-06-30 14:16:01 -07:00
Zach Fox	e66b4f1761	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-30 10:12:24 -07:00
Dante Ruiz	a7e4dc1473	clean up code	2017-06-28 23:51:00 +01:00
David Rowe	be0e1a75a4	User-friendly SDL2 controller name	2017-06-29 10:03:58 +12:00
Dante Ruiz	a2df2f8472	added user activity status	2017-06-28 19:52:19 +01:00
David Kelly	b73102d063	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-06-28 08:57:04 -07:00
Vladyslav Stelmakhovskyi	51b44d9021	Implement same for HMD mode	2017-06-28 16:36:25 +02:00
Vladyslav Stelmakhovskyi	d3282a4ed0	Cleanup	2017-06-28 15:56:35 +02:00
Vladyslav Stelmakhovskyi	0d4328fa51	Merge branch 'master' into file_dialog_crash_qt59	2017-06-28 15:54:53 +02:00
Zach Fox	5d8d2fd83e	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-27 16:47:44 -07:00
Zach Pomerantz	9b72ab96ff	add peak values to qml	2017-06-27 17:51:45 -04:00
Vladyslav Stelmakhovskyi	241231c00c	file lists works, but not initial yet	2017-06-27 22:14:58 +02:00
Ryan Huffman	209a4f33b5	Merge pull request #10784 from huffman/feat/pal-replicated ... Disable silence + ban buttons for replicated users	2017-06-26 12:50:23 -07:00
Brad Hefta-Gaub	6314a8d273	Merge pull request #10782 from vladest/fix_browse_black ... Make background with default color. Fix few warnings	2017-06-26 09:50:09 -07:00
David Rowe	72d712ac76	Add "enabled" setting for Sixense; bail in update if note enabled	2017-06-26 16:43:06 +12:00
David Rowe	31714675c3	Remove unused Sixense preference and associated methods	2017-06-26 16:14:57 +12:00
David Rowe	361bc1ce03	Add "enabled" setting for SDL2 joystick; bail in update if not enabled	2017-06-26 16:00:18 +12:00
Ryan Huffman	b56cfa56c7	Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated	2017-06-23 14:23:20 -07:00
David Rowe	6e266dfbac	Merge branch 'master' into 21396	2017-06-24 09:19:12 +12:00
Brad Davis	d50c448151	Fix heap corruption coming out of running scripts dialog	2017-06-22 19:15:58 -07:00
Zach Fox	a1dfbc91da	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-22 10:27:52 -07:00
Zach Fox	a4a4ba817f	Fixup merge - whoops	2017-06-22 10:27:28 -07:00
Vladyslav Stelmakhovskyi	30714d5d25	Make background with default color. Fix few warnings	2017-06-22 16:47:40 +02:00
David Rowe	6ff8aed5e3	Merge branch 'master' into 21396	2017-06-22 23:54:15 +12:00
Seth Alves	c70365d04a	Merge pull request #10729 from druiz17/hand-pucks ... Hand pucks and Calibration UI	2017-06-21 18:10:15 -07:00
Zach Fox	af3c249ae5	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-21 17:16:10 -07:00
Dante Ruiz	c4699e00ca	added hand offsets	2017-06-21 23:10:08 +01:00
Brad Hefta-Gaub	88a4f5c576	Merge pull request #10766 from humbletim/sort-running-scripts ... Sort Running Scripts... list alphabetically	2017-06-21 13:08:47 -07:00
Ryan Huffman	0e7ddfd29f	Disable silence/ban buttons in PAL if avatar is replicated	2017-06-21 09:49:16 -07:00
Dante Ruiz	729065749f	fixed merge conficts	2017-06-21 16:59:53 +01:00
Zach Fox	8dab93e299	Merge pull request #10762 from zzmp/audio/input-select-active-level ... Add a VU meter to the active mic selection	2017-06-20 18:38:49 -07:00
Dante Ruiz	17832b6022	edited some button behavior	2017-06-21 01:38:05 +01:00
Dante Ruiz	2e329602f7	minimize diff	2017-06-21 01:13:45 +01:00
Dante Ruiz	b7286db523	fixed merge conflict	2017-06-21 01:10:54 +01:00
Dante Ruiz	2c3db0fb91	finished calibration-ui	2017-06-21 01:07:12 +01:00
Zach Pomerantz	0075d8619a	center MUTED text in InputLevel	2017-06-20 17:04:54 -07:00
Zach Pomerantz	1f7e1e8287	add level to active input selection	2017-06-20 17:04:54 -07:00
Zach Pomerantz	baafe1ad09	give Audio menu mute its own row	2017-06-20 16:15:05 -07:00
Zach Pomerantz	8e1cf763e3	Merge pull request #10756 from zzmp/audio/input-level ... Update chrome for the audio input level meter	2017-06-20 15:33:17 -07:00
Zach Pomerantz	7e84f67391	Merge pull request #10744 from zzmp/audio/output-sample ... Add "Play sample sound" to audio setting	2017-06-20 15:32:57 -07:00
Zach Pomerantz	278a122291	bring visibleChanged to standard	2017-06-20 14:04:50 -07:00
Zach Pomerantz	dc6542c615	fix typo	2017-06-20 12:20:49 -07:00
Zach Pomerantz	6823e7cae0	Audio -> HifiAudio to avoid collision	2017-06-20 12:20:14 -07:00
Zach Pomerantz	8d4307460c	Audio -> HifiAudio to avoid collision	2017-06-20 12:19:42 -07:00
Zach Pomerantz	6c776e27af	fix PlaySampleSound glyphs	2017-06-20 12:16:08 -07:00
Zach Pomerantz	ab6c8505b8	stop audio sample on visibleChanged	2017-06-20 12:15:23 -07:00
Zach Pomerantz	c33853f4cf	update AvatarInputs with MicBar	2017-06-20 11:43:02 -07:00
Zach Pomerantz	ab68c44177	MicBar tweaks	2017-06-20 11:43:02 -07:00
Zach Pomerantz	c826858458	revamp tablet MicBar	2017-06-20 11:43:02 -07:00
Brad Hefta-Gaub	cbded766b1	Merge pull request #10676 from NeetBhagat/21369 ... WL 21369 - Implement parts of the JS "console" object	2017-06-20 11:06:34 -07:00
Zach Pomerantz	7f90f8af45	Merge pull request #10746 from zzmp/audio/mute-check ... Emphasize mute state with red	2017-06-20 10:58:11 -07:00
Dante Ruiz	33b89c9d32	adding glyph and text	2017-06-20 17:26:17 +01:00
Dante Ruiz	13dff29bd5	adding calibration screen	2017-06-20 01:19:10 +01:00
Zach Pomerantz	6adfe34661	make mute red check	2017-06-19 15:07:28 -07:00
Zach Pomerantz	f0bc080502	fix tab	2017-06-19 14:51:30 -07:00
David Kelly	b4c75c3f87	working, except tablet issue	2017-06-19 14:41:42 -07:00
Zach Pomerantz	a7e1b75909	stopgap with MyAvatar.qmlPosition	2017-06-19 14:41:01 -07:00
Zach Pomerantz	d3d36324c0	play sample output sound	2017-06-19 14:41:01 -07:00
Zach Pomerantz	1bf16c4318	update fonts	2017-06-19 14:41:00 -07:00
Zach Fox	e9ba223c09	Uncheck 'disable preview' when opening Spectator app	2017-06-19 13:40:50 -07:00
Dante Ruiz	cfffb74a29	Merge branch 'master' of github.com:highfidelity/hifi into hand-pucks	2017-06-19 21:40:26 +01:00
Dante Ruiz	734cde33e7	better calibrate button	2017-06-19 21:40:09 +01:00
Zach Fox	d0b68b8c32	First steps - also make letterbox closable only when clicking on gray	2017-06-19 11:46:56 -07:00
Zach Fox	08eb07242d	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-19 10:31:31 -07:00
Vladyslav Stelmakhovskyi	36ff765d7f	Make sure registered object have different name from iport alias	2017-06-18 22:19:28 +02:00
Howard Stearns	532df863b9	Merge pull request #10726 from zfox23/PAL_FixGoToUser ... Fix teleporting to another user from the PAL	2017-06-16 18:08:11 -07:00
Brad Davis	0af6b3b749	Merge pull request #10719 from ctrlaltdavid/21397 ... Ensure desktop dialogs' title bars are visible	2017-06-16 17:35:18 -07:00
Dante Ruiz	da29157a3c	fixed merge conflict'	2017-06-17 00:40:50 +01:00
Dante Ruiz	2015f059c7	fixed hand calibration	2017-06-17 00:37:33 +01:00
Zach Fox	6230dcf93d	Thanks to Thoys!	2017-06-16 16:34:35 -07:00
David Kelly	6dd1e6e069	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-06-16 16:24:30 -07:00
David Kelly	5284b8dc0c	fix for upside down preview, for now	2017-06-16 15:37:25 -07:00
Zach Fox	74fde8efd7	Revert "Fix teleporting to another user from the PAL" ... This reverts commit 6b659101d5.	2017-06-16 15:33:47 -07:00
Zach Fox	6b659101d5	Fix teleporting to another user from the PAL	2017-06-16 15:09:13 -07:00
Zach Fox	7a76c9cf7f	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-16 14:59:23 -07:00
Zach Fox	749dede8b3	Start with empty string for checkbox	2017-06-16 10:08:58 -07:00
Zach Fox	3df414df36	Bugfixes and language changes	2017-06-16 10:08:58 -07:00
Zach Fox	8cf9c8708d	Allow user to click left thumbstick to switch 'MONITOR SHOWS'	2017-06-16 10:08:58 -07:00
David Rowe	3cee2b3764	Ensure desktop dialogs' title bars are visible	2017-06-16 20:10:24 +12:00
Dante Ruiz	07102cc98d	improving the ui	2017-06-16 00:25:27 +01:00
David Rowe	febd0eaf98	Add Leap Motion settings	2017-06-16 10:58:11 +12:00
Zach Pomerantz	eb4255e1ac	fix audio checkbox bindings	2017-06-15 18:21:23 -04:00
David Kelly	3d922f5db6	works, sorta, but blinks like crazy, cursor gets f-ed up...	2017-06-15 14:17:43 -07:00
Zach Pomerantz	3093a73ce1	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-15 15:04:06 -04:00
Dante Ruiz	a1782bf7d2	Merge branch 'controller-ui' into hand-pucks	2017-06-15 16:27:55 +01:00
Dante Ruiz	d65c0dfbac	Merge branch 'master' of github.com:highfidelity/hifi into controller-ui	2017-06-15 16:24:59 +01:00
NeetBhagat	a6b1b17d45	Merge branch 'master' into 21369	2017-06-15 11:04:22 +05:30
David Kelly	54dfc33b38	initial skeleton of qml objects	2017-06-14 14:36:37 -07:00
Zach Fox	6b6b6026a4	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-14 13:44:13 -07:00
Zach Pomerantz	bc44e7beaf	bring qml to standard	2017-06-14 10:25:41 -04:00
Zach Fox	37e72f25a3	Make the PAL's tab background color white	2017-06-13 16:04:14 -07:00
Zach Pomerantz	a8f69bb2e0	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-13 17:41:52 -04:00
Zach Pomerantz	e7da007acd	only show Audio menu title when appropriate	2017-06-13 17:13:39 -04:00
Dante Ruiz	ef9a211f6e	adding hand punck	2017-06-13 21:15:16 +01:00
Zach Pomerantz	20c0dac8e8	update QML with Audio.muted	2017-06-13 16:10:16 -04:00
Zach Pomerantz	bf5c70501d	rm tester script	2017-06-13 14:54:53 -04:00
Zach Pomerantz	1a046b4d91	propagate title in Audio dialog qml	2017-06-13 14:42:48 -04:00
NeetBhagat	9646eba873	Complete console.trace and added a testcases for all 13 functions.	2017-06-13 23:52:48 +05:30
Zach Fox	7d1a7f4c0b	Merge branch 'master' of https://github.com/highfidelity/hifi into ... spectator-camera - INCLUDING MERGE CONFLICT FIXES	2017-06-13 09:42:14 -07:00
Zach Pomerantz	89bd895054	mv showAudioTools to just AvatarInputs	2017-06-13 12:31:05 -04:00
NeetBhagat	b0e9c62c12	Merge branch 'master' of https://github.com/highfidelity/hifi into 21369	2017-06-13 10:10:44 +05:30
Zach Pomerantz	b37a0239b0	up to reverb (needs cherry-picking)	2017-06-12 18:00:52 -04:00
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
Dante Ruiz	89b0e31edc	update calibrate button glyph	2017-06-12 22:21:46 +01:00
Dante Ruiz	bbe675ab72	making final changes	2017-06-12 22:01:41 +01:00
Zach Pomerantz	858b980c16	add qml Separator	2017-06-12 15:18:16 -04:00
Dante Ruiz	1b13cd6d45	saving work	2017-06-12 17:31:02 +01:00
Dante Ruiz	067fc9bb98	fixed merge conflict	2017-06-12 16:45:34 +01:00
NeetBhagat	e6a5930365	Merge branch 'master' into 21369	2017-06-12 11:17:26 +05:30
druiz17	f6ef1443c8	some more clean up	2017-06-11 12:08:45 -07:00
Dante Ruiz	ef1be931dc	preparing to clean code	2017-06-10 00:50:32 +01:00
ZappoMan	6fe20f90a3	add better debugging for audio problems ... use OS default device if settings have no values	2017-06-09 13:36:12 -07:00
Zach Fox	a4f5d327a2	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-09 11:38:35 -07:00
NeetBhagat	c5d8268007	Merge branch 'master' of https://github.com/highfidelity/hifi into 21369	2017-06-09 18:04:34 +05:30
Dante Ruiz	73e628461e	confiration update status	2017-06-09 00:44:05 +01:00
Dante Ruiz	c97ea84cbf	saving work	2017-06-08 17:44:55 +01:00
howard-stearns	fa74daf875	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-06-07 16:43:25 -07:00
Dante Ruiz	11409aae9b	connect the ui with the input plugins	2017-06-08 00:34:52 +01:00
howard-stearns	8db81ee5c9	wire up preview vs camera display in scripts	2017-06-07 16:19:36 -07:00
Zach Fox	d1719fade6	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-07 09:46:04 -07:00
NeetBhagat	ead0d42cf3	Merge branch 'master' into 21369 ... # Conflicts: # libraries/gl/src/gl/OffscreenQmlSurface.cpp # libraries/gl/src/gl/OffscreenQmlSurface.h	2017-06-07 15:47:19 +05:30
NeetBhagat	904e25c9e3	intial commit #21369 Working on clear method of console	2017-06-07 14:37:18 +05:30
Dante Ruiz	4ba1fdc323	elimated uncofigurable items from the list	2017-06-07 00:48:12 +01:00
Dante Ruiz	70ba344f1b	finished openvr ui	2017-06-07 00:25:08 +01:00
Zach Fox	6e9b083be1	Function renaming; turn cam off when changing domains	2017-06-06 15:49:15 -07:00
Zach Fox	383ef542a1	Remove 'debugSelfie.js'; Change 'HMD' to 'VR headset'	2017-06-06 14:59:26 -07:00
Zach Pomerantz	2b99f299c8	testing	2017-06-06 17:54:52 -04:00
Zach Fox	b50cf6cee6	Quick feedback from Alan	2017-06-06 14:50:01 -07:00
Zach Fox	ca05e3d0b6	Improvements to switch; switch settings persist	2017-06-06 14:17:38 -07:00
Zach Fox	afb7e72b25	Separator; Switch.qml updates; etc	2017-06-06 13:51:07 -07:00
Dante Ruiz	bb7c424d47	get ui working	2017-06-06 21:09:09 +01:00
Zach Fox	557d1c65a3	Another checkpoint; added Switch.qml	2017-06-06 11:59:23 -07:00
Zach Fox	9970802142	Another checkpoint	2017-06-06 11:59:22 -07:00
Zach Fox	1fc7094b2c	Checkpoint	2017-06-06 11:59:22 -07:00
Zach Fox	e9bb982651	First checkpoint!	2017-06-06 11:59:22 -07:00
Dante Ruiz	038ffe920a	fixing merge conflicts	2017-06-06 16:42:08 +01:00
Dante Ruiz	19b134b0ac	base ui working	2017-06-06 00:32:20 +01:00
Bradley Austin Davis	995fe11c05	Migrate to single QML engine	2017-06-05 15:14:44 -07:00
Zach Pomerantz	d8815d1dce	prep audio menu	2017-06-05 16:24:00 -04:00
Zach Pomerantz	7cb38d22c3	fix AudioBuffers to work in tablet	2017-06-05 15:06:47 -04:00
Howard Stearns	556dcd69ac	wording change regarding use of exact for floors	2017-06-03 15:48:48 -07:00
Dante Ruiz	f0f10f74c6	inpput configutration stub	2017-06-03 00:30:00 +01:00
Brad Davis	9a80a81321	Merge pull request #10565 from vladest/fix_claraio_download_clones ... Make sure that there is only one connection created for web events, s…	2017-06-01 20:42:50 -07:00
anshuman64	694d1d042d	Merge pull request #10573 from druiz17/head-puck ... Added head puck configuration	2017-06-01 16:06:00 -07:00
David Kelly	f79c9ea021	we can sort on ignored	2017-06-01 07:29:31 -07:00
David Kelly	a17886aa58	do not allow sorting on non-sortable columns in PAL	2017-06-01 07:24:03 -07:00
Zach Pomerantz	2b40ad4275	mv Audio... to Settings as dialog	2017-05-28 17:42:24 -04:00
Zach Pomerantz	8ca8c3aa69	mv AudioPreferencesDialog to AudioBuffers	2017-05-28 17:40:57 -04:00
Vladyslav Stelmakhovskyi	bcee25acc7	Make sure that there is only one connection created for web events, so downloads from CLARA IO not duplicated	2017-05-28 19:54:41 +02:00
Dante Ruiz	a45bea2c90	fixed merge conflicts	2017-05-27 00:57:09 +01:00
Sam Gateau	f9c6cecb23	Merge pull request #10529 from samcake/ambient ... Fix compressed texture size evaluation and Cleaning up the texture counters (number and memory) for better reporting	2017-05-24 10:48:21 -07:00
Brad Hefta-Gaub	eca045714b	Merge pull request #10532 from ctrlaltdavid/21344 ... Display spinner in Web controls when they're loading an HTTP page	2017-05-23 16:39:17 -07:00
Thijs Wenker	962d95ca46	add more precision to attachment scale in attachment dialog	2017-05-23 18:16:08 +02:00
David Rowe	bc4af86b57	Display spinner in Web controls when they're loading an HTTP page	2017-05-23 15:40:35 +12:00
samcake	e0487f7e04	Solving the size evaluation for compressed format	2017-05-22 16:51:54 -07:00
samcake	e4f9f2935e	Solving the size evaluation for compressed format	2017-05-22 15:42:18 -07:00
samcake	80b6fd65ae	Cleaning up counters and naming schemes...	2017-05-17 18:31:28 -07:00
Zach Fox	b9ddc3b19f	Improve robustness of display name focus in PAL	2017-05-16 16:25:22 -07:00
David Kelly	a9716313be	cr feedback -- really good feedback in fact	2017-05-11 17:02:37 -07:00
David Kelly	ae5f9e4fb1	animate scroll of partially visible cards	2017-05-11 15:10:19 -07:00
druiz17	e4df4369ad	Merge pull request #10436 from druiz17/config-ui ... Added the ability to choose puck configuration from the general settings	2017-05-11 13:39:05 -07:00
Vladyslav Stelmakhovskyi	bd6ac7a39e	Code style fixes	2017-05-11 20:38:09 +02:00
Dante Ruiz	4365907462	drop down puck configuration for gernal settings	2017-05-10 22:12:11 +01:00
Vladyslav Stelmakhovskyi	2328da3c48	Merge branch 'master' into audio-source-sync	2017-05-10 21:22:40 +02:00
Vladyslav Stelmakhovskyi	2d46f9d30e	Move most of the logic to C++ model, speed up initialization. Reduce number of AudioClient blocking calls to minimum	2017-05-10 21:21:39 +02:00
Zach Fox	cf3c10c5b1	Fix the bugs, add the feature	2017-05-09 14:40:41 -07:00
Vladyslav Stelmakhovskyi	7ab6909c77	Merge branch 'master' into audio-source-sync	2017-05-09 11:08:08 +02:00
David Rowe	116175cf9f	Fix going back from Twitter password recovery page	2017-05-09 09:03:48 +12:00
David Rowe	c8328e9b9f	Merge branch 'master' into 21319	2017-05-09 08:04:27 +12:00
Vladyslav Stelmakhovskyi	fa9a4053ca	Save selected device in settings to make sure it will not be changed back in Menu	2017-05-08 21:24:46 +02:00
Vladyslav Stelmakhovskyi	d0111ac0bb	Merge branch 'master' into audio-source-sync	2017-05-08 20:09:34 +02:00
David Rowe	1b26ba22cb	Fix browser history in goto "i" pages on tablet	2017-05-06 11:13:13 +12:00
Zach Fox	6b00688289	Merge pull request #10392 from zfox23/AvailabilityLanguageChanges ... "Set Availability" UI changes	2017-05-05 14:03:39 -07:00
Zach Fox	a10606b994	OMG language changed again	2017-05-05 11:44:59 -07:00
Zach Fox	905f36976f	New language	2017-05-05 11:28:49 -07:00
howard-stearns	2ecc71a990	Annoncement Card visual tweeks.	2017-05-05 10:49:09 -07:00
Zach Fox	b41fb952ae	UI changes - Thanks Alan!	2017-05-05 10:29:46 -07:00
Andrew Meadows	f809afae2f	Merge pull request #10363 from jherico/qmlspam ... Removing logspam on toggling scripts window	2017-05-05 08:29:12 -07:00
David Rowe	88dc6b5f61	Fix tablet Web view "back" button not greying out when disabled	2017-05-05 17:24:36 +12:00
Howard Stearns	fc9e9e1d28	Merge pull request #10374 from howard-stearns/notification-circumstances ... Notification circumstances	2017-05-04 16:18:58 -07:00
howard-stearns	9954380ce3	don't filter out the place you're at anymore	2017-05-04 14:44:48 -07:00
Andrew Meadows	7cb2bff4c5	Merge pull request #10350 from sethalves/fix-vr-2d-vr-tablet-crash ... Fix vr 2d vr tablet crash	2017-05-04 10:08:55 -07:00
humbletim	34cadfc876	sort RunningScripts by caseless filename	2017-05-04 11:22:30 -04:00
David Rowe	30604ab901	Fix some typos noticed in passing	2017-05-04 16:56:18 +12:00
David Rowe	9d92ed2b9b	Fix keyboard not appearing in social media snapshot sharing dialogs	2017-05-04 16:55:10 +12:00
David Rowe	8ae3d4e8a0	Merge branch 'master' into 21314 ... # Conflicts: # interface/resources/qml/controls/TabletWebView.qml	2017-05-04 13:10:09 +12:00
Zach Fox	affc7fc654	Merge pull request #10369 from druiz17/url-fix ... Fix tablet webview showing incorrect url.	2017-05-03 16:58:06 -07:00
Zach Fox	d28d89e8ff	Merge pull request #10368 from zfox23/palWebViewtoTabletWebView ... PAL WebView is now a TabletWebView	2017-05-03 16:51:32 -07:00
Dante Ruiz	5390a29859	tabletwebview-url-fix	2017-05-03 23:05:05 +01:00
Zach Fox	eaf819d11d	Remove FIXME	2017-05-03 14:59:07 -07:00
Zach Fox	066b2db73f	Make the change	2017-05-03 14:57:31 -07:00
Brad Davis	8e12c1959d	Removing logspam on toggling scripts window	2017-05-03 09:53:32 -07:00
David Rowe	7fdcb9b1f0	Fix numeric keys not displaying in social media sharing dialogs	2017-05-03 14:59:41 +12:00
David Rowe	7b387c52c3	Fix reliability of keyboard enabling in tablet Web pages	2017-05-03 14:42:06 +12:00
Vladyslav Stelmakhovskyi	e789b69a8e	Merge branch 'master' into audio-source-sync	2017-05-02 20:57:01 +02:00
Seth Alves	6b2caf8081	Merge branch 'master' of github.com:highfidelity/hifi into fix-vr-2d-vr-tablet-crash	2017-05-02 09:41:47 -07:00
druiz17	18368cc073	Merge pull request #10343 from druiz17/tabletwebview-fix-links ... fix Tablet webview issues of not loading correct url.	2017-05-02 08:09:22 -07:00
Seth Alves	71deac49c6	reset tablet to homescreen when going from 2d to vr	2017-05-01 17:06:15 -07:00
Howard Stearns	73c24a5240	Merge pull request #10344 from howard-stearns/announcement-styling ... goto announcement card styling	2017-05-01 16:41:39 -07:00
howard-stearns	ca5318f121	remove debugging code	2017-05-01 15:57:22 -07:00
howard-stearns	545fd1355f	cleanup	2017-05-01 15:45:26 -07:00
howard-stearns	61b738e3cd	announcment styling	2017-05-01 15:35:17 -07:00
Dante Ruiz	a08b55d5f5	minimize diff	2017-05-01 23:08:25 +01:00
druiz17	67daa4b0a9	Merge pull request #10335 from druiz17/webview-js ... Implemented of a web app to bring up the tablet webView	2017-05-01 15:03:55 -07:00
Dante Ruiz	b00d7d763a	Merge branch 'master' of github.com:highfidelity/hifi into tabletwebview-fix-links	2017-05-01 22:45:42 +01:00
Dante Ruiz	64b8237bd6	fix twitter and facebook links	2017-05-01 22:45:13 +01:00
Dante Ruiz	62870d85d3	Merge branch 'webview-js' of github.com:druiz17/hifi into tabletwebview-fix-links	2017-05-01 21:58:09 +01:00
Dante Ruiz	bb9eb98625	prevent mouse events from propagating to far	2017-05-01 21:49:57 +01:00
Dante Ruiz	c205bf0980	working on cleaner navigation	2017-05-01 21:23:38 +01:00
Dante Ruiz	763feccbe1	removed tabs	2017-05-01 18:07:42 +01:00
Dante Ruiz	9f33af479d	saving work	2017-05-01 18:04:22 +01:00
Vladyslav Stelmakhovskyi	28447cde0b	Get rid of QML errors in HMD mode. Sync Audio menu in Tablet/HMD without recreating menu items	2017-05-01 18:41:38 +02:00
druiz17	f60deb0cfc	fixed the twitter link	2017-04-30 22:55:44 -07:00
druiz17	2bf7b12c7d	open webview from tabletwebscreen	2017-04-30 15:27:34 -07:00
Howard Stearns	b6ae0a5bde	add nextTick, and cleanup	2017-04-28 20:06:13 -07:00
howard-stearns	f9debf1388	checkpoint	2017-04-28 16:53:08 -07:00
Dante Ruiz	59f84a60c5	saving work	2017-04-29 00:31:09 +01:00
Vladyslav Stelmakhovskyi	368334e07e	Merge branch 'master' into audio-source-sync	2017-04-28 23:04:17 +02:00
Vladyslav Stelmakhovskyi	d18ac6dd49	Reimplemented Tablet Audio screen using C++ model	2017-04-28 23:02:28 +02:00
Howard Stearns	0ad8f4d985	remove debugging	2017-04-28 07:15:22 -07:00
howard-stearns	aed762e986	ux	2017-04-27 17:16:03 -07:00
howard-stearns	e4f259e630	back to non-fake data	2017-04-27 13:01:33 -07:00
howard-stearns	56196c03a3	pr review	2017-04-27 12:56:32 -07:00
howard-stearns	97777a416d	Merge branch 'master' of https://github.com/highfidelity/hifi into new-address-bar	2017-04-27 12:02:02 -07:00
anshuman64	d146431e9b	Merge pull request #10268 from druiz17/input-recorder ... Input recorder/ input playback system for all input actions	2017-04-26 16:20:20 -07:00
Zach Fox	9ace7a7488	Merge pull request #10279 from andrewd440/21174 ... 21174 Make the Particle Emitter Easier to Use	2017-04-26 15:35:29 -07:00
Andrew Lowry	d3a9114676	Uses spaces instead of tabs for Edit.qml and EditTabView.qml.	2017-04-26 18:29:38 -04:00
anshuman64	5bd9b2e631	Merge pull request #10130 from ctrlaltdavid/21249 ... New avatar record and playback script	2017-04-26 15:18:30 -07:00
Dante Ruiz	95d6a451c6	fixed work mapping	2017-04-26 22:14:53 +01:00
Zach Pomerantz	532284f779	fix tablet resolve typo	2017-04-26 16:28:42 -04:00
Dante Ruiz	4df953d510	fixed text issue	2017-04-26 19:14:14 +01:00
Dante Ruiz	d8e6e8e7d0	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-26 16:53:02 +01:00
Dante Ruiz	79d827c6be	added requested features	2017-04-26 16:52:51 +01:00
Seth Alves	c7ab4994ea	Merge pull request #10282 from druiz17/tablet-webview-keyboard ... Added tabletwebview keyboard for HMD	2017-04-25 19:30:49 -07:00
David Rowe	4a5f84f4b9	Merge branch 'master' into 21249 ... # Conflicts: # libraries/audio-client/src/AudioClient.cpp	2017-04-26 13:24:18 +12:00
Atlante45	62b7855e1f	Add pending to stats	2017-04-25 15:56:23 -07:00
Dante Ruiz	851eece0e4	removed comments	2017-04-25 23:26:16 +01:00
Dante Ruiz	b78bae37be	added keyboard for tabletWebview	2017-04-25 23:22:27 +01:00
Dante Ruiz	8c020a0ec2	saving work	2017-04-25 18:01:19 +01:00
Dante Ruiz	367a6ac03c	first prototype	2017-04-24 22:09:01 +01:00
Dante Ruiz	d057dfebf0	got input recording to work	2017-04-24 19:57:38 +01:00
Andrew Lowry	6a218eaca9	Embeds colpick color picker in dat.GUI for particle explorer. ... Cleans up eslint for particleExplorer.js.	2017-04-24 13:35:37 -04:00
Andrew Lowry	aea89824c5	Switches tablet edit tab to particle explorer when particle entities are ... selected or created.	2017-04-24 13:35:37 -04:00
Dante Ruiz	64fcfd33a4	working on loading files	2017-04-21 22:38:53 +01:00
Dante Ruiz	cc34cb96e4	making ui for input recorder	2017-04-21 18:15:47 +01:00
David Rowe	daedb94b04	Merge branch 'master' into 21249	2017-04-21 14:50:28 +12:00
howard-stearns	4ea882cad1	faster initial response	2017-04-20 14:56:34 -07:00
howard-stearns	ce7145a388	Announcement cards, debug data.	2017-04-20 14:40:24 -07:00
howard-stearns	bc77eeeabd	scroll, margins	2017-04-20 13:43:55 -07:00
howard-stearns	b8e9fb67b8	old style card fonts, margins, etc.	2017-04-19 16:34:10 -07:00
howard-stearns	2512255dd0	reusable feeds	2017-04-19 16:33:02 -07:00
howard-stearns	3ce238b8a0	make feed self contained	2017-04-19 13:45:58 -07:00
David Rowe	2108300272	Merge branch 'master' into 21249	2017-04-20 08:43:00 +12:00
howard-stearns	c5f1455872	go horizontal	2017-04-19 12:47:28 -07:00
David Rowe	9088d1ef9c	Tablet version of recordings browser dialog	2017-04-19 16:15:22 +12:00
samcake	2c16b2bf3a	Expose the runtime from the engine in Stats	2017-04-18 18:12:42 -07:00
David Rowe	00b6b2a2c0	Implement desktop recordings browser dialog	2017-04-19 12:34:59 +12:00
Zach Fox	7505b82189	Merge pull request #10046 from Triplelexx/21224 ... 21224 - Allow people to save avatar bookmarks	2017-04-18 11:10:50 -07:00
David Rowe	dae6d6fb69	Stub desktop dialog to select recording to play from ATP assets	2017-04-18 11:43:42 +12:00
Dante Ruiz	31b61c3225	removed white space	2017-04-18 00:24:34 +01:00
Dante Ruiz	e46d9da98f	fixed merge conflict	2017-04-18 00:22:35 +01:00
Zach Fox	7a7cfb84e5	Remove HMD keyboard focus toggle on AddressBar input	2017-04-17 10:08:40 -07:00
Zach Fox	a623ced64e	Fix hover states on back/forward buttons	2017-04-14 12:43:07 -07:00
Dante Ruiz	863d64b2fd	removed comments and non-needed files	2017-04-14 18:06:44 +01:00
Dante Ruiz	7189d4d7fa	daving web work	2017-04-14 17:01:23 +01:00
Zach Fox	0543709081	Focus fix	2017-04-13 16:10:36 -07:00
Zach Fox	520ceebf5b	Small HMD tweaks	2017-04-13 15:52:59 -07:00
Zach Fox	d9dc8ebc41	More improvements	2017-04-13 15:48:51 -07:00
Zach Fox	71caf85a27	Quick fix!	2017-04-12 14:57:44 -07:00
David Kelly	a12407ddda	Merge pull request #10202 from davidkelly/dk/3934 ... Connection sort change	2017-04-12 10:42:04 -07:00
David Kelly	058a5b14a4	damn linter didn't run - vimrc work ahead...	2017-04-12 10:22:40 -07:00
David Kelly	9376ac646f	offline people sort change	2017-04-12 08:41:36 -07:00
Chris Collins	b07ed13023	Merge pull request #10184 from druiz17/snapshot-fix ... snapshot bug fixes	2017-04-11 13:00:46 -07:00
Dante Ruiz	9c79e62004	webview-fix	2017-04-11 18:49:40 +01:00
Dante Ruiz	d823093ddb	fixed merge conflict	2017-04-11 16:58:25 +01:00
Seth Alves	d5f5192954	Merge pull request #10174 from vladest/fix-snapshot-login-cancel ... Check if dialog was opened from StackView and then pop or just go to …	2017-04-11 07:07:29 -07:00
Chris Collins	d8581c1026	Merge pull request #10176 from vladest/snaps_hover ... Added hover to Snaps and Places	2017-04-10 16:09:43 -07:00
Seth Alves	eb281389f5	fix includeActions so places show up in All	2017-04-10 14:46:31 -07:00
Howard Stearns	99ba07dcb2	Merge pull request #10181 from davidkelly/dk/infoButtonFix ... re-enable the info button for user images on nearby tab	2017-04-10 13:27:33 -07:00
Dante Ruiz	e0f19944bc	Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix	2017-04-10 20:58:46 +01:00
Dante Ruiz	4e94aaa9e8	finished allowing to go back to previous app	2017-04-10 20:58:10 +01:00
Howard Stearns	8682df6bb7	Merge pull request #10154 from davidkelly/dk/3995 ... updated connection instructions	2017-04-10 12:43:20 -07:00
David Kelly	5fc4bbc260	re-enable the info button for user images on nearby tab	2017-04-10 12:26:34 -07:00
David Kelly	082d0964d2	oops	2017-04-10 11:08:45 -07:00
David Kelly	cd55728490	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/4036	2017-04-10 10:09:27 -07:00
David Kelly	46b6903b93	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995	2017-04-10 10:08:17 -07:00
Vladyslav Stelmakhovskyi	393b24452d	Added hover to Snaps and Places	2017-04-10 17:07:59 +02:00
David Kelly	3ea6cac45a	HMD.mounted instead of HMD.isMounted	2017-04-10 08:05:01 -07:00
druiz17	92bb7f2329	saving work	2017-04-09 18:55:53 -07:00
Philip Rosedale	c74778116a	Merge pull request #10156 from Triplelexx/21256 ... 21256 - Add packet loss % to stats	2017-04-09 18:00:01 -07:00
Vladyslav Stelmakhovskyi	7628916db6	Check if dialog was opened from StackView and then pop or just go to home menu	2017-04-09 20:09:15 +02:00
Seth Alves	aa89903a9f	Merge pull request #10160 from vladest/tabletwebview-yahoo-fix ... Yahoo, Reddit etc now works correctly	2017-04-08 20:25:18 -07:00
Dante Ruiz	86c67a3017	tablet pages	2017-04-08 02:01:21 +01:00
Chris Collins	8e12f62cbb	Merge pull request #10153 from druiz17/goto-fix ... Ability to toggle goto with the crt-l and enter keys	2017-04-07 16:36:41 -07:00
Chris Collins	1175f65cb0	Merge pull request #10162 from vladest/goto-white-buttons-fix ... Check if offset outside image, set to last image	2017-04-07 15:58:48 -07:00
David Kelly	948a821824	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995	2017-04-07 14:30:22 -07:00
David Kelly	174b2978e3	username stays around now when tabbing to connections	2017-04-07 14:01:36 -07:00
Howard Stearns	57d8ec883e	Merge pull request #10163 from davidkelly/dk/3938 ... updated availability combo dialog	2017-04-07 13:57:17 -07:00
Seth Alves	03065ee6c8	Merge pull request #9938 from kunalgosar/jsRenderBug ... Stop WebEntities Running Files and Commands	2017-04-07 13:44:03 -07:00
Dante Ruiz	cde9310f3e	goto home button fix	2017-04-07 21:35:28 +01:00
Dante Ruiz	909fda98a4	git goto button toggle hightlight	2017-04-07 21:01:53 +01:00
David Kelly	870e003311	Scattered X glyphs around the letterbox and combo dialogs	2017-04-07 11:12:54 -07:00
Vladyslav Stelmakhovskyi	a1892b351f	Cant use underscores outside class internals	2017-04-07 19:40:46 +02:00
David Kelly	ee9bc0bfa4	updated availability combo dialog	2017-04-07 10:25:37 -07:00
Vladyslav Stelmakhovskyi	9a563ba02f	Check if offset outside image, set to last image	2017-04-07 19:17:09 +02:00
Triplelexx	fcfd206e9c	change implict conversions	2017-04-07 17:47:04 +01:00
David Kelly	12b5b91754	Merge pull request #10161 from howard-stearns/fix-pal-connections-help ... fix pal connections-tab help trigger	2017-04-07 09:34:11 -07:00
Howard Stearns	468cc7f19b	Merge pull request #10150 from davidkelly/dk/3930 ... friends checkbox speedup	2017-04-07 09:27:39 -07:00
David Kelly	cb092d67dd	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995	2017-04-07 09:01:59 -07:00
Howard Stearns	03013ecb3a	fix pal connections-tab help trigger	2017-04-07 07:30:36 -07:00
Vladyslav Stelmakhovskyi	f88ba7bc57	Yahoo, Reddit etc now works correctly	2017-04-07 15:45:33 +02:00
David Kelly	d64a803451	no need to set checked	2017-04-06 16:08:48 -07:00
David Kelly	a1c211395b	Merge pull request #10152 from howard-stearns/fix-sort-by-connections-friend-column ... fix sorting by pal connections-tab friends column	2017-04-06 15:43:21 -07:00
David Kelly	179a445f59	updated connection instructions	2017-04-06 15:21:10 -07:00
Howard Stearns	67f2cc3567	Merge pull request #10148 from davidkelly/dk/3936 ... pal selection changes	2017-04-06 14:58:46 -07:00
howard-stearns	9577102c22	fix sorting by pal connections-tab friends column	2017-04-06 14:45:08 -07:00
Dante Ruiz	a89081601c	fix merge issues	2017-04-06 22:31:47 +01:00
Dante Ruiz	52fd446d4d	toggle goto in tablet	2017-04-06 22:27:37 +01:00
David Kelly	331f2da4f8	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3936	2017-04-06 14:22:08 -07:00
Seth Alves	3c6429cdf3	Merge pull request #10103 from vladest/master-qml-bugfixes ... Master qml bugfixes	2017-04-06 14:22:06 -07:00
David Kelly	726395ac3e	friends checkbox speedup	2017-04-06 14:07:07 -07:00
Howard Stearns	f7ef587c61	Merge pull request #10138 from davidkelly/dk/3935 ... Now you can forget connections	2017-04-06 14:05:25 -07:00
David Kelly	46a7d28e16	Merge pull request #10144 from howard-stearns/notice-login-change-in-pal ... notice login/logout change in pal	2017-04-06 12:57:22 -07:00
David Kelly	e0a1422345	pal selection changes	2017-04-06 12:07:51 -07:00
howard-stearns	1d60a55d5f	notice login/logout change in pal	2017-04-06 11:20:08 -07:00
David Kelly	85c78da839	updated, plus fixed some annoying errors in logs from Pal.qml	2017-04-06 11:16:51 -07:00
Vladyslav Stelmakhovskyi	16fa7988f6	TabletWebView redesigned to single WebView instance	2017-04-06 17:53:46 +02:00
Triplelexx	f588612fc3	add audioPacketLoss % display in stats	2017-04-06 16:04:14 +01:00
David Kelly	06bd9c97bf	remove info button from avatar image	2017-04-05 18:21:54 -07:00
David Kelly	61ece265f4	now you can forget connections	2017-04-05 18:16:16 -07:00
Dante Ruiz	34f3c4abee	removed mousearea	2017-04-05 18:08:03 +01:00
Dante Ruiz	de8b7eeb27	removed commented code	2017-04-05 18:02:55 +01:00
Dante Ruiz	24b89275f2	fix new model dialog textInput	2017-04-05 18:00:43 +01:00
kunalgosar	8749428ede	dont assume no query tags	2017-04-04 13:51:34 -07:00
Kunal Gosar	e5c075f107	fix typo and namespace	2017-04-04 11:54:58 -07:00
kunalgosar	9d0667cb31	add url tag to web entities	2017-04-04 11:54:58 -07:00
kunalgosar	19ab7526d3	apply profile to relevant entities	2017-04-04 11:54:21 -07:00
kunalgosar	a0f0879087	added file type filter and interceptor	2017-04-04 11:54:21 -07:00
Lexx	af95741a7e	Merge branch 'master' into 21224	2017-04-04 18:24:49 +01:00
Howard Stearns	b0fa784267	Merge pull request #10108 from davidkelly/dk/PalImprovementsMostlyZach ... Dk/pal improvements mostly zach	2017-04-04 10:03:10 -07:00
David Kelly	08ac25473f	wording change	2017-04-04 09:53:09 -07:00
Vladyslav Stelmakhovskyi	367555acdb	Fixed BasicTableView.qml:610:17: QML Item: Binding loop detected for property width. width must be explicitly set	2017-04-04 16:35:21 +02:00
Vladyslav Stelmakhovskyi	332f9bb283	Fixed TabletMenuStack.qml:56: Error: Cannot assign [undefined] to QString. Fixed keyboardRaised undefined error	2017-04-04 16:22:40 +02:00
David Kelly	4d6886d1f4	cr feedback, plus changed 'People' to 'Connections' in a couple places	2017-04-03 17:03:14 -07:00
Seth Alves	cb787c2862	Merge pull request #10104 from druiz17/tablet-webView3.0 ... Remove unnecessary prints and code for tabletWebView.qml	2017-04-03 16:10:54 -07:00
Seth Alves	fbf2014f04	Merge pull request #10102 from vladest/tablet-ui-goto ... Put current address to location instead of inputfield	2017-04-03 16:09:58 -07:00
David Kelly	4629accc9c	style updates	2017-04-03 15:35:53 -07:00
David Kelly	2f1b6be24d	Merge branch 'PAL_v2_Zach_new' of https://github.com/zfox23/hifi	2017-04-03 10:55:55 -07:00
Dante Ruiz	3090629f77	clean up code	2017-04-03 18:51:39 +01:00
Vladyslav Stelmakhovskyi	990e1379e3	Fix warning in Audio page. Revert commented out assert in OffscreenGLCanvas: move to separate task ... (cherry picked from commit d966979c2368b159cf5b96c5fd535411cda019b8)	2017-04-03 19:33:41 +02:00
Vladyslav Stelmakhovskyi	156166ce4a	Fixed another warning in TabletAddressDialog.qml ... (cherry picked from commit 73c923bb522ad711380a2fcdaa9babe9f01a639a)	2017-04-03 19:33:13 +02:00
Vladyslav Stelmakhovskyi	9e96888534	Fixed warning: TabletAddressDialog.qml:546: Error: Cannot assign to non-existent property 'shown' ... (cherry picked from commit e70c2cdcc74f9fd43273dca268433cdefd9ecf40)	2017-04-03 19:32:09 +02:00
Vladyslav Stelmakhovskyi	6b7f3f7125	Fixed warning: TabletAddressDialog.qml:282:13: QML ListView: Cannot specify top, bottom, and verticalCenter anchors at the same time. ... (cherry picked from commit b11e245cb1b19149ff00f16b718ff4088b856f3e)	2017-04-03 19:32:09 +02:00
Vladyslav Stelmakhovskyi	849d65f95f	Fixed warning: Tablet.qml:205: TypeError: Cannot read property of null ... (cherry picked from commit b1dc14b355bc6053a0e264a057a799a4d446e347)	2017-04-03 19:32:09 +02:00
Seth Alves	c45514a557	Merge pull request #10066 from vladest/tablet-ui-connection-dialog ... Implemented no connection dialog for Tablet UI	2017-04-03 09:57:00 -07:00
Vladyslav Stelmakhovskyi	d207dae5b7	Put current address to location instead of inputfield	2017-04-02 20:02:40 +02:00
Chris Collins	cc8b52fff4	Merge pull request #10095 from druiz17/tablet-webView2.0 ... Tablet webview now uses mobile format	2017-04-01 08:33:09 -07:00
Dante Ruiz	7ca7ad5e0b	removed junk file	2017-04-01 01:53:00 +01:00
Zach Fox	f148bca1c0	More progress on ComboDialog	2017-03-31 17:12:41 -07:00
Zach Fox	8a96969471	Merge pull request #9873 from highfidelity/PAL_v2 ... PAL v2.0	2017-03-31 17:00:41 -07:00
Dante Ruiz	d1bf3e4bf2	fixed webview mobile view	2017-04-01 00:58:09 +01:00
Zach Fox	fd3167ca9c	'PEOPLE' back to 'CONNECTIONS'	2017-03-31 16:41:25 -07:00
David Kelly	8ceb6a20f0	friend/unfriend working	2017-03-31 15:05:21 -07:00
Zach Fox	6a4c2c5e12	Fix issues; checkpoint on new ComboDialog	2017-03-31 14:56:42 -07:00
Dante Ruiz	70d2d69557	Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView	2017-03-31 19:29:31 +01:00
Dante Ruiz	9658e1b8ac	better web view handling	2017-03-31 19:25:03 +01:00
Dante Ruiz	b6901bba3e	added tabletWebView.qml	2017-03-31 18:48:08 +01:00
Dante Ruiz	8f402c73b0	saving work 2.0	2017-03-31 01:18:31 +01:00
Zach Fox	05c34fb3ee	Move some things around so ComboBox works (and layout improves)	2017-03-30 15:19:19 -07:00
Zach Fox	c24b8b47a9	Minor layout changes	2017-03-30 14:08:29 -07:00
Howard Stearns	0edbf1fbd9	Merge pull request #10044 from howard-stearns/pal-backend-integration ... Pal backend integration	2017-03-30 12:55:11 -07:00
David Kelly	e66c075f8e	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-30 10:14:29 -07:00
Triplelexx	aa9a2532a9	fix for displaying "Bookmark Avatar" dialog in tablet ui	2017-03-30 13:54:33 +01:00
Dante Ruiz	cb8660c699	saving work	2017-03-30 01:34:14 +01:00
Triplelexx	50e35a220b	Merge remote-tracking branch 'upstream/master' into 21224	2017-03-30 01:25:27 +01:00
Zach Fox	4887081e2c	New PAL colors; slight layout changes	2017-03-29 16:30:24 -07:00
Zach Fox	a6ff3fcdb7	Tablet PAL bugfix; Connections help text v1	2017-03-29 15:47:19 -07:00
Anthony J. Thibault	332dfa098f	Fix for disappearing toolbar after reload all scripts	2017-03-29 14:10:26 -07:00
Howard Stearns	b8f557ca54	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration	2017-03-29 13:30:15 -07:00
Vladyslav Stelmakhovskyi	209de29b2a	Intial commit. Basically works. Need some testing	2017-03-29 17:36:05 +02:00
Vladyslav Stelmakhovskyi	9822193644	Set z-order of comboboxes to make sure lowest will no overlap higher ones	2017-03-29 14:41:18 +02:00
Howard Stearns	c795d2ca3b	Four-way discoverability. (Needs testing.)	2017-03-28 18:31:08 -07:00
Zach Fox	b776f25b3b	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-28 18:09:17 -07:00
Zach Fox	81264c998b	Revert "Merge from upstream/master" ... This reverts commit b5ba4a109d.	2017-03-28 17:39:45 -07:00
Zach Fox	b5ba4a109d	Merge from upstream/master	2017-03-28 17:37:34 -07:00
Dante Ruiz	a76e5ef8d9	improve the design of the tablet goto	2017-03-28 23:02:23 +01:00
Zach Fox	fce2049630	Trivial removal of commented code	2017-03-27 16:45:03 -07:00
Seth Alves	48ea9acfb3	Merge pull request #10016 from druiz17/tablet-goto ... Porting goto to the tablet	2017-03-27 10:04:11 -08:00
Zach Fox	e1a880a5d4	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 09:10:12 -07:00
Dante Ruiz	b8eac7abef	revoming useless code	2017-03-27 16:17:50 +01:00
Triplelexx	07e6b766b5	rename FILENAME constants	2017-03-26 23:10:50 +01:00
Triplelexx	dc64065668	Merge remote-tracking branch 'upstream/master' into 21224 ... update	2017-03-26 22:20:24 +01:00
Triplelexx	8f507942cf	change storage location ... still unsure what is best. this is consistent and doesn't require login	2017-03-25 19:10:12 +00:00
Triplelexx	c4bcacf0e0	use QueuedButton for upload dialog	2017-03-25 19:04:40 +00:00
Vladyslav Stelmakhovskyi	edb66ae704	Merge branch 'tablet-ui' into tablet-ui-audio-screen	2017-03-25 13:20:43 +01:00
Vladyslav Stelmakhovskyi	fc23c348cb	Implemented Audio settings screen for Tablet UI	2017-03-25 13:17:38 +01:00
humbletim	5d5d947ddb	updates per discussion with triplelexx	2017-03-25 04:01:02 -04:00
humbletim	630afb716f	consolidate QML->C++ triggering workaround to help compartmentalize the problem for later fixin'	2017-03-25 03:01:35 -04:00
humbletim	96f905362b	alternative way to connect the button?	2017-03-25 01:17:27 -04:00
Zach Fox	e88895935b	Revert "Actually merge from master" ... This reverts commit 056d6fbe4f.	2017-03-24 17:56:48 -07:00
Dante Ruiz	2a59139c76	trying to fix focus issue	2017-03-25 01:17:37 +01:00
Dante Ruiz	9e2768cc84	saving work	2017-03-25 01:06:21 +01:00
Triplelexx	bda1d54209	create AvatarBookmarks ... derive AvatarBookMarks and LocationBookmarks from Bookmarks, first pass at integration, QML issues noted	2017-03-24 22:58:36 +00:00
Dante Ruiz	119a71d0d1	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-goto	2017-03-24 23:55:18 +01:00
Dante Ruiz	d9046a1982	goto on the tablet	2017-03-24 23:54:54 +01:00
Zach Fox	056d6fbe4f	Actually merge from master	2017-03-24 10:10:17 -07:00
Zach Fox	915ace0087	Revert "Merge from Master" ... This reverts commit e48123b5bb.	2017-03-24 10:04:51 -07:00
Seth Alves	902e3d41d6	merge from upstream	2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub	9a38b36f59	Merge pull request #9970 from Triplelexx/21223 ... 21223 - Quat functions have naming inconsistencies	2017-03-24 08:12:11 -07:00
Dante Ruiz	a078121c46	saving work	2017-03-24 00:23:13 +01:00
Zach Fox	3f95982f34	Fix bug due to incorrect merge...	2017-03-23 14:00:50 -07:00
Zach Fox	98ee02f84f	Use OpacityMask instead of hack; fix connectionsTab	2017-03-23 10:49:31 -07:00
Zach Fox	a7623dcac8	Use OpacityMask instead of hack; fix connectionsTab	2017-03-23 10:48:44 -07:00
Dante Ruiz	ae111ff2e9	Merge branch 'tablet-goto' of github.com:fayeli/hifi into tablet-goto	2017-03-23 18:25:31 +01:00
Zach Fox	e48123b5bb	Merge from Master	2017-03-23 09:54:14 -07:00
Seth Alves	ff3fc244d1	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-23 09:50:53 -07:00
Dante Ruiz	af97c7275e	Use loadQMlSource if no stack is aviable	2017-03-23 17:03:24 +01:00
Zach Fox	692ef369c7	Attempted Stale PAL fix - hard to test!	2017-03-22 15:14:11 -07:00
Brad Davis	85c80f3be8	Merge remote-tracking branch 'upstream/master' into smarter_textures ... Conflicts: libraries/gpu/src/gpu/Texture.cpp	2017-03-22 14:25:23 -07:00
Zach Fox	bf191eabb7	Some new stale PAL behavior	2017-03-22 13:35:48 -07:00
Triplelexx	2515563a0b	change getFront to getForward	2017-03-21 22:35:07 +00:00
Zach Fox	058faa8c0f	Row color bugfix	2017-03-21 10:03:51 -07:00
Seth Alves	cc4ddd1387	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 08:43:35 -08:00
Vladyslav Stelmakhovskyi	fb0adae0b1	Scripts debug window in Tablet UI	2017-03-21 15:04:38 +01:00
Zach Pomerantz	20ea13e00a	Merge pull request #9897 from zzmp/record/noise-gate ... Add AudioNoiseGate to recordings played through Interface	2017-03-21 00:21:20 -04:00
Zach Fox	29e97381eb	PAL open, user leaves, gray out row	2017-03-20 17:20:28 -07:00
Faye Li	9cab8b6c4a	end of day commit	2017-03-20 17:04:29 -07:00
Brad Davis	e482eac437	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-20 16:22:13 -07:00
Faye Li	1d095b8158	added back forward and back button on nav bar	2017-03-20 15:57:59 -07:00
Faye Li	b6bf58d5be	rearrange layout of main tablet go to screen	2017-03-20 15:28:30 -07:00
Zach Fox	d16acc5a7f	Stale PAL Notification	2017-03-20 15:24:49 -07:00
Zach Fox	0506fc0033	New goTo() behavior; Fix goBack	2017-03-20 12:55:38 -07:00
Seth Alves	2e29ff3114	Merge pull request #9934 from fayeli/edit-import-entities ... Adding Import Entities button on the Create tab of Edit	2017-03-20 09:13:08 -08:00
Seth Alves	f48557b06b	Merge pull request #9943 from vladest/tablet-ui-login-logout ... Tablet ui login logout	2017-03-18 09:37:11 -08:00
Vladyslav Stelmakhovskyi	5335bf8862	Menu items in Tablet UI now wrapped	2017-03-18 15:58:16 +01:00
Vladyslav Stelmakhovskyi	696825580e	Merge branch 'tablet-ui' into tablet-ui-login-logout	2017-03-18 14:42:11 +01:00
Vladyslav Stelmakhovskyi	5e162a6447	Implemented login facility for tablet UI	2017-03-18 14:38:49 +01:00
Triplelexx	a9b1a38665	remove Mini Mirror from View menu ... Avatar inputs only contains the audio meter now.	2017-03-18 00:53:13 +00:00
Faye Li	33a7ff825e	indicate expecting json file on button text	2017-03-17 11:37:38 -07:00
Faye Li	6531efffbc	hook up qml button to edit.js	2017-03-17 11:22:07 -07:00
Zach Fox	fc2a501474	Cleanup JS<->QML messaging	2017-03-16 15:38:39 -07:00
David Rowe	07e4b0ce41	Fix title menu icon getting stuck on white	2017-03-17 11:28:14 +13:00
David Rowe	069e66b875	Fix stack functions	2017-03-17 11:19:50 +13:00
David Rowe	f1947769d6	Fix tablet settings dialogs' titles and make QML consistent	2017-03-17 11:15:56 +13:00
Zach Fox	b3821bb02d	fix location vs AddressManager woes	2017-03-16 12:57:21 -07:00
Zach Fox	05fec328c0	Make tablet popups work like they should	2017-03-16 10:38:46 -07:00
David Rowe	1080e21afd	Tidying	2017-03-16 19:28:28 +13:00
David Rowe	89eb073855	Fix dialog height changing as drop-down value is changed	2017-03-16 19:28:12 +13:00
David Rowe	74db9dc573	Fix drop-down hiding behind buttons	2017-03-16 19:27:47 +13:00
David Rowe	3c1506237a	Fix not all warning text displaying	2017-03-16 19:27:27 +13:00
David Rowe	7efda8bead	Make clicking on dialog background defocus current control	2017-03-16 19:27:06 +13:00
David Rowe	9e458fd180	Fix keyboard in tablet custom query dialog	2017-03-16 19:26:41 +13:00
Faye Li	10ebb6efd7	simplify asset server button	2017-03-15 16:55:21 -07:00
Faye Li	42216b6986	create import entities button on create tab	2017-03-15 16:47:31 -07:00
howard-stearns	84fd17bd88	use location.metaverseServerUrl instead of hardcoded value.	2017-03-15 16:33:23 -07:00
howard-stearns	c0c92fd8d1	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-15 15:20:28 -07:00
Vladyslav Stelmakhovskyi	856e15060d	Implemented Domain Connection statistics for Tablet UI	2017-03-15 21:05:13 +01:00
Zach Fox	786180291b	Bugfixes and improvements	2017-03-15 11:46:33 -07:00
Zach Pomerantz	789bb7c855	rename audio(Mic)OutboundPPS	2017-03-15 13:30:39 -04:00
Seth Alves	563d59bda9	Merge pull request #9886 from vladest/tablet-ui-entity-statistics ... Tablet ui entity statistics	2017-03-15 08:40:52 -08:00
Seth Alves	df82c30e83	Merge pull request #9892 from hyperlogic/bug-fix/tablet-running-scripts-improvements ... Tablet Running Scripts dialog fixes	2017-03-15 08:38:40 -08:00
Seth Alves	b5919d89a5	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-15 08:26:10 -08:00
howard-stearns	6c88bc98b4	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-15 09:24:30 -07:00
Zach Fox	0a6bcd7fca	Massive performance boost	2017-03-14 16:24:06 -07:00
Anthony J. Thibault	3a788d31de	Tablet Running Scripts dialog fixes ... * The "Currrently Running" section is now visible by default, this includes the "Reload All" and "Remove All" buttons * The entire dialog is flickable/scrollable. We need to do this because the entire dialog is too tall to fit on the tablet. * The keyboard now appears when the filter edit text has focus. The content is scrolled in such away that the focus edit field, and the tree view are above the keyboard.	2017-03-14 15:38:53 -07:00
Zach Fox	5da0dfc4ac	Merging from Pal_v2_Zach	2017-03-14 14:05:50 -07:00
Dante Ruiz	4c686eaa67	fix tablet menu stack focus issue	2017-03-14 21:20:41 +01:00
Vladyslav Stelmakhovskyi	e2a4011b05	Coloring implemented	2017-03-14 19:10:41 +01:00
Vladyslav Stelmakhovskyi	56d4bfe077	Servers stats added. TODO: coloring	2017-03-14 18:38:49 +01:00
Vladyslav Stelmakhovskyi	d9ca8a826d	TabletEntityStatistics.qml refactored. Text now wrapped. TODO: coloring, server stats	2017-03-14 17:02:09 +01:00
Vladyslav Stelmakhovskyi	99c74cec41	Merge branch 'tablet-ui' into tablet-ui-entity-statistics	2017-03-14 15:59:27 +01:00
Vladyslav Stelmakhovskyi	0accce5337	TabletComboBoxPreference.qml not needed anymore	2017-03-14 15:53:41 +01:00
Vladyslav Stelmakhovskyi	ee7dd458ca	Merge branch 'tablet-ui' into tablet-ui-graphics	2017-03-14 15:37:36 +01:00
Seth Alves	c89a4c4786	Merge pull request #9874 from hyperlogic/bug-fix/toolbar-fade ... Fix for visible empty toolbar when switching from desktop to HMD mode.	2017-03-14 05:33:54 -08:00
Seth Alves	f8a6a82371	Merge pull request #9881 from ctrlaltdavid/21197 ... Browse for avatar in Marketplace from tablet avatar settings dialog	2017-03-14 05:33:11 -08:00