2294 commits

Author	SHA1	Message	Date
vladest	5127cb0ea6	Merge branch 'master' into menu-updates	2018-05-16 14:37:00 +02:00
John Conklin II	a6cda2166a	Merge pull request #13158 from highfidelity/stable ... RC67.1 stable mergeback to master	2018-05-15 14:01:06 -07:00
vladest	7ea6181520	Merge branch 'master' into menu-updates	2018-05-15 21:54:45 +02:00
Zach Fox	ccab2dd641	Starting the work	2018-05-15 11:48:33 -07:00
vladest	e2a8ee2a4c	Fixed About date format. Increased space between logo and build info	2018-05-15 20:02:29 +02:00
vladest	a6ef459723	Open browser within Interface	2018-05-15 16:07:32 +02:00
vladest	fee3cc0aca	Implemented backend for About dialog	2018-05-15 15:49:20 +02:00
vladest	58f04121b7	Correct link colors	2018-05-15 06:22:10 +02:00
Dante Ruiz	82422edb59	fixinig the controller settings page and have menu option on by default	2018-05-14 18:51:39 -07:00
vladest	2a3004079e	About UI	2018-05-14 23:22:06 +02:00
Zach Fox	83cae54601	Show 'invalidated' label for valid = false	2018-05-14 13:34:20 -07:00
Zach Fox	2a1c2ba7b1	PurchasedItem logic	2018-05-14 09:54:05 -07:00
Zach Fox	81ebb681bb	Show invalidated items in My Purchases	2018-05-14 09:35:34 -07:00
vladest	f8ebe7e669	remoed no more used LOD dialogs. Fixed Slider properties min and max settings	2018-05-12 16:01:43 +02:00
Anthony J. Thibault	0ac12fa317	Bug fix for Vive Tracker Calibration Settings ... This issue was inadvertently introduced by the name change of the Vive display plugin.	2018-05-10 17:56:54 -07:00
vladest	62aa2df836	Merge branch 'master' into menu-updates	2018-05-10 10:36:38 +02:00
Zach Fox	22c26c348d	MS14937: Fix Replace button for content sets during Checkout	2018-05-08 16:37:11 -07:00
Zach Fox	540f200b99	MS14937: Fix Replace button for content sets during Checkout	2018-05-08 16:34:28 -07:00
John Conklin II	286bed25bd	Merge pull request #13106 from zfox23/RC67_MS14758 ... RC67: MS14758: Fix avatar reset when gifting worn avatar	2018-05-07 10:10:41 -07:00
vladest	c7ab1f3dbf	Merge branch 'master' into menu-updates	2018-05-05 20:48:40 +02:00
vladest	5a5bfcfe02	Merge branch 'master' into menu-updates	2018-05-05 07:11:39 +02:00
Zach Fox	4ebed7605c	MS14758: Fix avatar reset when gifting worn avatar	2018-05-04 16:04:05 -07:00
John Conklin II	b314d496ec	Merge pull request #13103 from zfox23/MS14699_clearCachedPasscode ... MS14699: Prevent Wallet passcode from being sticky in certain cases	2018-05-04 15:22:41 -07:00
Zach Fox	53fe0bc616	MS14699: Prevent Wallet passcode from being sticky in certain cases	2018-05-04 14:08:21 -07:00
Zach Fox	e48d39ec38	MS14758: Fix avatar reset when gifting worn avatar	2018-05-04 10:10:48 -07:00
Gabriel Calero	c15ef56d90	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-05-02 14:38:10 -03:00
vladest	ea66e04ab8	Removed unwanted code	2018-05-02 18:58:40 +02:00
vladest	aef62d09c7	Merge branch 'master' into menu-updates	2018-05-01 21:47:46 +02:00
vladest	617b49fe14	Added mouse sensivity UI. Reworked advanced movements. TODO: properties interface complitely broken in Tablet mode	2018-05-01 21:22:48 +02:00
Zach Fox	9b80c500e3	Merge pull request #13039 from zfox23/sideloadAppJson ... Enable sideloading .app.json Apps from local disk	2018-04-30 11:14:24 -07:00
vladest	be22f49c32	Merge branch 'master' into menu-updates	2018-04-28 20:22:28 +02:00
Zach Fox	dbd7d7e2b4	Small cleanup	2018-04-27 14:19:58 -07:00
Zach Fox	ea716f2a1e	Enable sideloading .app.json Apps from local disk	2018-04-27 14:08:53 -07:00
Zach Fox	c0fe504713	Merge pull request #13030 from zfox23/finalize_14295_14559 ... Finalize work on MS14295 and MS14559	2018-04-27 13:49:02 -07:00
Zach Fox	684d2b08ba	Finalize work on MS14295 and MS14559	2018-04-27 12:03:54 -07:00
Howard Stearns	f8ad36afd0	Merge pull request #13028 from zfox23/updateCommerceFor67 ... Allow gifting of Pending items; remove PoP verification rescheduling on Pending items	2018-04-27 11:55:40 -07:00
Zach Fox	bbc15cdc63	Finalize work on MS14295 and MS14559	2018-04-27 11:04:46 -07:00
Zach Fox	c163ae63b8	Allow gifting of Pending items; remove PoP verification rescheduling on Pending items	2018-04-27 10:28:59 -07:00
Zach Fox	0f36fb113d	Allow gifting of Pending items; remove PoP verification rescheduling on Pending items	2018-04-27 10:20:55 -07:00
Brad Hefta-Gaub	e4f5eb9cca	Merge pull request #13020 from zfox23/MS14295_GiftsUIFixes ... MS14295: Fix lingering Gifts UI Bugs	2018-04-27 07:30:14 -07:00
Zach Fox	e3b14bf478	MS14295: Fix lingering Gifts UI Bugs	2018-04-26 15:57:37 -07:00
Zach Fox	fc324f67bd	MS14559: Fix sometimes being unable to click on 'Nearby' orb when sending Gift/HFC	2018-04-26 15:09:53 -07:00
vladest	3296ae0db8	Merge branch 'master' into menu-updates	2018-04-26 22:21:40 +02:00
John Conklin II	236e75b6c6	Merge pull request #12903 from druiz17/add-more-hmd-data ... Get the correct device name connect to OpenVr	2018-04-24 13:29:41 -07:00
vladest	2b716f051c	Merge branch 'master' into menu-updates	2018-04-20 19:34:15 +02:00
vladest	0e28e41107	Fix various issues with SpinBox-es and Sliders	2018-04-20 19:15:29 +02:00
Gabriel Calero	adfbaac18f	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-19 19:40:00 -03:00
Gabriel Calero	f2184bf456	Handle android back button. Remove unused resources. Fix compilation errors.	2018-04-19 17:31:25 -03:00
vladest	ab1a89a6f9	Merge branch 'master' into menu-updates	2018-04-19 21:02:30 +02:00
Howard Stearns	6d151f022d	Merge pull request #12910 from zfox23/MS12217_letterboxMessageFix ... Only dismiss letterbox when clicking on grey areas	2018-04-19 11:47:10 -07:00
Gabriel Calero	c8fe45eb8f	Remove debug statements and unused code. Put JNI code in a separated file.	2018-04-19 11:41:59 -03:00
vladest	60d53359bb	Fix Toolbar vertical position	2018-04-19 11:39:58 +02:00
Zach Fox	e01e7cc7bc	Be a bit more efficient	2018-04-18 16:34:02 -07:00
vladest	7b21b36d3c	Disable menu button in Toolbar mode	2018-04-18 22:19:54 +02:00
Dante Ruiz	9d6fc13a04	Merge branch 'master' of github.com:highfidelity/hifi into more-tablet-changes	2018-04-18 13:06:51 -07:00
Dante Ruiz	a65f5f7917	making tablet changes	2018-04-18 13:06:26 -07:00
vladest	b5071d28e8	Merge branch 'master' into menu-updates	2018-04-18 21:10:57 +02:00
vladest	cacb9359c2	Toolbar at bottom	2018-04-18 20:57:28 +02:00
vladest	c402cb2c19	Fix Desktop double windows	2018-04-17 19:51:43 +02:00
Zach Fox	93cf399fd6	Only dismiss letterbox when clicking on grey areas	2018-04-16 15:09:19 -07:00
Zach Fox	02aa8ac566	Bugfixes per QA	2018-04-16 11:53:37 -07:00
Gabriel Calero	e3b94b163c	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-16 14:55:16 -03:00
Zach Fox	071bf35683	Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018	2018-04-16 10:11:44 -07:00
Dante Ruiz	5af1ea54d3	Merge branch 'master' of github.com:highfidelity/hifi into add-more-hmd-data	2018-04-16 10:10:55 -07:00
vladest	6d53512c6c	Merge	2018-04-15 15:24:16 +02:00
Gabriel Calero	476e1cf7ae	Adjust UI with pixel perfect precision. Support devices with on-screen bars.	2018-04-12 17:59:38 -03:00
Seth Alves	46a741be7b	Merge pull request #12068 from vladest/move_to_qqc2 ... Move to qqc2	2018-04-12 11:26:55 -07:00
John Conklin II	213c35dab4	Merge pull request #12790 from WolfGangS/bugfix/12759-editoverlay-subimage ... Bugfix for #12759 Overlays.editOverlay not applying subImage property	2018-04-12 10:34:17 -07:00
Gabriel Calero	865e3a05f1	Move jump button to the right. Adjust position of buttons	2018-04-11 19:33:43 -03:00
Gabriel Calero	8010fd2420	New view selector behaviour. Update icons	2018-04-11 18:43:39 -03:00
Gabriel Calero	578012b662	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-11 16:30:53 -03:00
Zach Fox	0c9d65bc15	Merge pull request #12758 from zfox23/commerce_fixCertificateInfoError ... Commerce: Fix Certificate Info error	2018-04-11 09:38:43 -07:00
Zach Fox	a2f5891a0b	Cleanup 'Private' HMD Preview State Machine Logic	2018-04-10 16:00:18 -07:00
Zach Fox	ffab27d442	Commerce: Fix Certificate Info error	2018-04-10 15:54:55 -07:00
Zach Fox	a9b9a1cb10	Commerce: Gifts	2018-04-10 15:54:19 -07:00
Clément Brisset	c62a701a2d	Merge pull request #12838 from highfidelity/RC66 ... RC66 merge back to master	2018-04-09 13:17:12 -07:00
Gabriel Calero	e85f5c97dc	Remove bottom bar. Apply new design for android	2018-04-09 11:41:00 -03:00
Alexander Ivash	faddc556d7	FB14015 - Go To app does not close when selecting forward and back arrows on desktop	2018-04-07 17:57:22 +03:00
Zach Fox	0c48ccefa4	Clean up failResponse to make it better	2018-04-06 11:41:17 -07:00
Zach Fox	af5a68b282	Merge branch 'master' of github.com:highfidelity/hifi into commerce_fixCertificateInfoError	2018-04-06 10:58:32 -07:00
Gabriel Calero	15163f5e87	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-04 19:25:20 -03:00
WolfGang	787127b149	move subImage recalculation to it's own method	2018-04-04 22:10:54 +01:00
Howard Stearns	3a428bc44f	Merge pull request #12776 from zfox23/fixHmdPreviewAgain_1 ... Fix 'Private' HMD preview texture enable/disable...again	2018-04-04 10:03:18 -07:00
WolfGang	f9bcd23463	make subimage update the image anchors	2018-04-04 17:28:55 +01:00
Seth Alves	2df334c50e	Merge pull request #12663 from ElderOrb/FB12870 ... Fix for not updating checkbox state on 'baking' / 'unbaking'.	2018-04-04 09:03:03 -07:00
Zach Fox	f20eddefc8	Fix 'Private' HMD preview texture enable/disable...again	2018-04-03 13:46:02 -07:00
Gabriel Calero	78c50410b3	Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash	2018-04-03 14:37:19 -03:00
Zach Fox	5441767442	Better cert display	2018-04-02 12:22:41 -07:00
Gabriel Calero	2ff13270ed	Go back to GoTo screen	2018-04-02 12:22:21 -03:00
Zach Fox	32e5e9986f	Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation	2018-03-30 10:10:43 -07:00
Alexander Ivash	814cfa4587	fix TabletAssetServer	2018-03-30 00:09:28 +03:00
Alexander Ivash	e5da59a62f	FB12870 - Tablet UI ->Asset Browser unresponsive when enabling/disabling "use baked version"	2018-03-29 23:01:59 +03:00
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
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
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
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	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
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
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
Zach Fox	18aa95e0bb	New Checkout flow for updating specific Editions	2018-03-19 13:35:27 -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	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
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
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	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
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
Zach Fox	db7eea543e	Initial progress	2018-03-12 15:11:09 -07: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	fe5d7463fe	Merge branch 'master' into move_to_qqc2	2018-03-10 14:42:51 +01: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
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
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
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
NissimHadar	dbf1be5de3	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-06 15:22:40 -08: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	86b9e1b873	Merge branch 'master' into move_to_qqc2	2018-03-06 13:40:51 +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	148faa3a93	Merge branch 'master' into move_to_qqc2	2018-03-04 14:16:21 +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	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
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	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