23168 commits

Author	SHA1	Message	Date
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
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
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	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
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
David Rowe	7013f64714	Remove erroneous "filed" Overlay property	2018-01-03 10:37:37 +13: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
Elisa Lupin-Jimenez	a63538c4e9	Merge pull request #12021 from elisa-lj11/poly_api ... Google Poly API	2018-01-02 10:28:17 -08: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
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
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
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
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
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