32702 commits

Author	SHA1	Message	Date
Sam Gateau	c30e65350a	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-14 11:29:48 -07:00
Sam Gateau	12f8c7486b	getting rescaling to work for forward yop	2019-06-14 00:48:07 -07:00
howard-stearns	b69d850c8e	move constant to the comment that will use it	2019-06-13 19:41:12 -07:00
howard-stearns	c2fe688740	Merge branch 'master' of https://github.com/highfidelity/hifi into stop-rebinding	2019-06-13 19:25:14 -07:00
Sam Gateau	4ba34f9a85	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-13 17:42:52 -07:00
Sam Gateau	5288314d02	Drafting ways to rescale in forward	2019-06-13 17:42:32 -07:00
Shannon Romano	d6859a42d9	Merge pull request #15762 from annabrewer/quest-login-keybrd ... BUGZ-531: Quest tablet login missing keyboard	2019-06-13 16:44:49 -07:00
Howard Stearns	11d3f0a629	Merge branch 'master' of github.com:highfidelity/hifi into stop-rebinding	2019-06-13 16:38:40 -07:00
Howard Stearns	8f9fa4a878	stop rebinding	2019-06-13 14:59:27 -07:00
Shannon Romano	bc70abfa10	Merge pull request #15764 from AndrewMeadows/rollback-bugz512 ... BUGZ-512: rollback fixes for bugz512	2019-06-13 14:43:56 -07:00
Shannon Romano	b4f708f4ad	Merge pull request #15755 from samcake/nut ... BUGZ-637: Detecting the problematic GPU on MAC not running properly Deferred render method right now	2019-06-13 14:32:36 -07:00
Andrew Meadows	db3c7b9194	rollback fixes for bugz512	2019-06-13 13:57:18 -07:00
Anna	7099b04911	appeasing jenkins	2019-06-13 12:21:41 -07:00
Shannon Romano	a37ce9f89d	Merge pull request #15754 from AndrewMeadows/fix-crash-bugz512 ... BUGZ-512: avoid MacOS crash on shutdown: destroy WebSurfaces before exit	2019-06-13 12:13:04 -07:00
Andrew Meadows	b08bb93ff7	add comment about why WebEntityRenderer::onRemoveFromSceneTyped()	2019-06-13 10:53:55 -07:00
Sam Gateau	97236570d8	FIlter on the gpu model name for ththe 2 known cases	2019-06-13 10:28:34 -07:00
Sam Gateau	d6f90c497f	FIlter on the gpu model name for ththe 2 known cases	2019-06-13 10:16:57 -07:00
Sam Gateau	43a119cbbc	just adding the correct include tobring th edefines	2019-06-12 23:15:53 -07:00
Sam Gateau	fbab3fcde9	Merge branch 'master' of github.com:highfidelity/hifi into nut	2019-06-12 19:15:25 -07:00
Sam Gateau	5004070af9	Grab the name of the renderer no matter what	2019-06-12 17:14:44 -07:00
Brad Hefta-Gaub	50cfe4531e	Merge pull request #15752 from PrestonB1123/moreToolbarTinkering ... BUGZ-666: Toolbar Artifact Always Present	2019-06-12 17:14:18 -07:00
Sam Gateau	b2feb0f920	Add specific caps for the render method deferred from the platform profiler, to prevent bad choice on mac book air	2019-06-12 16:48:36 -07:00
Andrew Meadows	eee52deefe	destroy WebSurfaces on shutdown	2019-06-12 16:07:15 -07:00
Howard Stearns	0c1df749b9	Merge pull request #15746 from roxanneskelly/bugz516 ... BUGZ-628 - Add quasi-MTBF logging to track disconnects	2019-06-12 15:48:45 -07:00
Preston Bezos	8dcf6e6a03	removed a dead line of code, made a couple formating changes	2019-06-12 15:47:19 -07:00
Preston Bezos	29d795af5b	hopefully good now	2019-06-12 15:36:20 -07:00
Anna	4b30065ad1	fixed keyboard on quest login and cleaned up qml files	2019-06-12 15:17:37 -07:00
Preston Bezos	34e9acc0b5	better fix for the toolbar remnant	2019-06-12 14:31:43 -07:00
Zach Fox	fade8f9c04	It works!	2019-06-12 12:47:48 -07:00
Roxanne Skelly	ca0c9e236b	Cleanup	2019-06-12 11:58:26 -07:00
Roxanne Skelly	6e6bd18baa	Undo Visual Studio mis-formatting	2019-06-12 11:43:43 -07:00
Zach Fox	51c2cc793a	Tinkering with toolbar visibility signal - not quite working	2019-06-12 10:26:32 -07:00
Brad Hefta-Gaub	35cdd19456	Merge pull request #15721 from sethalves/quiet-asan-gpu-stats ... BUGZ-623: Quiet asan gpu stats	2019-06-12 09:02:13 -07:00
Shannon Romano	b9e2443451	Merge pull request #15700 from ctrlaltdavid/DOC-63 ... DOC-63: Tablet JSDoc	2019-06-11 16:51:08 -07:00
Brad Hefta-Gaub	d9e3dd2857	Merge pull request #15742 from SimonWalton-HiFi/connections-hash-lock ... Add mutex for Socket::_connectionsHash	2019-06-11 16:41:11 -07:00
Roxanne Skelly	8704a36d07	Merge branch 'master' of https://github.com/highfidelity/hifi into bugz516	2019-06-11 16:26:55 -07:00
Roxanne Skelly	67cb5821bc	Update packet headers / add connect 'reason'	2019-06-11 16:00:49 -07:00
David Rowe	92eb418690	Doc review	2019-06-12 10:50:37 +12:00
Seth Alves	2fe8979206	fix warning	2019-06-11 15:46:12 -07:00
Simon Walton	1c03aeac20	Add lock for Connections map	2019-06-11 15:14:01 -07:00
jennaingersoll	1935b49538	Merge pull request #15676 from ctrlaltdavid/DOC-33 ... DOC-33: MyAvatar API JSDoc catch-up	2019-06-11 15:05:06 -07:00
Roxanne Skelly	071a779930	convert enum reason for disconnect to boolean	2019-06-11 14:38:39 -07:00
Roxanne Skelly	8a3672f3c5	Checkpoint MTBF uptime reporting	2019-06-11 12:41:45 -07:00
Howard Stearns	3111d2fa2e	Merge branch 'master' of github.com:highfidelity/hifi into verbose-logging-2	2019-06-11 12:22:46 -07:00
Seth Alves	c5e1f2aedc	change ContextStats::evalDelta to better handle wrapping values in graphics stats	2019-06-11 11:56:49 -07:00
Howard Stearns	bd446192e8	get windows error before calling io	2019-06-11 10:31:22 -07:00
Shannon Romano	973e93aa2f	Merge pull request #15729 from hyperlogic/bug-fix/avatar-data-max-size-computation ... AvatarData: Fix avatarDataByteArray max size computation	2019-06-11 08:43:52 -07:00
Brad Hefta-Gaub	34283097d2	Merge pull request #15730 from SamGondelman/assert ... BUGZ-631: Don't normalize zero vector in flipNormalsMyAvatarVsBackfacingTriangles	2019-06-11 07:48:29 -07:00
howard-stearns	d7f6685022	Merge branch 'master' of https://github.com/highfidelity/hifi into verbose-logging-2	2019-06-10 19:42:07 -07:00
Anthony J. Thibault	897e276188	Compile fix	2019-06-10 18:34:11 -07:00