27302 commits

Author	SHA1	Message	Date
John Conklin II	563ff61325	Merge pull request #12661 from SamGondelman/android ... Android: Stats, disable IK, reduce impact of InputRecorder	2018-03-23 11:08:50 -07:00
John Conklin II	0bc23456c3	Merge pull request #12682 from ctrlaltdavid/21807 ... JSDoc that an entity's clientOnly property can be set at entity creation	2018-03-22 17:55:45 -07:00
Clément Brisset	feec59655c	Merge pull request #12692 from highfidelity/stable ... Merge stable back into master	2018-03-22 15:08:30 -07:00
John Conklin II	6d9892856d	Merge pull request #12510 from sethalves/serverless-domains ... Serverless domains	2018-03-22 14:06:49 -07:00
Stephen Birarda	e8bea3a611	Merge pull request #12369 from simon-walton/BugFix ... Lexer code has confusion between strings and chars	2018-03-22 12:03:47 -07:00
Sam Gondelman	e46a8f022c	Merge pull request #12695 from gcalero/fix/current_context ... Fix/current context	2018-03-22 10:54:34 -07:00
Dante Ruiz	cea0f98aae	reverting files	2018-03-22 09:20:27 -07:00
Dante Ruiz	f5a954d08e	Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains	2018-03-22 09:06:42 -07:00
Gabriel Calero	12b289bbc1	Restore debug logger for GLES. Fix SIGABRT Cannot make QOpenGLContext current in a different thread	2018-03-22 12:38:56 -03:00
Simon Walton	10f3032746	Compare QString w/ char*, not char	2018-03-21 23:09:46 -07:00
Seth Alves	b551b144a7	remove unneeded setIsConnected call	2018-03-21 19:15:27 -07:00
Seth Alves	4f20a87c6d	review	2018-03-21 16:26:02 -07:00
Seth Alves	916ed3a0d4	review	2018-03-21 16:18:31 -07:00
Brad Davis	d529d7b1d3	Remove whitespace before shader version line	2018-03-21 16:07:04 -07:00
Seth Alves	ae94ab3d67	make sure _sockAddr is cleared if the new url isn't a hifi:// one	2018-03-21 15:28:12 -07:00
Seth Alves	bea7ee42e2	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-21 14:30:07 -07:00
Seth Alves	ef52ae13ee	rearrange domain-url-changed signals	2018-03-21 14:30:00 -07:00
John Conklin II	2d63afbe28	Merge pull request #12588 from SamGondelman/shapeTex ... Materials on primitives	2018-03-21 12:08:24 -07:00
John Conklin II	283aff71ec	Merge pull request #12612 from jherico/gl_common ... Break out common GL and GLES code into a single shared library	2018-03-21 11:28:24 -07:00
Seth Alves	4033af9b11	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-21 11:11:43 -07:00
Ken Cooke	f5f4e2a780	Merge pull request #12635 from ctrlaltdavid/21776 ... Fix Window hasFocus(), setFocus(), and raiseMainWindow()	2018-03-21 09:27:51 -07:00
Bradley Austin Davis	d5d8e4c0b0	Restoring geometry shader	2018-03-20 18:28:53 -07:00
Sam Gateau	a7533e5287	Merge pull request #12675 from SamGondelman/hotfix ... Model behaves correctly if missing material	2018-03-20 14:27:21 -07:00
Sam Gateau	e59eed64fb	Merge pull request #12680 from SamGondelman/relative ... Support relative paths for material images	2018-03-20 14:24:50 -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	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
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
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
Cristian Luis Duarte	17fddd9e0e	RenderableWebEntityItem root item check moved to hasWebSurface and buildWebSurface	2018-03-19 15:33:14 -03: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	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
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