61951 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
ZappoMan	afaad5fcd7	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-02 13:39:51 -07:00
Andrew Meadows	2b06df1c33	call Model::scaleToFit() before update render items	2017-11-02 12:52:46 -07:00
Andrew Meadows	60fce3d4f7	make Model::scaleToFit() public not protected	2017-11-02 12:52:31 -07:00
Nissim Hadar	d8191e3bd2	Fixed Mask test.	2017-11-02 12:45:18 -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
Nissim Hadar	51964dd4be	Merge branch 'master' into hazeMaskFix	2017-11-02 11:42:42 -07:00
Dante Ruiz	b6e3262164	removing the last remaining laserPointers	2017-11-02 11:31:13 -07:00
luiscuenca	81509b3e92	coding standard	2017-11-02 10:34:57 -07:00
Seth Alves	e77b9e0e97	stop drawing ignored avatars, even if PAL is still open	2017-11-02 10:23:26 -07:00
Zach Fox	19945c5991	Update cert UI	2017-11-02 10:22:00 -07:00
Stephen Birarda	4842da1388	Merge pull request #11729 from huffman/fix/cloud-domain-wizard-domain-id ... Update wizard to make request for domain info	2017-11-02 10:09:05 -07:00
Zach Fox	f8718efe25	Fix warnings	2017-11-02 09:42:33 -07:00
samcake	428a4675b1	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-02 09:06:17 -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
Sam Gateau	56510abd1e	Trying to set the ClusterBuffer in the render loop instead of the game loop	2017-11-02 03:45:27 -07:00
Olivier Prat	e9743d4c95	Added jsdoc to SelectionScriptingInterface	2017-11-02 10:00:30 +01:00
Olivier Prat	f2444f9a30	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-11-02 09:25:07 +01:00
luiscuenca	c834cf1cf3	Comments and corrections	2017-11-01 21:55:31 -07:00
Nissim Hadar	2e6c849b63	Added comment.	2017-11-01 20:31:44 -07:00
luiscuenca	9e0e1ab5a5	erase comment	2017-11-01 19:56:16 -07:00
luiscuenca	e201e82ec2	formatting	2017-11-01 19:45:56 -07:00
luiscuenca	6a2dc38fdd	restoring previous roles	2017-11-01 19:38:37 -07:00
Sam Gateau	4dba5b8b36	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-01 18:51:00 -07:00
samcake	455f2ad277	trying to change the root transorm update	2017-11-01 18:14:36 -07:00
Nissim Hadar	ad11606e34	Merge branch 'master' into hazeMaskFix	2017-11-01 17:45:21 -07:00
Nissim Hadar	67552d2b7d	Change stencil mask used with Haze.	2017-11-01 17:39:37 -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	8401aecef5	Update wizard to make request for domain info	2017-11-01 16:04:26 -07:00
howard-stearns	76e06a6214	Update to stable-v-staging metaverse switching, to handle marketplace ... injection.	2017-11-01 15:28:28 -07:00
Dante Ruiz	0580e23686	fixed edit mode and allow to scroll off tablet	2017-11-01 15:16:02 -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
Dante Ruiz	66f07cb21b	eslint controller modules	2017-11-01 11:36:36 -07:00
Zach Fox	b335ba9a75	Timeout timer	2017-11-01 11:34:29 -07:00
Brad Davis	f061b9c2da	Add stylus functionality to pointer manager	2017-11-01 11:27:57 -07:00
Nissim Hadar	3d3c93f1a5	Fixes Bug 8802	2017-11-01 11:23:18 -07:00
Dante Ruiz	abb6f786fa	added homebutton message and scripts cleanup	2017-11-01 11:03:48 -07:00
Zach Fox	8a6a744099	It's working	2017-11-01 10:46:13 -07:00
Ryan Huffman	9a0a74c9b9	Merge pull request #11723 from Atlante45/fix/ds-config-version ... Move DS config version to config file	2017-11-01 10:05:50 -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
luiscuenca	da63e85699	Bug 8270 fixed	2017-11-01 09:17:04 -07:00
Dante Ruiz	cde5208151	fixing merge conflict	2017-11-01 08:56:55 -07:00
Ken Cooke	82d9827571	Merge branch 'master' into audio-louder-mastergain	2017-11-01 08:10:55 -07:00
David Rowe	328fc29bc5	Fix serverScripts not being able to see entities in parent/child tree	2017-11-01 17:01:19 +13:00
SamGondelman	657a0fb036	Merge remote-tracking branch 'upstream/pointers' into ui	2017-10-31 17:41:14 -07:00