19753 commits

Author	SHA1	Message	Date
David Kelly	06bd9c97bf	remove info button from avatar image	2017-04-05 18:21:54 -07:00
David Kelly	61ece265f4	now you can forget connections	2017-04-05 18:16:16 -07:00
howard-stearns	6f79b2eaeb	send initial path in location update (e.g., on login)	2017-04-04 12:05:43 -07:00
Howard Stearns	b0fa784267	Merge pull request #10108 from davidkelly/dk/PalImprovementsMostlyZach ... Dk/pal improvements mostly zach	2017-04-04 10:03:10 -07:00
David Kelly	08ac25473f	wording change	2017-04-04 09:53:09 -07:00
Thijs Wenker	2b85563413	Merge pull request #10115 from sethalves/fix-fast-talking ... Fix fast talking	2017-04-04 02:13:09 +02:00
David Kelly	4d6886d1f4	cr feedback, plus changed 'People' to 'Connections' in a couple places	2017-04-03 17:03:14 -07:00
Seth Alves	cb787c2862	Merge pull request #10104 from druiz17/tablet-webView3.0 ... Remove unnecessary prints and code for tabletWebView.qml	2017-04-03 16:10:54 -07:00
Seth Alves	fbf2014f04	Merge pull request #10102 from vladest/tablet-ui-goto ... Put current address to location instead of inputfield	2017-04-03 16:09:58 -07:00
Seth Alves	d1827cf12c	Merge pull request #10002 from fayeli/tablet-photobooth ... Photobooth Improvements: Using Tablet & Ability to Rotate Model	2017-04-03 16:05:13 -07:00
David Kelly	4629accc9c	style updates	2017-04-03 15:35:53 -07:00
Seth Alves	55c2d36752	math fixes, cleanups	2017-04-03 15:30:06 -07:00
Seth Alves	2a43c41954	Merge branch 'master' of github.com:highfidelity/hifi into fix-fast-talking	2017-04-03 14:44:13 -07:00
Seth Alves	7ac09398be	include deltaTime in audioAttack running average	2017-04-03 14:44:05 -07:00
Andrew Meadows	66ff551a7c	Merge pull request #10080 from ZappoMan/footActions ... add foot IK targets as actions, map Kinect feet to foot targets	2017-04-03 12:06:14 -07:00
Seth Alves	7f1095c590	use deltaTime rather than calling usecTimestampNow	2017-04-03 11:55:08 -07:00
Seth Alves	9e08925d7e	involve clock time in _mouthTime calculation	2017-04-03 11:34:29 -07:00
David Kelly	2f1b6be24d	Merge branch 'PAL_v2_Zach_new' of https://github.com/zfox23/hifi	2017-04-03 10:55:55 -07:00
Dante Ruiz	3090629f77	clean up code	2017-04-03 18:51:39 +01:00
Anthony Thibault	999bd0d339	Merge pull request #10075 from sethalves/tablet-ui ... Tablet ui -- misc changes + landscape mode	2017-04-03 10:43:34 -07:00
Seth Alves	c45514a557	Merge pull request #10066 from vladest/tablet-ui-connection-dialog ... Implemented no connection dialog for Tablet UI	2017-04-03 09:57:00 -07:00
Seth Alves	98a54d9119	Merge pull request #10101 from ctrlaltdavid/21252 ... Fix tablet scrolling getting stuck to mouse pointer	2017-04-03 09:52:45 -07:00
Seth Alves	0f936f7511	Merge pull request #10078 from hyperlogic/feature/avatar-skeleton ... Expose Avatar Skeleton to JavaScript	2017-04-03 09:39:35 -07:00
Seth Alves	43e1cec8a3	merge from upstream	2017-04-03 06:28:59 -07:00
Vladyslav Stelmakhovskyi	d207dae5b7	Put current address to location instead of inputfield	2017-04-02 20:02:40 +02:00
David Rowe	2b4afdb987	Fix tablet window getting stuck to pointer if release mouse off tablet	2017-04-02 12:58:11 +12: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
Zach Fox	f148bca1c0	More progress on ComboDialog	2017-03-31 17:12:41 -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
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
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 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
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	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
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
Dante Ruiz	b6901bba3e	added tabletWebView.qml	2017-03-31 18:48:08 +01:00
Vladyslav Stelmakhovskyi	7558765042	Script log now back to HUD	2017-03-31 14:20:15 +02:00
Sam Cake	dd73cb7b8e	Use a magic number gpu::Texture::SINGLE_MIP instead of 1	2017-03-30 23:46:37 -07:00