2587 commits

Author	SHA1	Message	Date
David Rowe	23c937e55d	Make avatar recording and upload to asset server	2017-04-06 18:50:47 +12:00
David Rowe	a9f5b60319	Fix recording starting on tablet when close dialog rather than tablet	2017-04-06 15:32:42 +12:00
David Rowe	982c0ec559	Display countdown in overlay	2017-04-06 15:01:53 +12:00
David Rowe	4580b89aa6	Add countdown delay before starting recording	2017-04-06 12:08:27 +12:00
David Rowe	096909d423	Close dialog if open when stop script	2017-04-06 10:10:07 +12:00
David Rowe	b8de31db12	Make toolbar icon close dialog if it's open	2017-04-06 10:09:41 +12:00
David Rowe	813a5684e3	Display instruction text only if recording is enabled	2017-04-06 09:22:01 +12:00
David Rowe	b29bfd4bb4	Dialog instructions refer to tablet or window as appropriate	2017-04-05 17:49:13 +12:00
David Rowe	54a0bea8c0	Toolbar icon state and start/stop recording with window closing/opening	2017-04-05 17:48:35 +12:00
David Rowe	a625fd4523	Add dialog with "Enable recording" checkbox	2017-04-05 16:20:04 +12:00
David Rowe	d748068373	Stub new avatar recording script that records when tablet is hidden	2017-04-05 13:19:46 +12:00
Seth Alves	b0b214012c	Merge pull request #10118 from hyperlogic/bug-fix/tablet-restart-scripts ... Fix broken eventBridge on tablet after Reload All Scripts.	2017-04-04 10:45:08 -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
Anthony J. Thibault	8ff457a1b6	Fix broken eventBridge on tablet after Reload All Scripts. ... The main issue here was the "webEventReceived" connection between the OffscreenQMLSurface and the TabletProxy object. For whatever reason, if this is not a direct Signal to Slot connection, the webEventReceived event does not propagate.	2017-04-03 16:03:55 -07:00
Faye Li	2ca4203d85	fix for submerge in floor issue	2017-04-03 12:57:51 -07:00
Faye Li	d726bd352d	fix for locked camera state issue	2017-04-03 12:14:29 -07: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	b9e84691ad	Merge pull request #10092 from ctrlaltdavid/dead-code ... Remove some dead code in edit.js	2017-04-03 09:40:30 -07:00
Seth Alves	43e1cec8a3	merge from upstream	2017-04-03 06:28:59 -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
Zach Fox	8a96969471	Merge pull request #9873 from highfidelity/PAL_v2 ... PAL v2.0	2017-03-31 17:00:41 -07:00
David Rowe	6a23f3a59b	Remove some dead code noticed in passing	2017-04-01 11:25:42 +13: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
Seth Alves	715493922e	code review	2017-03-30 17:33:01 -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
Seth Alves	c62b07d26f	add setLandscape call to tablet	2017-03-30 11:36:21 -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
Seth Alves	ce9eb1a377	more tablet landscape changes	2017-03-29 14:21:38 -07:00
Seth Alves	371df35013	remove code related to tablet being a model rather than an overlay. start on landscape mode	2017-03-29 14:16:14 -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