66150 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stephen Birarda	932c55ca08	handle client section in component-less install	2018-03-20 14:22:37 -07:00
Stephen Birarda	6ee6f88087	only add components to cmake for multi-component installer	2018-03-20 14:22:12 -07:00
Stephen Birarda	f93935f5f6	change PR build compression to bzip2	2018-03-20 14:21:52 -07:00
Stephen Birarda	c743bfcf27	templatize conditional for selection of server component	2018-03-20 14:21:52 -07:00
Stephen Birarda	1405c8fcb3	add a client only option to cmake	2018-03-20 14:20:58 -07:00
Bradley Austin Davis	a861be112f	Fix GLES build	2018-03-20 14:15:38 -07:00
Stephen Birarda	0074c0470d	Merge pull request #12524 from birarda/feat/runtime-beside-exe ... switch back to app-local VC runtimes and UCRT	2018-03-20 14:07:27 -07:00
John Conklin II	afcfbfe721	Merge pull request #12644 from Atlante45/feat/ga-installer ... Add Google Analytics to installer	2018-03-20 12:07:29 -07:00
John Conklin II	de5ff20968	Merge pull request #12664 from gcalero/android_websurface_check_nocrash ... Android - Prevent crash when setting the url property to _webSurface.	2018-03-20 11:40:08 -07:00
Seth Alves	585a523823	unmangle merge	2018-03-20 11:17:56 -07:00
John Conklin II	40d6e51da8	Merge pull request #12597 from ElderOrb/FB12956 ... Fix for broken 'toggle audio meter' button	2018-03-20 11:03:32 -07:00
Seth Alves	bd10cd6fa9	'disconnect' from serverless domain when transitioning from a serverless-domain to a DNS name (rather than a place name)	2018-03-20 10:53:17 -07:00
Stephen Birarda	cd887b5faf	Merge pull request #12654 from huffman/feat/content-zip-upload ... Add support for .content.zip content uploads	2018-03-20 10:07:53 -07:00
Brad Davis	f77228bbfe	Fixing missing m_pi define	2018-03-20 09:58:47 -07:00
Brad Davis	659da9b0e4	Merge remote-tracking branch 'upstream/master' into gl_common	2018-03-20 09:18:56 -07:00
Seth Alves	f61504b814	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-19 14:59:18 -07:00
Seth Alves	bc527d5ae8	try again on expandToLocalDataAbsolutePath	2018-03-19 14:59:10 -07:00
Atlante45	0117179fe4	Pull GA ID from env variables	2018-03-19 14:49:19 -07:00
Zach Fox	0b810c3aa8	Various fixes	2018-03-19 14:39:50 -07:00
John Conklin II	47437c9564	Merge pull request #12651 from ctrlaltdavid/21799 ... Fix "text" overlay not clipping to right and bottom margins	2018-03-19 14:12:20 -07:00
John Conklin II	91db0ab00f	Merge pull request #12650 from ctrlaltdavid/21798 ... Messages API JSDoc	2018-03-19 13:56:57 -07:00
David Rowe	541d798a6b	Update code comment	2018-03-20 09:53:57 +13:00
David Rowe	4b52c21d1c	JSDoc that an entity's clientOnly property can be set at entity creation	2018-03-20 09:51:10 +13:00
Seth Alves	a623ba7499	expandToLocalDataAbsolutePath now expands to a file:// url rather than a qrc:// url	2018-03-19 13:48:31 -07:00
Zach Fox	18aa95e0bb	New Checkout flow for updating specific Editions	2018-03-19 13:35:27 -07:00
Zach Fox	daa68768b9	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-19 12:18:10 -07:00
Cristian Luis Duarte	17fddd9e0e	RenderableWebEntityItem root item check moved to hasWebSurface and buildWebSurface	2018-03-19 15:33:14 -03:00
John Conklin II	9219868406	Merge pull request #12667 from jherico/fix/web_overlay_crash ... HOTFIX RC65: Fix invalid QML surface cache interaction	2018-03-19 10:37:48 -07:00
SamGondelman	8ddf360c79	support relative paths for material images	2018-03-19 09:59:11 -07:00
Seth Alves	af42b5e93f	trying to fix expandToLocalDataAbsolutePath	2018-03-19 09:42:03 -07:00
Seth Alves	a6a2d24dda	Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains	2018-03-19 09:03:26 -07:00
John Conklin II	c1f087dd81	Merge pull request #12678 from zfox23/RC65.1_editHandleFix ... RC65.1: Fix ray cast checks on tablet ID lists in edit.js	2018-03-19 08:29:26 -07:00
Seth Alves	b33f47e540	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-18 17:33:10 -07:00
David Back	3f2a49d243	fix list of tablet IDs ray cast checks in edit.js	2018-03-17 10:59:18 -07:00
Seth Alves	a4599fe7ce	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-16 20:07:35 -07:00
Seth Alves	a144b738e5	fix ACs	2018-03-16 22:39:43 -04:00
John Conklin II	0934a7d467	Merge pull request #12673 from huffman/fix/ie-edge-ds-settings-failure ... Fix DS settings issues on IE and Edge	2018-03-16 17:35:56 -07:00
Sam Gondelman	b96f398274	Merge pull request #12593 from gcalero/android_joystick_rotate_move ... Android joystick rotate move	2018-03-16 17:24:15 -07:00
SamGondelman	06c0b3afd3	disable IK on android, input recorder doesn't do anything if off	2018-03-16 16:52:12 -07:00
SamGondelman	444534f4ff	model behaves correctly if missing material ... (cherry picked from commit 1e89debc4e)	2018-03-16 15:51:37 -07:00
Ryan Huffman	fdca6e0832	Update direct _requestHeaders access to be consistent with other reads	2018-03-16 15:28:27 -07:00
John Conklin II	1bf2da5119	Merge pull request #12670 from SamGondelman/modelCrash ... RC65 Hotfix: Model behaves correctly if missing material	2018-03-16 15:00:29 -07:00
Brad Davis	2f59283053	Fix initialization of QML overlay surfaces	2018-03-16 14:48:08 -07:00
Stephen Birarda	debea3791d	Fix DS content backups not loading on IE ... IE does not support Object.assign	2018-03-16 14:30:03 -07:00
Ryan Huffman	3a98cf284f	Fix DS not handling lowercase header keys	2018-03-16 14:30:03 -07:00
Seth Alves	7a7a9e9af0	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-16 16:55:47 -04:00
Stephen Birarda	472e7c003f	Merge pull request #11860 from huffman/feat/obj-baker-update ... OBJ Baking	2018-03-16 13:54:07 -07:00
SamGondelman	984a48316d	CR	2018-03-16 13:51:29 -07:00
SamGondelman	1e89debc4e	model behaves correctly if missing material	2018-03-16 13:38:45 -07:00
Zach Fox	a792bcc3d3	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-16 13:24:17 -07:00