23354 commits

Author	SHA1	Message	Date
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
Ryan Downe Karpf	a3245aec57	Merge pull request #12079 from RebeccaStankus/log-filtering ... Log filtering	2018-01-05 08:40:41 -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
David Rowe	5463f1ae6b	Merge branch 'master' into 21646	2018-01-05 16:58:58 +13:00
David Rowe	d6a0457ee5	Delete web3d overlay "resolution" property JSDoc	2018-01-05 16:48:37 +13:00
Lexx	85b54f82d8	revert sorting change mistake	2018-01-05 01:58:23 +00:00
NissimHadar	43bc8bb948	Merge pull request #11939 from AndrewMeadows/dont-disable-default-motor ... defang accidental disable of MyAvatar's default motor	2018-01-04 17:44:22 -08:00
Zach Fox	0388c183ab	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_pagination	2018-01-04 16:42:12 -08:00
SamGondelman	eb0d09360a	Merge remote-tracking branch 'upstream/master' into overlayFix	2018-01-04 15:47:20 -08:00
Zach Fox	ea29d8bde0	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixHandControllerInspection	2018-01-04 15:41:27 -08:00
Zach Fox	4612ef3d7c	Use atYBeginning	2018-01-04 15:41:01 -08:00
Anthony J. Thibault	eff77b995e	Merge branch 'master' into feature/exp-smoothing-input-filter	2018-01-04 15:24:33 -08:00
Zach Fox	4232bc0200	Bump per_page to 100	2018-01-04 14:42:05 -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
Anthony J. Thibault	9beb3ac5b6	Merge branch 'master' into feature/exp-smoothing-input-filter	2018-01-04 13:45:27 -08:00
David Back	81f3590954	Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices	2018-01-04 13:17:07 -08:00
SamGondelman	6a19b0e0b6	update render items on texture load	2018-01-04 13:10:46 -08:00
RebeccaStankus	9ba324b85f	"Clear Filter" button instead of "Show All"	2018-01-04 12:51:11 -08:00
RebeccaStankus	3e8063f80a	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering	2018-01-04 12:48:09 -08:00
Alexander Ivash	7ab7a46530	11008 GoTo app does not focus on address bar when opened	2018-01-04 23:38:10 +03:00
Gabriel Calero	8cac98545a	Fixes for Android	2018-01-04 17:36:10 -03:00
Zach Fox	10d494b51d	Pagination for Recent Activity	2018-01-04 12:32:30 -08:00
Clément Brisset	efbff56f26	Merge pull request #11925 from Atlante45/feat/remove-jurisdiction-listener ... Remove legacy jurisdiction code	2018-01-04 11:52:38 -08:00
RebeccaStankus	f52a6d8eae	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering	2018-01-04 10:49:32 -08:00
luiscuenca	ef0164c272	Fix tabs	2018-01-04 11:43:51 -07:00
luiscuenca	28d9409bf0	Fix default hand poses	2018-01-04 11:37:37 -07:00
David Rowe	7236ac17e2	Merge branch 'master' into 21661	2018-01-04 15:21:00 +13:00
David Rowe	138092ac37	Remove "Prefer Avatar Finger Over Stylus" setting	2018-01-04 15:12:34 +13: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
Ryan Downe Karpf	5a589350fe	Merge pull request #12077 from ctrlaltdavid/remove-filed ... Remove erroneous "filed" Overlay property	2018-01-03 18:10:37 -08:00
Zach Fox	ff4f582c7d	Thanks Howard	2018-01-03 17:23:35 -08:00
Gabriel Calero	32494a8e24	Set QMLEngine base path for android	2018-01-03 22:13:31 -03:00
David Back	6c8987d75f	Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices	2018-01-03 14:44:52 -08:00
Cristian Luis Duarte	da28e0a8cb	Implement generateAssetsFileList in build.gradle (same work as assets file generation by androiddeployqt) + Copy assets at startup	2018-01-03 16:42:18 -03:00
Gabriel Calero	fc62b2d34a	Fix ktx_cache path for android. Load the least js scripts for android	2018-01-03 16:42:18 -03:00
Gabriel Calero	ef8ba1cad0	Include config.h in ResourceImageItem.cpp. Minor fixes	2018-01-03 16:40:14 -03:00
Gabriel Calero	78f2a8c566	Copy scripts from android assets at startup	2018-01-03 16:40:14 -03:00
Gabriel Calero	d31346c047	Use qml engine	2018-01-03 16:40:14 -03:00
RebeccaStankus	9471dbeba9	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering	2018-01-03 11:39:38 -08:00
Gabriel Calero	468fc89c3e	Use forward pipeline for android	2018-01-03 16:38:23 -03:00
Gabriel Calero	76b38bebad	Make Interface run in Android	2018-01-03 16:36:11 -03:00
RebeccaStankus	89138c9bd8	More filter choices, search will clear	2018-01-03 11:35:46 -08:00
Zach Fox	6f077f3a92	Fix Security Pic Change dialog after QML security changes	2018-01-03 11:28:39 -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
RebeccaStankus	9edb85efdc	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering	2018-01-03 09:25:38 -08:00
David Rowe	901af8896f	Add "Prefer Stylus Over Laser" setting	2018-01-03 17:54:43 +13:00
David Rowe	6e43497e14	Merge tag 'RELEASE-7602' into 21661 ... Jenkins Git plugin tagging with RELEASE-7602	2018-01-03 16:46:10 +13: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
RebeccaStankus	dd48972e44	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering	2018-01-02 14:06:41 -08:00
RebeccaStankus	0b452a23dc	forgot to add hifi.entities to filter selections	2018-01-02 14:04:30 -08:00
RebeccaStankus	bf59697aa5	better dropdown	2018-01-02 13:56:49 -08:00
David Rowe	7013f64714	Remove erroneous "filed" Overlay property	2018-01-03 10:37:37 +13:00
RebeccaStankus	d08e97f9cc	more filter options	2018-01-02 13:28:39 -08:00
Zach Fox	47a209dc4c	Make things slightly better?	2018-01-02 13:11:00 -08:00
RebeccaStankus	fe69498976	initial changes...ready for feedback	2018-01-02 13:04:52 -08:00
vladest	a84e585679	Merge	2018-01-02 21:49:00 +01:00
RebeccaStankus	0117750757	PR for Feedback	2018-01-02 12:28:31 -08:00
Brad Davis	641c4e537a	Merge remote-tracking branch 'upstream/master' into HEAD	2018-01-02 11:38:11 -08:00
Brad Davis	829e521320	Merge remote-tracking branch 'upstream/master' into HEAD	2018-01-02 11:37:33 -08:00
Elisa Lupin-Jimenez	a63538c4e9	Merge pull request #12021 from elisa-lj11/poly_api ... Google Poly API	2018-01-02 10:28:17 -08:00
RebeccaStankus	fe82d33b76	couple small changes	2018-01-01 15:29:49 -08:00
Triplelexx	78a0175413	fix assetbrowser sorting case sensitivity	2017-12-29 23:16:12 +00:00
luiscuenca	49bd62ca29	Touch feeling for near grab	2017-12-29 14:04:36 -07:00
Atlante45	aec5ab5921	CR	2017-12-29 12:46:52 -08:00
Atlante45	06e2f394f9	Update Octree server stats to handle single server	2017-12-29 12:46:52 -08:00
Atlante45	28f164d7e5	Remove legacy jurisdiction code	2017-12-29 12:46:52 -08:00
RebeccaStankus	06def41764	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter2	2017-12-29 10:03:29 -08:00
Seth Alves	4bbce011a4	Merge pull request #11918 from sethalves/scale-wearables-with-avatar-3 ... avatar-entities which are children of an avatar will scale with the avatar	2017-12-29 09:12:17 -08:00
vladest	afc3082593	Cleanup. Errors checks	2017-12-28 13:16:51 +01:00
vladest	35fee739c5	Use buttons index	2017-12-27 23:50:15 +01:00
Elisa Lupin-Jimenez	84933131c4	changed api key variable name	2017-12-27 12:49:16 -08:00
Elisa Lupin-Jimenez	a428eb5b75	added const to several parameters	2017-12-27 12:47:04 -08:00
Elisa Lupin-Jimenez	01c1032540	fixed constant names, added another URL check	2017-12-27 10:51:58 -08:00
RebeccaStankus	296f0a323a	saving for Wednesday	2017-12-26 15:56:05 -08:00
Elisa Lupin-Jimenez	03f06aadf4	keyword filters case insensitive now	2017-12-26 11:08:10 -08:00
Elisa Lupin-Jimenez	e1b344e36d	handles empty json object return	2017-12-26 10:50:10 -08:00
Elisa Lupin-Jimenez	3e10d3b436	Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api	2017-12-26 10:18:51 -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
David Back	ab5b238aea	Merge branch 'mergeAccountGlobalServices' of https://github.com/dback2/hifi into mergeAccountGlobalServices	2017-12-22 17:00:17 -08:00
David Back	c620f3274c	merge	2017-12-22 16:28:29 -08:00
John Conklin II	0dd5bbc2d6	Merge pull request #12057 from birarda/61-1-merge-back ... Merge stable back into master after RC61.1	2017-12-22 16:26:08 -08:00
Stephen Birarda	e3cbfd92a0	Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back	2017-12-22 15:48:04 -08:00
Seth Alves	96197e66bb	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-22 15:13:02 -08: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
Sam Gateau	a2c16ddf6a	Merge pull request #12026 from SamGondelman/burp3 ... Remove _model from ModelMeshPartPayload	2017-12-22 13:50:06 -08:00
RebeccaStankus	720f186bd7	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter	2017-12-22 13:47:42 -08:00
Howard Stearns	fd545c3928	Merge pull request #12048 from zfox23/commerce_CheckoutLayoutRevisions ... Commerce: Checkout Layout Revisions	2017-12-22 09:59:49 -08:00
Howard Stearns	5767f5937e	Merge pull request #12046 from zfox23/commerce_fixEcdsaError1 ... Commerce: Fix some rezzing errors; Fix ECDSA errors	2017-12-22 09:56:22 -08:00
RebeccaStankus	1d4dedc1a1	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter	2017-12-22 07:52:31 -08:00
Seth Alves	897b96d092	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-22 07:36:26 -08:00
John Conklin II	5a839ebd93	Merge pull request #12049 from zfox23/RC61.1_commerce_fixEcdsaError1 ... RC61.1: Commerce: Fix some rezzing errors; Fix ECDSA errors	2017-12-21 17:46:32 -08:00
Zach Fox	ef71470d85	Small change	2017-12-21 17:03:04 -08:00
Zach Fox	07a1cf434a	IT'S WORKING!!!	2017-12-21 16:33:47 -08:00
Zach Fox	373ef6c6ce	Progress?	2017-12-21 16:32:20 -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
Stephen Birarda	7bf0cc2f63	cleanup other ref returns of shared pointers from sortables	2017-12-21 15:39:14 -08:00
luiscuenca	38bfddf786	Added filter for QT autogenerated functions and integrated it to Developers menu	2017-12-21 16:26:06 -07:00
Zach Fox	73eb258e79	IT'S WORKING!!!	2017-12-21 15:17:52 -08:00
Zach Fox	e963673409	Progress?	2017-12-21 14:08:18 -08: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
unknown	be736373f2	fix if else convention	2017-12-20 17:52:27 -08:00
Andrew Meadows	c1906215ba	add comments	2017-12-20 17:41:08 -08:00
Andrew Meadows	721e9d426a	restore signals on LOD change	2017-12-20 17:41:08 -08:00
Andrew Meadows	5c11ae3469	bump desktop min FPS from 20 to 30 msec	2017-12-20 17:41:08 -08:00
Andrew Meadows	4fb9680f3b	also consider GPU render time for LOD adjust	2017-12-20 17:41:08 -08:00
Andrew Meadows	9c4a0c8c70	tweak LOD adjustment logging	2017-12-20 17:41:08 -08:00
Andrew Meadows	8e0d367a2d	use full 'present' time for FPS calculation ... also, refactor LOD adjust logic	2017-12-20 17:41:08 -08:00
Andrew Meadows	7a9d566e02	remove unnecessary whitespace	2017-12-20 17:41:08 -08:00
unknown	dbbc87d72e	merge	2017-12-20 17:40:11 -08:00
RebeccaStankus	95d94e1c8f	UI Done	2017-12-20 16:52:56 -08: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
Elisa Lupin-Jimenez	7de2918b9b	added newline to header	2017-12-20 12:44:47 -08:00
SamGondelman	bd06dc6443	cleaning up modelmeshpartpayload	2017-12-20 11:00:14 -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
Andrew Meadows	02e3b22621	remove hot-key for disable of scripted motor	2017-12-20 08:43:56 -08:00
Andrew Meadows	6ad3a0598c	remove crufty comment	2017-12-20 08:42:42 -08:00
Andrew Meadows	f82de05f9c	defang accidental disable of MyAvatar's default motor	2017-12-20 08:42:42 -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
Elisa Lupin-Jimenez	ca062f9232	changed qtglobal include	2017-12-19 15:41:42 -08:00
Elisa Lupin-Jimenez	14935e5924	added const to valid inputs	2017-12-19 15:11:24 -08:00
Elisa Lupin-Jimenez	1b6c85edb0	cleaned up code	2017-12-19 13:22:31 -08:00
David Rowe	e6c40f4aae	Window JSDoc	2017-12-20 10:16:09 +13:00
vladest	012f65a87f	Merge branch 'master' into tablet_home_paginate	2017-12-19 21:40:47 +01:00
Elisa Lupin-Jimenez	34d8fe307d	fixed getAssetList()	2017-12-19 11:25:15 -08: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
Elisa Lupin-Jimenez	8a9e5bc39d	Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api	2017-12-19 10:41:39 -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
Elisa Lupin-Jimenez	1ee8445f43	added gltf import feature, getAssetList() not working	2017-12-18 17:47:21 -08:00
Anthony Thibault	7ea1f3b911	Merge pull request #12013 from sethalves/delete-expired-av-ents ... when an avatar-entity's lifetime expires, remove it from avatarEntityData	2017-12-18 17:35:42 -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
Seth Alves	ddbb7a4416	when an avatar-entity's lifetime expires, remove it from avatarEntityData	2017-12-18 14:26:25 -08:00
Elisa Lupin-Jimenez	e7fad05867	enabled fbx, obj, and blocks model url retrieval	2017-12-18 14:20:51 -08:00