19437 commits

Author	SHA1	Message	Date
Brad Davis	46326ed27c	Fix crash in switching to plugin that uses the composite framebuffer in customizeContext	2016-10-13 16:46:02 -07:00
Chris Collins	90b283f83b	Merge pull request #8806 from huffman/fix/atp-script-cache ... Update ScriptCache to clear ATP assets when disconnected from a domain	2016-10-13 16:30:29 -07:00
Ryan Huffman	6cf4802cc2	Change default hifi address from dev-welcome to welcome	2016-10-13 16:06:07 -07:00
Ryan Huffman	7626f49ddc	Replace qDebug with qCDebug in ScriptCache	2016-10-13 15:43:28 -07:00
Ryan Huffman	decb94b719	Update ScriptCache to clear ATP assets when disconnected from a domain	2016-10-13 14:05:53 -07:00
Brad Hefta-Gaub	0e1b377227	Merge pull request #8785 from jherico/oculus_crash ... Additional plugin debugging, better plugin resource cleanup	2016-10-13 13:54:34 -07:00
Ryan Downe Karpf	397816679d	Merge pull request #8790 from huffman/feat/reliable-path-queries ... Update ds path queries to be reliable	2016-10-13 09:21:44 -07:00
Ryan Huffman	a44653db57	Update ds path queries to be reliable	2016-10-12 10:47:42 -07:00
Brad Davis	4e0fffb8b7	Merge pull request #8779 from gcalero/shaders_gl_es ... Adapt shader for GL ES support	2016-10-12 08:32:50 -07:00
Brad Hefta-Gaub	0f1e61e240	Merge pull request #8781 from ZappoMan/tweakGrabPoint ... adjust grab indicators	2016-10-12 07:08:16 -07:00
Brad Hefta-Gaub	8e8eba5e0c	Merge pull request #8770 from jherico/textures_tweak ... Fix GPU texture counter, better logging for memory pressure	2016-10-11 21:36:03 -07:00
Brad Hefta-Gaub	cded9c03f9	Merge pull request #8767 from ZappoMan/viveControllerFixes ... fix 'any endpoints' for axis style inputs	2016-10-11 20:33:35 -07:00
Brad Davis	28771cbda9	Additional plugin debugging, better plugin resource cleanup	2016-10-11 19:40:02 -07:00
Stephen Birarda	33e426bfd2	Merge pull request #8778 from Atlante45/asset-client ... Fix crash in AssetClient handleProgressCallback	2016-10-11 18:36:23 -07:00
Brad Davis	8f42e564b4	Disable 'min free GPU memory', bump max texture memory 65%	2016-10-11 16:34:54 -07:00
Brad Davis	1e7dd7db64	Fix GPU texture counter, better logging for memory pressure	2016-10-11 16:28:16 -07:00
samcake	3ebab3b017	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2016-10-11 15:45:10 -07:00
Brad Hefta-Gaub	95c1237f66	Merge pull request #8776 from samcake/color ... Add check for bad texture resource slot	2016-10-11 14:50:56 -07:00
samcake	7ea790aa4f	adding a comment to explain what we are doing	2016-10-11 14:43:41 -07:00
Stephen Birarda	a8568ac821	Merge pull request #8775 from birarda/master ... remove AssetResourceRequest timeout, output occasional progress to log	2016-10-11 14:31:51 -07:00
Brad Hefta-Gaub	c1763da9b1	Merge pull request #8774 from hyperlogic/bug-fix/oculus-to-desktop-crash ... Fix crash when switching to desktop mode from oculus HMD mode	2016-10-11 14:29:28 -07:00
Stephen Birarda	504e92607a	change format of debug message	2016-10-11 13:23:52 -07:00
Stephen Birarda	20ea7e6c98	change QLoggingCategory include casing	2016-10-11 13:21:53 -07:00
Stephen Birarda	07d0a038a5	set the initial last progress debug 5s back	2016-10-11 13:21:15 -07:00
samcake	7af3aa53ac	Fixing the key light pass with ambient map	2016-10-11 13:20:32 -07:00
Stephen Birarda	a0c27e2130	remove timer forced timeouts in ARR, occasionally ouput DL progress	2016-10-11 13:17:57 -07:00
Atlante45	e7e9c71625	Fix AssetClient crash ... Do not access message data until message is complete	2016-10-11 13:05:57 -07:00
Brad Hefta-Gaub	93d9cf7917	adjust grab indicators	2016-10-11 12:42:26 -07:00
Anthony J. Thibault	350977f03e	Speculative fix for crash in AudioClient	2016-10-11 10:49:43 -07:00
Stephen Birarda	826c2f1a9f	push the AssetResourceRequest timeout to 15s	2016-10-11 09:55:16 -07:00
Stephen Birarda	ec5850b82b	emit ReceivedMessage progress signals more frequently for new timeout	2016-10-11 09:55:05 -07:00
Gabriel Calero	834d9c0710	Adapt shader for GL ES support which requires operators of the same datatype	2016-10-11 12:15:49 -03:00
samcake	0951ca6bbe	Add check for bad texture resource slot	2016-10-10 18:43:24 -07:00
Brad Hefta-Gaub	798a5cfc9d	Merge pull request #8768 from ZappoMan/nestedSkyboxes ... fix skybox changing when going between zones	2016-10-10 15:13:33 -07:00
Anthony J. Thibault	e76a7fc577	Crash fix for RenderableWebEntityItem::buildWebSurface ... Gracefully handle the absence of a gl context. We will continue to retry every render call.	2016-10-10 13:57:54 -07:00
Brad Hefta-Gaub	735a6ca994	Merge pull request #8755 from hyperlogic/bug-fix/openvr-fixes ... openvr deadlock and crash on exit fixes	2016-10-10 08:01:07 -07:00
Brad Hefta-Gaub	db5edb530a	fix skybox changing when going between zones	2016-10-09 15:22:35 -07:00
Brad Hefta-Gaub	8da9fccb5d	fix 'any endpoints' for axis style inputs	2016-10-08 20:24:52 -07:00
Anthony J. Thibault	ec801cb9d8	Addressed feedback from code review.	2016-10-07 17:46:46 -07:00
Brad Hefta-Gaub	7e3d63c4e2	Merge pull request #8747 from jherico/buffer_page_fix ... Fix page size usage in gpu buffers	2016-10-07 16:57:25 -07:00
Ryan Huffman	8a4cfd4735	Remove unreachable code in PluginUtils	2016-10-07 13:37:52 -07:00
Anthony J. Thibault	a4c7e832b5	Reset threadID logging to false	2016-10-07 11:42:34 -07:00
Ryan Huffman	408cc1cd04	Update default hifi address to dev-welcome	2016-10-07 10:30:18 -07:00
Ryan Huffman	e6314a2701	Add changes to isHMDAvailable to specify hmd	2016-10-07 10:30:18 -07:00
Ryan Huffman	a062e6ab9a	Revert change to make tutorial only work for Vive	2016-10-07 10:30:18 -07:00
Ryan Huffman	9c6eae36a7	Update tutorial progress keys	2016-10-07 10:30:18 -07:00
Ryan Huffman	f426f1cd4f	Update isHandController to temporarily only return true for Vive	2016-10-07 10:30:18 -07:00
Ryan Huffman	216cf2b4bc	Update tutorial to work with HMD + Hand Controllers only	2016-10-07 10:30:18 -07:00
Ryan Huffman	e24a01d1fe	Add path parameter to goToSandbox	2016-10-07 10:30:18 -07:00
Ryan Huffman	03c01bb9b0	Add exception handling to callEntityMethod calls	2016-10-07 10:30:18 -07:00