27322 commits

Author	SHA1	Message	Date
Olivier Prat	3c8cd48dfb	Merge branch 'master' of http://github.com/highfidelity/hifi into fade	2018-03-29 07:21:01 -04:00
Cristian Luis Duarte	fe9481b28d	Cleanup code, comment out log, simplify radar is valid touch code (no more flag)	2018-03-28 19:50:44 -03:00
Olivier Prat	e4416db06f	Added save/file dialog for transition configurations in transition editor	2018-03-28 16:54:53 -04:00
Cristian Luis Duarte	f0bcaa47c8	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-28 16:47:21 -03:00
Olivier Prat	7fa5e384b9	Merge branch 'master' of http://github.com/highfidelity/hifi into fade	2018-03-28 11:21:07 -04:00
Seth Alves	46fb2033f2	Merge pull request #12574 from druiz17/remap-keybaord ... changing keyboard mapping	2018-03-27 19:00:05 -07:00
Seth Alves	6948de7e24	default to serverless tutorial	2018-03-26 14:32:40 -07:00
Dante Ruiz	b8796db1e5	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-26 09:13:58 -07:00
Cristian Luis Duarte	6cb5cd7f92	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-26 11:19:42 -03:00
Cristian Luis Duarte	242b009562	Android - Use mouse events for interacting with UI. Now LoginDialog UI interation does not move radar camera. Remove repeated tooggle call in audio.js. Adapt button to simulated mouse events.	2018-03-23 18:59:55 -03:00
SamGondelman	a19f71e759	fix tonemapping on android	2018-03-23 14:16:47 -07:00
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
Dante Ruiz	4d52caccde	making some more requested changes	2018-03-22 17:39:22 -07:00
Dante Ruiz	1d17658c80	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-22 16:29:16 -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
Dante Ruiz	86cd5ffa30	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-21 08:49:25 -07:00
Bradley Austin Davis	d5d8e4c0b0	Restoring geometry shader	2018-03-20 18:28:53 -07:00
Olivier Prat	6b44d79f90	Proposal to improve fade editing with some extra visual cues	2018-03-20 17:48:41 -07:00
Olivier Prat	143a315f1d	Fade edited objects are now selected with ray picking	2018-03-20 15:29:50 -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