1940 commits

Author	SHA1	Message	Date
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
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
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
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
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
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
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
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
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	62f2ba0dad	More intellectual calculation of title positions taking in account actual sort indicator glyph size	2018-02-24 09:32:08 +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