53107 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stephen Birarda	7b48feca66	address code review comments	2017-04-14 11:53:53 -07:00
Stephen Birarda	1b24538756	modify scripts to use new recording API	2017-04-05 11:18:52 -07:00
Stephen Birarda	c7a28a527a	cleanup Agent recording handling, make loadRecording async	2017-04-04 10:56:25 -07:00
Stephen Birarda	6ed4295b8b	make sure HeadData is present before processing recording frames	2017-04-03 13:55:11 -07:00
Ryan Huffman	29b966ee04	Merge pull request #10093 from huffman/fix/tutorial-lighter-intersection ... Fix the tutorial lighter using properties inside intersection results	2017-04-03 09:31:10 -07:00
Chris Collins	3c62826ef9	Merge pull request #10091 from ctrlaltdavid/21248 ... Fix HTML controls not working properly in the tablet	2017-04-01 08:41:44 -07:00
Chris Collins	cc8b52fff4	Merge pull request #10095 from druiz17/tablet-webView2.0 ... Tablet webview now uses mobile format	2017-04-01 08:33:09 -07:00
Dante Ruiz	7ca7ad5e0b	removed junk file	2017-04-01 01:53:00 +01:00
Chris Collins	6fe210da66	Merge pull request #10094 from sethalves/tablet-ui-fix-hmd-login ... fix login-screen for hmd+tablet	2017-03-31 17:17:30 -07:00
Zach Fox	8a96969471	Merge pull request #9873 from highfidelity/PAL_v2 ... PAL v2.0	2017-03-31 17:00:41 -07:00
Dante Ruiz	b10f491c6e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView2.0	2017-04-01 00:58:37 +01:00
Dante Ruiz	d1bf3e4bf2	fixed webview mobile view	2017-04-01 00:58:09 +01:00
Zach Fox	fd3167ca9c	'PEOPLE' back to 'CONNECTIONS'	2017-03-31 16:41:25 -07:00
Seth Alves	3cd134d138	fix login-screen for hmd+tablet	2017-03-31 16:41:21 -07:00
Andrew Meadows	0181783290	Merge pull request #10064 from samcake/ambient ... Fix the sharp reflection happening after pr 10036 and bugs on backend 4.1	2017-03-31 16:04:00 -07:00
Seth Alves	cec02bbf6f	Merge pull request #10011 from humbletim/fix-rightclick-menu-again ... Fix right-click popup menus in web views	2017-03-31 15:48:11 -07:00
Ryan Huffman	45726c33d8	Fix the tutorial lighter using properties inside intersection results ... Entity properties are no longer included in intersection results.	2017-03-31 15:46:45 -07:00
Chris Collins	b36f688a5a	Merge pull request #10089 from sethalves/tablet-ui-use-stylus-by-default ... use tablet-ui stylus as default, rather than avatar finger	2017-03-31 15:34:37 -07:00
David Rowe	f397adb22a	Reinstate scrollbars to marketplace pages	2017-04-01 11:06:27 +13:00
David Kelly	8ceb6a20f0	friend/unfriend working	2017-03-31 15:05:21 -07:00
Zach Fox	6a4c2c5e12	Fix issues; checkpoint on new ComboDialog	2017-03-31 14:56:42 -07:00
samcake	467ea787c6	Adress Seth's review	2017-03-31 14:54:00 -07:00
David Rowe	260309ae24	Remove CSS hack no longer needed	2017-04-01 10:53:46 +13:00
David Rowe	25ac82f162	Don't send "move" events for non-move events	2017-04-01 10:47:04 +13:00
David Rowe	b03fd44240	Fix controls in HTML pages not responding to mouse events on tablet	2017-04-01 10:40:06 +13:00
Clément Brisset	9d0676dd87	Merge pull request #10088 from huffman/stable-merge ... Stable merge	2017-03-31 14:27:42 -07:00
Howard Stearns	0c07003768	Merge pull request #10049 from AndrewMeadows/avoid-invisible-avatars ... Avoid invisible avatars	2017-03-31 13:48:41 -07:00
Howard Stearns	0f90ba49ba	Merge pull request #10090 from howard-stearns/fix-location-node-id-update ... restore lost code	2017-03-31 13:30:25 -07:00
howard-stearns	5c8b2ba1c3	restore lost code	2017-03-31 13:28:14 -07:00
Seth Alves	8d4982d794	Merge pull request #10087 from druiz17/tablet-webView ... Better webview handing for the tablet	2017-03-31 13:26:56 -07:00
Seth Alves	54c66aff07	use tablet-ui stylus as default, rather than avatar finger	2017-03-31 13:18:40 -07:00
Seth Alves	3073b47ea3	Merge pull request #10065 from ctrlaltdavid/21242 ... Address tablet scrollbar issues	2017-03-31 12:43:53 -07:00
Ken Cooke	fa53ebef30	Merge pull request #9996 from zfox23/cleanup_selectAudioDevice ... FB3651: Fix audio devices switching when they shouldn't	2017-03-31 12:07:49 -07:00
samcake	c8970dd704	Fixing the warning on windows	2017-03-31 11:34:03 -07:00
Dante Ruiz	70d2d69557	Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView	2017-03-31 19:29:31 +01:00
Dante Ruiz	9658e1b8ac	better web view handling	2017-03-31 19:25:03 +01:00
Howard Stearns	fc1b2d8bee	Merge pull request #10086 from howard-stearns/PAL_v2 ... update from master to pal	2017-03-31 10:51:48 -07:00
Dante Ruiz	b6901bba3e	added tabletWebView.qml	2017-03-31 18:48:08 +01:00
howard-stearns	364bfd84bd	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-31 10:46:35 -07:00
samcake	6a0c07a692	Fixing a bad counter for numFaces	2017-03-31 10:39:13 -07:00
Sam Cake	dd73cb7b8e	Use a magic number gpu::Texture::SINGLE_MIP instead of 1	2017-03-30 23:46:37 -07:00
Sam Cake	61d78bc931	BRinging the cool texture management of the gl45 backend to gl41, which fixes the broken ao on 41 among other things	2017-03-30 23:29:37 -07:00
samcake	47e9668b8f	improving the gl41 backend to mimic the gl45	2017-03-30 17:59:59 -07:00
Dante Ruiz	8f402c73b0	saving work 2.0	2017-03-31 01:18:31 +01:00
Zach Fox	4712ec7400	Reset pollCount; debug log when expired generated by client	2017-03-30 17:02:15 -07:00
David Rowe	a5c683192b	Improve entity properties scroll handle operation in tablet	2017-03-31 12:26:22 +13:00
Zach Fox	05c34fb3ee	Move some things around so ComboBox works (and layout improves)	2017-03-30 15:19:19 -07:00
samcake	25edb44b75	Fix the problem with the cursor and scattering,	2017-03-30 15:15:14 -07:00
Ryan Huffman	150dcd7dec	Merge remote-tracking branch 'upstream/master' into stable-merge	2017-03-30 14:22:27 -07:00
Zach Fox	c24b8b47a9	Minor layout changes	2017-03-30 14:08:29 -07:00