2547 commits

Author	SHA1	Message	Date
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
Zach Fox	8a96969471	Merge pull request #9873 from highfidelity/PAL_v2 ... PAL v2.0	2017-03-31 17:00:41 -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
David Rowe	260309ae24	Remove CSS hack no longer needed	2017-04-01 10:53:46 +13: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
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
Howard Stearns	0edbf1fbd9	Merge pull request #10044 from howard-stearns/pal-backend-integration ... Pal backend integration	2017-03-30 12:55:11 -07:00
Howard Stearns	3056bb16a2	typo, and delete request on abort/fail	2017-03-30 12:40:54 -07:00
David Kelly	e66c075f8e	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-30 10:14:29 -07:00
David Rowe	9c4414cff6	No custom styling of marketplaces directory scrollbar	2017-03-30 14:38:17 +13:00
David Rowe	c7f648a6c2	Disable marketplace directory and Clara.io scrollbars in tablet	2017-03-30 14:20:32 +13:00
Zach Pomerantz	4a9fbf2bbd	delay 200ms to avoid recursive audio dev switches	2017-03-29 19:05:41 -04:00
Zach Pomerantz	c30ab4de8b	rm extra setDevice	2017-03-29 18:48:22 -04:00
Zach Fox	a6ff3fcdb7	Tablet PAL bugfix; Connections help text v1	2017-03-29 15:47:19 -07:00
Zach Fox	1b74576259	Fix tablet-close behavior for PAL; remove users-tablet.js	2017-03-29 14:53:45 -07:00
Howard Stearns	b8f557ca54	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration	2017-03-29 13:30:15 -07:00
Howard Stearns	53d484c318	makes connections!	2017-03-29 13:23:31 -07:00
Howard Stearns	b0c97d3a82	putative connection integration for 2-machine testing	2017-03-29 12:22:26 -07:00
Seth Alves	63ccaee129	Merge pull request #10048 from ctrlaltdavid/open-feed-in-tablet ... Open feed in tablet after sharing snapshot from tablet	2017-03-29 10:08:51 -07:00
David Rowe	c618e8e001	Open feed in tablet after sharing snapshot from tablet	2017-03-29 16:52:52 +13:00
Zach Fox	b776f25b3b	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-28 18:09:17 -07:00
Zach Fox	81264c998b	Revert "Merge from upstream/master" ... This reverts commit b5ba4a109d.	2017-03-28 17:39:45 -07:00
Zach Fox	b5ba4a109d	Merge from upstream/master	2017-03-28 17:37:34 -07:00
howard-stearns	c2a49a582e	send credentials to local metaverse servers, and initial users data ... integration.	2017-03-28 16:44:16 -07:00
samcake	a03d3a1ca8	Clean up the utilities scrips of the render folder	2017-03-28 16:00:18 -07:00
Seth Alves	4516ddf855	Merge pull request #9847 from highfidelity/tablet-ui ... Tablet ui	2017-03-28 14:48:02 -07:00
Andrew Meadows	b9e80d3fa5	Merge pull request #9972 from kunalgosar/marketsBug ... Fixed buttons on Marketplace	2017-03-28 12:45:25 -07:00
Zach Pomerantz	06bf5807ae	fix audio setting persistence for already selected device	2017-03-28 15:34:42 -04:00
Zach Pomerantz	5e0cfb6137	short-circuit audio switching on missing device	2017-03-28 15:34:13 -04:00
Zach Pomerantz	1bdef141c3	simplify audio menu parsing	2017-03-28 15:33:54 -04:00
Seth Alves	6df4dda746	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 11:42:14 -07:00
Seth Alves	8e38b41e44	Merge branch 'tablet-ui' of github.com:sethalves/hifi into tablet-ui	2017-03-28 11:41:58 -07:00
Seth Alves	851ea7dabc	fix initial finger/stylus setting	2017-03-28 11:41:51 -07:00
Clément Brisset	82114ae6ab	Merge pull request #9940 from Atlante45/fix/sit ... Fix a few sitting bugs noticed at the meetup	2017-03-28 11:14:31 -07:00
Dante Ruiz	e276bb52d2	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help-script	2017-03-28 18:14:28 +01:00
Dante Ruiz	b0e437cc5a	remove help button from tablet when reloading scripts	2017-03-28 18:14:05 +01:00
Seth Alves	0cae616ab5	Merge pull request #10031 from hyperlogic/bug-fix/mouse-disconnect-issue ... WebTablet.js: Don't remove or add mouse callbacks onHMDChanged	2017-03-28 10:07:52 -07:00
Seth Alves	9e675d4c93	Merge pull request #9990 from hyperlogic/bug-fix/sliders ... Added inputMode property to Web3DOverlay	2017-03-28 10:07:37 -07:00
Anthony J. Thibault	29a159b90d	WebTablet.js: Don't remove or add mouse callbacks onHMDChanged ... This should prevent the exception on destroy, caused by disconnecting a signal that is not attached.	2017-03-28 09:27:13 -07:00
David Kelly	92718b6051	cr feedback	2017-03-28 08:57:27 -07:00
Seth Alves	b50a02ea19	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 08:16:59 -07:00
David Rowe	6a3dea030e	Settings link	2017-03-28 15:15:33 +13:00
David Rowe	55033df354	Merge branch 'tablet-ui' into 21238-b	2017-03-28 14:47:57 +13:00
David Rowe	a6ef592353	Non-scrolling window with images scaled to fit	2017-03-28 14:43:26 +13:00
Seth Alves	cdac011472	fix home button	2017-03-27 18:21:00 -07:00