61258 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Fox	c496429a85	Add Machine Fingerprint to receive_at endpoint txn'	2017-11-03 10:40:25 -07:00
John Conklin II	ff36cbf45f	Merge pull request #11731 from sethalves/fix-ignore ... stop drawing ignored avatars, even if PAL is still open	2017-11-03 09:45:03 -07:00
Zach Fox	35343da281	Merge pull request #11739 from zfox23/commerce_setPassphraseWhenLogout ... Reset Wallet passphrase when login username changes	2017-11-02 19:46:00 -07:00
Zach Fox	6f3c61c4e0	Slightly modify invalid cert language	2017-11-02 17:59:36 -07:00
Brad Hefta-Gaub	6dbffe2367	Merge pull request #11736 from AndrewMeadows/scale-to-fit ... scaleToFit() the model before updating render items	2017-11-02 17:49:05 -07:00
Brad Hefta-Gaub	6049582600	Merge pull request #11738 from jherico/ssl_dll_fix ... Fix finding the SSL binary path	2017-11-02 17:47:57 -07:00
Zach Fox	6173ad810b	Reset wallet passphrase when login username changes	2017-11-02 15:48:59 -07:00
Zach Fox	48979a5ce8	Merge pull request #11730 from zfox23/pop_avatarEntityTests ... Commerce: Avatar Entity Tests	2017-11-02 15:34:37 -07:00
Brad Davis	56b1c7d0ee	Fix finding the SSL binary path	2017-11-02 14:51:40 -07:00
Stephen Birarda	25c10d5de2	Merge pull request #11735 from highfidelity/stable ... Merge stable back into master	2017-11-02 14:22:31 -07:00
Zach Fox	23e627a46f	Send empty decrypted text if impossible to decrypt	2017-11-02 13:46:24 -07:00
Andrew Meadows	490483fde8	call Model::scaleToFit() before update render items	2017-11-02 12:32:51 -07:00
Andrew Meadows	db9c3cc103	make Model::scaleToFit() public not protected	2017-11-02 12:31:36 -07:00
Zach Fox	19945c5991	Update cert UI	2017-11-02 10:22:00 -07:00
Zach Fox	f8718efe25	Fix warnings	2017-11-02 09:42:33 -07:00
Ken Cooke	667f091a61	Merge pull request #11727 from huffman/fix/metaverse-url-comment ... Fix comment in NetworkingConstants referencing shared.js location	2017-11-02 07:14:12 -07:00
Seth Alves	12792c3821	stop drawing ignored avatars, even if PAL is still open	2017-11-01 17:26:00 -07:00
Ryan Huffman	edc7b91a42	Fix comment in NetworkingConstants referencing shared.js location	2017-11-01 12:57:07 -07:00
Zach Fox	bb1ffbc06f	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_avatarEntityTests	2017-11-01 12:38:34 -07:00
Zach Fox	72d61f1825	Remove unnecessary log - static verif isn't working	2017-11-01 12:03:44 -07:00
Zach Fox	56cb98d96f	Make inspection cert work	2017-11-01 12:02:57 -07:00
Zach Fox	b335ba9a75	Timeout timer	2017-11-01 11:34:29 -07:00
Zach Fox	8a6a744099	It's working	2017-11-01 10:46:13 -07:00
Zach Fox	82816b5551	Merge pull request #11720 from zfox23/commerce_getToBuy ... Change 'GET' to 'BUY' when hovering over costed items	2017-11-01 09:49:39 -07:00
Zach Fox	93308dfcd3	Why did I think this would work before?	2017-10-31 16:21:10 -07:00
Sam Gateau	be74b5c9ed	Merge pull request #11692 from NissimHadar/hazeZone ... Bug fixes 8672-8673-8674 related to Zone entity Haze component	2017-10-31 15:25:32 -07:00
Zach Fox	f9a410de87	Change 'GET' to 'BUY' when hovering over costed items	2017-10-31 14:53:37 -07:00
Zach Fox	d49e281fab	Add RSA error handling	2017-10-31 14:12:30 -07:00
Nissim Hadar	03d2ca19b9	Moving consts into mode::Haze namespace.	2017-10-31 13:46:58 -07:00
Zach Fox	e9c144892a	Fixes	2017-10-31 13:11:32 -07:00
Zach Fox	f5ada4fe62	Will it compile?	2017-10-31 12:33:28 -07:00
Zach Fox	6f96e0c7bd	More progress	2017-10-31 12:14:12 -07:00
Zach Fox	90e9251176	It's a start	2017-10-31 11:28:19 -07:00
Nissim Hadar	f3147fc24f	Merge branch 'master' into hazeZone	2017-10-30 21:41:23 -07:00
Nissim Hadar	3ddf970be3	Removed haze init variables from the model namespace.	2017-10-30 21:40:14 -07:00
Nissim Hadar	636f7858a3	Removed _degs and _m suffixes.	2017-10-30 19:45:08 -07:00
Nissim Hadar	b00db6a68f	Correction.	2017-10-30 19:20:49 -07:00
Brad Hefta-Gaub	c1a808e726	Merge pull request #11703 from AndrewMeadows/circles-and-quads ... fix Circles and quads	2017-10-30 18:03:32 -07:00
Brad Hefta-Gaub	fbcd813d7b	Merge pull request #11694 from ElderOrb/FB8315 ... 8315 Stylus appears in wrong place on hand	2017-10-30 18:00:56 -07:00
Zach Fox	19420a0ff2	Move static cert verify to properties	2017-10-30 17:01:55 -07:00
Andrew Meadows	0f1139343c	Merge pull request #11709 from druiz17/equip-adjustment ... Remember adjustment made to equipped entities	2017-10-30 15:45:28 -07:00
Nissim Hadar	1357877618	Replaced separate RGB components of colours with vec3's.	2017-10-30 12:41:09 -07:00
Nissim Hadar	6391282680	Swapped location of keylight attenuation and the blending factor.	2017-10-30 12:05:23 -07:00
Nissim Hadar	5fc68cae0d	Converted Haze initialization values to static.	2017-10-30 11:51:19 -07:00
Nissim Hadar	d6b3fa4cb1	Removed references to Haze from Stage.	2017-10-30 10:49:08 -07:00
Nissim Hadar	349e12c065	Merge branch 'master' into hazeZone	2017-10-30 10:08:35 -07:00
Ryan Downe Karpf	c0f44c8fc8	Merge pull request #11636 from birarda/bug/draco-in-debug ... use config specific install dir for draco external	2017-10-30 09:00:14 -07:00
Ryan Downe Karpf	28a99fe685	Merge pull request #11655 from dback2/tabletcontextualmode ... add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place	2017-10-30 08:56:26 -07:00
Ryan Downe Karpf	8fbe7f050f	Merge pull request #11712 from vladest/fix_avatar_browser ... fix typo in tablet avatar browser	2017-10-30 08:49:58 -07:00
Stephen Birarda	05cfd72464	Merge pull request #11707 from Atlante45/feat/wizard ... Domain Settings tweaks + Domain Setup Wizard	2017-10-30 08:39:31 -07:00