23111 commits

Author	SHA1	Message	Date
Dante Ruiz	674e8e1ac2	Merge branch 'master' of github.com:highfidelity/hifi into soft-entities	2018-01-03 08:47:40 -08:00
Zach Fox	917db14879	Add a link to My Purchases from Wallet Home	2018-01-02 15:26:11 -08:00
Dante Ruiz	6fa3446c57	joints are being relayed to children	2018-01-02 13:54:13 -08:00
Zach Fox	47a209dc4c	Make things slightly better?	2018-01-02 13:11:00 -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
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
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
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
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
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
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
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
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
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
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
Elisa Lupin-Jimenez	34d8fe307d	fixed getAssetList()	2017-12-19 11:25:15 -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