61527 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
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
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
Nissim Hadar	3d3c93f1a5	Fixes Bug 8802	2017-11-01 11:23:18 -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
David Rowe	328fc29bc5	Fix serverScripts not being able to see entities in parent/child tree	2017-11-01 17:01:19 +13:00
Atlante45	7616fe193c	Migrate the DS config version to the config file	2017-10-31 17:35:23 -07:00
Zach Fox	93308dfcd3	Why did I think this would work before?	2017-10-31 16:21:10 -07:00
Stephen Birarda	b8370128ce	remove master config from HifiConfigVariantMap/domain-server	2017-10-31 16:19:50 -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