2266 commits

Author	SHA1	Message	Date
David Rowe	45ca8438fa	Persist finish-on-open checkbox value to settings	2017-04-13 18:29:39 +12:00
David Rowe	b508d6882f	Add checkbox that stops countdown/finishes recording when reopen dialog	2017-04-13 17:59:28 +12:00
David Rowe	84cfe1cb75	Don't close dialog when start recording; press "Record" again to finish	2017-04-13 17:00:35 +12:00
David Rowe	c369b1314a	Remove countdown overlays	2017-04-13 16:32:03 +12:00
David Rowe	afd82f09c0	Provide instructions on running the AC player script	2017-04-13 15:18:04 +12:00
David Rowe	e21e15c064	Update warning dialog to refer to player "instance"	2017-04-13 14:01:37 +12:00
David Rowe	5ad44b6caf	Display empty rows for unused players	2017-04-13 13:50:26 +12:00
David Rowe	24a68ea685	Report the numnber of free players rather than total number	2017-04-13 13:40:52 +12:00
David Rowe	464bc17491	Column heading for "unload" buttons	2017-04-13 13:40:20 +12:00
David Rowe	8bbce53f74	Reset player details when domain restarts or user teleports	2017-04-13 12:23:10 +12:00
Seth Alves	0dab94fada	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0	2017-04-12 16:34:46 -07:00
Seth Alves	0eb9507a10	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0	2017-04-12 16:25:50 -07:00
Zach Fox	3f91fb8e55	Remove unnecessary comment	2017-04-12 14:45:57 -07:00
Zach Fox	c724c2e50b	New loading icon	2017-04-12 14:45:57 -07:00
Zach Fox	87b2d5bf8a	New loading icon	2017-04-12 14:45:57 -07:00
Zach Fox	75f1168b19	Clearer function names	2017-04-12 14:45:57 -07:00
Zach Fox	7b92989b1d	Fix it	2017-04-12 14:45:57 -07:00
Zach Fox	2579ac1baa	It's working!	2017-04-12 14:45:57 -07:00
Zach Fox	e296383b1b	Checkpoint!	2017-04-12 14:45:56 -07:00
volansystech	7bc3435cfa	Initial Commit.. ... If distanceToObject from avatar is more than 15, we are accelarting entity travel by 2x. This will help user to grab the entity in lesser time.	2017-04-13 02:51:30 +05:30
David Rowe	7dddd266ba	Merge branch 'master' into 21249	2017-04-13 08:39:32 +12:00
Seth Alves	026dde2e68	allow kinematic near-grab to be turned on or off for a given entity	2017-04-12 10:14:16 -07:00
volansystech	5639a3f92a	Far to near grab: If the object is capable of being equipped, transfer from far-grab to an equipped state.	2017-04-12 20:08:26 +05:30
David Rowe	50a06db1b9	Display "REC" indicator when recording	2017-04-12 15:56:59 +12:00
David Rowe	f30dc4b560	Add a "record" button to initiate recording	2017-04-12 15:04:29 +12:00
David Rowe	905560b96d	Remove checkbox and record-on-close functionality	2017-04-12 14:48:15 +12:00
Thijs Wenker	695c55bc3d	fix teleport cool-in, added missing TARGETTING state and some ESLINT style fixes	2017-04-12 03:44:24 +02:00
David Rowe	3ae388bded	Rework auto-playback	2017-04-12 13:32:34 +12:00
David Rowe	0d9e0ebfec	Merge branch 'master' into 21249	2017-04-12 08:45:01 +12:00
Chris Collins	b07ed13023	Merge pull request #10184 from druiz17/snapshot-fix ... snapshot bug fixes	2017-04-11 13:00:46 -07:00
volansystech	99af493ac8	Resolved the issue from the Initial commit - "grabbedEntity" stays into that grabbed position for a few seconds (hanging into mid of air) before dropping down automatically. ... Successfully converted far grab into near grab when entity is closer to the Avatar. When Trigger is released after converted far grab into near grab far, the obect is dropped successfully.	2017-04-11 21:57:01 +05:30
David Rowe	86baf785aa	Add "Load" button	2017-04-11 15:23:09 +12:00
Dante Ruiz	daf25c1fe8	fix crashes when clicking in the homebutton	2017-04-11 00:25:08 +01:00
David Rowe	559fba39ab	Remove avatar after stopping recording	2017-04-11 10:17:52 +12:00
David Rowe	9a9bcaf2ae	Stop button stops playing recording	2017-04-11 09:37:57 +12:00
Dante Ruiz	382204a9a9	open feed after logging in	2017-04-10 22:33:07 +01:00
Dante Ruiz	df6498c67c	fix snapshot login for toolbar-mode	2017-04-10 21:59:37 +01:00
Dante Ruiz	6922ba5c77	removed unnessary prints	2017-04-10 21:08:40 +01:00
Dante Ruiz	e0f19944bc	Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix	2017-04-10 20:58:46 +01:00
Dante Ruiz	4e94aaa9e8	finished allowing to go back to previous app	2017-04-10 20:58:10 +01:00
David Rowe	bd63960876	Add table of recordings currently being played	2017-04-11 07:23:52 +12:00
David Rowe	0a19b502fd	Merge branch 'master' into 21249	2017-04-11 07:04:05 +12:00
David Rowe	9495bf6a47	Fix auto-playback logic	2017-04-10 19:56:46 +12:00
David Rowe	8e3bc31c36	Fix persisting new recording	2017-04-10 19:28:21 +12:00
David Rowe	b5bf7dc12f	Tidying	2017-04-10 16:47:35 +12:00
David Rowe	6a88398e8e	Handle AC script not being able to create an entity	2017-04-10 15:55:05 +12:00
David Rowe	1cc215e14b	Fix test that recording just made started playing	2017-04-10 15:31:38 +12:00
David Rowe	3b32a4f74f	Address AC scripts claiming same entity to play	2017-04-10 15:04:54 +12:00
Anthony Thibault	746b7aadbd	Merge pull request #10133 from sethalves/fix-teleport-which-something-equipped ... Fix teleport when something equipped	2017-04-09 19:00:21 -07:00
David Rowe	6896fe3ac6	Merge branch 'master' into 21249	2017-04-10 09:05:57 +12:00
David Rowe	d60d4d0755	Auto-play recording at start-up	2017-04-09 15:52:56 +12:00
David Rowe	adabcab888	Add invisible entity to persist playback of recording	2017-04-08 16:24:58 +12:00
David Rowe	d1e49cd926	Add and stub out stop, autoplay, and persistence to AC script	2017-04-08 14:57:37 +12:00
Dante Ruiz	86c67a3017	tablet pages	2017-04-08 02:01:21 +01:00
Chris Collins	8e12f62cbb	Merge pull request #10153 from druiz17/goto-fix ... Ability to toggle goto with the crt-l and enter keys	2017-04-07 16:36:41 -07:00
David Rowe	ef4f3368f9	Play recording just made from original start position and orientation	2017-04-08 11:06:34 +12:00
David Rowe	ebe3561582	Merge branch 'master' into 21249	2017-04-08 10:46:16 +12:00
volansystech	e0b08a5e4e	Initial Commit of far to near grab conversion. Works only if object drawn at chest level And Object is near by to hand.	2017-04-07 21:55:26 +05:30
Howard Stearns	5d341778c5	fix notification word wrapping	2017-04-07 07:08:19 -07:00
David Rowe	1ef5f048a3	Inform user if recording failed to start	2017-04-07 18:53:20 +12:00
David Rowe	ce898ae42a	Play recording	2017-04-07 18:38:55 +12:00
David Rowe	75d970f5d5	Remove unresponsive players from list	2017-04-07 17:30:03 +12:00
David Rowe	81d8d238de	Refactor log and error messages	2017-04-07 17:13:23 +12:00
David Rowe	5e55233934	Assignment client player script receives "play" command from recorder	2017-04-07 17:04:24 +12:00
David Rowe	506a414762	Lint fix	2017-04-07 14:06:16 +12:00
David Rowe	858e9650a3	Encapsulate recording methods in Recorder object	2017-04-07 14:03:08 +12:00
howard-stearns	b089fd03b8	make connection messaging when not logged in	2017-04-06 16:48:11 -07:00
David Rowe	68901c8af5	Merge branch 'master' into 21249	2017-04-07 11:04:43 +12:00
David Rowe	49907970fb	Fix countdown showing if restart with dialog open and recording enabled	2017-04-07 11:01:11 +12:00
David Rowe	f164fe7532	Improve error handling	2017-04-07 10:46:40 +12:00
Dante Ruiz	a89081601c	fix merge issues	2017-04-06 22:31:47 +01:00
Dante Ruiz	52fd446d4d	toggle goto in tablet	2017-04-06 22:27:37 +01:00
Howard Stearns	f7ef587c61	Merge pull request #10138 from davidkelly/dk/3935 ... Now you can forget connections	2017-04-06 14:05:25 -07:00
David Kelly	34a2cefb98	Merge pull request #10132 from davidkelly/dk/analyticsForConnections ... initial analytics for connections	2017-04-06 10:45:39 -07:00
David Kelly	a92162dea9	no mo useless debug statements	2017-04-06 08:50:22 -07:00
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 Kelly	61ece265f4	now you can forget connections	2017-04-05 18:16:16 -07: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
Seth Alves	2e4e10759f	teleport raypick now ignores equipped or grabbed entities	2017-04-05 13:17:03 -07:00
David Kelly	1b6bf90843	initial analytics for connections	2017-04-05 11:10:06 -07: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
Anthony J. Thibault	c33f10ca1b	Recenter body on teleport, also it works more consistently. ... If your avatar happens to be squatting, your body will stand up straight after you teleport. Also, setting MyAvatar.position can sometimes fail due to the multi-threaded nature of scripting. Instead, teleport.js uses goToPosition to move the avatar, as a result teleport feels much more responsive now.	2017-04-04 18:05:46 -07:00
kunalgosar	a5b10cc51e	alert window to give directions	2017-04-04 15:35:38 -07:00
kunalgosar	b8500e45ad	added tutorial	2017-04-04 15:35:38 -07:00
kunalgosar	d66038fff2	press B to exit finger painting	2017-04-04 15:35:38 -07: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
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
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
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
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