23105 commits

Author	SHA1	Message	Date
vladest	f5f19ea67f	Move RadioButton	2017-12-28 15:53:16 +01:00
vladest	2fbd0a41b1	Move Slider	2017-12-28 15:39:22 +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
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
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
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
vladest	5877eeea0b	cleanup	2017-12-19 21:35:11 +01:00
vladest	1cf82b7725	SpinBox now works	2017-12-19 21:28:28 +01:00
Zach Fox	18d5be147c	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-19 09:48:15 -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
Zach Fox	afd3cf7045	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-18 14:08:09 -08:00
Zach Fox	affd67d7d4	Merge pull request #12007 from zfox23/commerce_moreSecurityImages ... Commerce: More security images!	2017-12-18 12:06:43 -08:00
vladest	29a17d366e	Merge branch 'master' into move_to_qqc2	2017-12-18 20:57:04 +01:00
Zach Fox	e075cd79fb	Add Passphrase Auth Status data tracking	2017-12-18 11:51:12 -08:00
Brad Davis	9f7b6f543d	Merge remote-tracking branch 'upstream/master' into HEAD	2017-12-18 11:17:07 -08:00
Andrew Meadows	cfd2097f36	Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js ... Cleanup names of debug stats and trace contexts.	2017-12-18 10:02:42 -08:00
Zach Fox	89795272c7	More security images!	2017-12-15 16:26:13 -08:00
Anthony Thibault	f3fcac8e58	Merge pull request #11903 from Delanir/IPD8258 ... 8258 IPD Tertiary Task List: Changing to Smaller Avatar Does not Resize Tablet	2017-12-15 15:37:27 -08:00
Brad Hefta-Gaub	c68bec175a	Merge pull request #11978 from hyperlogic/bug-fix/no-hip-glitches ... More stable hips IK	2017-12-15 15:32:24 -08:00
Brad Hefta-Gaub	45df668679	Merge pull request #11966 from SamGondelman/hysteresis ... Update stylus touch hysteresis values	2017-12-15 15:22:41 -08:00
Alexander Ivash	a4696cc2b3	8992 Login window is small in tablet	2017-12-14 16:57:17 -08:00
Alexander Ivash	32acc8ad47	8992 Login window is small in tablet	2017-12-14 23:53:33 +00:00
Zach Fox	af346f2ced	Protocol change	2017-12-14 10:09:10 -08:00
SamGondelman	4fbf5db697	Merge remote-tracking branch 'upstream/master' into hysteresis	2017-12-14 09:55:46 -08:00