2561 commits

Author	SHA1	Message	Date
David Rowe	6d9bf2b33e	Typos	2017-05-16 13:58:42 +12:00
David Rowe	6bdd498ecf	Cancel autoplay when manually playing	2017-05-16 10:47:52 +12:00
David Rowe	5c5eb298f5	Better error message	2017-05-16 09:20:58 +12:00
David Rowe	8480a8e7d5	Merge branch 'master' into 21334	2017-05-16 08:52:31 +12:00
Philip Rosedale	6e82343b29	Merge pull request #10406 from amvmoody/21289 ... 21289 - Edit: Add the ability to duplicate an object with hand controller	2017-05-13 20:43:52 -07:00
Zach Fox	d189f3f110	Fix the twitter mention	2017-05-12 12:39:10 -07:00
David Rowe	2bed69cfea	Display playback errors only for user that initiated playback	2017-05-12 15:18:25 +12:00
David Rowe	acd71caae2	Inform user when an AC error prevents a recording from playing	2017-05-12 14:53:38 +12:00
David Rowe	42aacb07ff	Remove check that recording has started playing	2017-05-12 14:14:24 +12:00
David Rowe	26672b475f	Clear timer value when timer stopped	2017-05-12 14:13:32 +12:00
hiflex	a4406906f3	Fix the Face Camera checkbox on the text entity properties tab. ... The checkbox appeared unchecked even if the underlying property was true.	2017-05-11 20:12:10 -05:00
David Rowe	d7a4396daa	Improve log messages	2017-05-12 11:45:11 +12:00
David Rowe	f74e29e4b0	Code review	2017-05-12 11:43:12 +12:00
David Rowe	021c3dff32	Merge branch 'master' into 21334	2017-05-12 10:34:16 +12:00
David Kelly	52c288bfed	Desktop users of different height can shake hands	2017-05-11 14:20:42 -07:00
Seth Alves	9d63113e62	Merge pull request #10337 from vladest/audio-source-sync ... Audio source sync	2017-05-11 12:50:38 -07:00
Vladyslav Stelmakhovskyi	bd6ac7a39e	Code style fixes	2017-05-11 20:38:09 +02:00
David Kelly	0ea5bf7834	Merge pull request #10440 from davidkelly/dk/fixSettingsDialog ... Fix for multiple settings dialogs	2017-05-11 08:11:16 -07:00
Vladyslav Stelmakhovskyi	f963233a7b	Merge branch 'master' into audio-source-sync	2017-05-11 15:25:24 +02:00
Thijs Wenker	0a3a2705af	Merge pull request #10426 from huffman/fix/tablet-invisible-by-default ... Fix tablet showing up for a short period of time on launch	2017-05-11 15:03:52 +02:00
Mike Moody	89d93ee56d	Updated HMD grab Clone to work with all entity types.	2017-05-11 04:16:22 -07:00
Philip Rosedale	f9567d0330	Merge pull request #10182 from CraftsmanMG/master ... hifi: #21216 - Resize entities with hand controllers while editing	2017-05-10 22:03:35 -07:00
David Kelly	4cc0aaf102	Fix for multiple settings dialogs	2017-05-10 18:31:57 -07:00
Triplelexx	7edda87330	change default particle to wispy smoke	2017-05-11 01:21:42 +01:00
Howard Stearns	3c652a52d8	Merge pull request #10431 from davidkelly/dk/messageLoggedInStatus ... minor handshake script update	2017-05-10 13:54:21 -07:00
Vladyslav Stelmakhovskyi	2328da3c48	Merge branch 'master' into audio-source-sync	2017-05-10 21:22:40 +02:00
Vladyslav Stelmakhovskyi	2d46f9d30e	Move most of the logic to C++ model, speed up initialization. Reduce number of AudioClient blocking calls to minimum	2017-05-10 21:21:39 +02:00
Chris Collins	3b5b567578	Merge pull request #10409 from hyperlogic/bugfix/hand-lasers-in-third-person-view ... Hand controller lasers work better in thirdPerson camera mode.	2017-05-10 10:35:35 -07:00
David Kelly	4536d3c484	cr feedback	2017-05-10 10:09:45 -07:00
David Kelly	a45dc673be	minor handshake script update	2017-05-09 17:33:33 -07:00
Zach Fox	8c2851b996	Merge pull request #10425 from zfox23/PAL_FixConnectionsDrift ... Enable the PAL to update data about a single connection	2017-05-09 16:01:45 -07:00
David Rowe	c2d22a1246	Log stopping playing recording	2017-05-10 10:57:53 +12:00
David Rowe	771b76690c	Clear timeout that checks recording started when stop recording	2017-05-10 10:56:23 +12:00
David Rowe	a7cc582459	Don't multiply heartbeats	2017-05-10 10:32:43 +12:00
Ryan Huffman	51db0cef98	Fix tablet showing up for a short time on launch	2017-05-09 15:12:12 -07:00
Zach Fox	cf3c10c5b1	Fix the bugs, add the feature	2017-05-09 14:40:41 -07:00
David Kelly	5b33e0233c	fix typo in handshake script	2017-05-09 13:27:42 -07:00
Howard Stearns	713ddd5cef	Merge pull request #10408 from davidkelly/dk/updatePalForProfileUrl ... Use new images in api/v1/users response json	2017-05-09 12:01:47 -07:00
David Kelly	d40984b475	Merge pull request #10384 from davidkelly/dk/minorHandshakeImprovement ... Some minor handshake improvements	2017-05-09 09:14:31 -07:00
Anthony J. Thibault	b276970258	Hand controller lasers work better in thirdPerson camera mode.	2017-05-08 14:32:50 -07:00
David Kelly	7d0494dd56	use new images in api/v1/users response json	2017-05-08 12:15:03 -07:00
Mike Moody	dae652d3db	v1 HMD duplication overlay.	2017-05-08 11:25:24 -07:00
Vladyslav Stelmakhovskyi	d0111ac0bb	Merge branch 'master' into audio-source-sync	2017-05-08 20:09:34 +02:00
Mike Moody	03490c81da	v1 with bug, looking into.	2017-05-06 15:36:18 -07:00
Triplelexx	fae51c5c46	change default particle texture to production	2017-05-06 20:12:09 +01:00
Seth Alves	9e0845f17e	Merge pull request #10387 from vladest/tablet-performance ... Decrease CPU usage in tabletUI periodical updates	2017-05-06 07:07:29 -07:00
Vladyslav Stelmakhovskyi	b2be22f0e0	Maerge broke the logic. Fixed now	2017-05-06 10:28:57 +02:00
Vladyslav Stelmakhovskyi	e395a51c60	Merge with master	2017-05-05 07:05:16 +02:00
Seth Alves	9ee6badc86	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 19:06:13 -07:00
Seth Alves	92966377fb	Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 19:05:57 -07:00
Seth Alves	900fae30fd	avoid calling editEntity on overlays	2017-05-04 19:05:52 -07:00
Seth Alves	70efe4aa4f	avoid calling editEntity on overlays	2017-05-04 18:52:17 -07:00
Howard Stearns	d9540d7ece	Merge pull request #10390 from zfox23/newSnapshotReview_Improvements3 ... Lots of Snapshot app improvements, Round Three	2017-05-04 17:05:37 -07:00
Seth Alves	960bab6e4e	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 16:42:57 -07:00
David Kelly	a4125c1507	logic tweak	2017-05-04 16:33:50 -07:00
Howard Stearns	fc9e9e1d28	Merge pull request #10374 from howard-stearns/notification-circumstances ... Notification circumstances	2017-05-04 16:18:58 -07:00
Zach Fox	6a33ef49c2	New language for unshareable snaps	2017-05-04 16:17:33 -07:00
Zach Fox	2ad3346697	Are there bugs?	2017-05-04 16:05:20 -07:00
Zach Fox	946c5e7662	Almost finished with not-logged-in and not-shareable	2017-05-04 15:24:51 -07:00
howard-stearns	25ab8e7e94	debugging on call, but mostly, specify json headers, etc.	2017-05-04 14:45:58 -07:00
Anthony Thibault	7006fa6da4	Merge pull request #10257 from sethalves/grab-try-timer-instead-of-update ... grab is driven by timer rather than update, load tablet model with high priority	2017-05-04 14:07:21 -07:00
Vladyslav Stelmakhovskyi	ba5a371da1	Decrease CPU usage in tabletUI periodical updates	2017-05-04 22:54:41 +02:00
David Kelly	5b56956637	Some minor handshake improvements	2017-05-04 12:38:17 -07:00
Triplelexx	0d21d7108e	change default particle properties	2017-05-04 19:27:43 +01:00
Zach Fox	b08d23924a	Keep hover status of both images in sync	2017-05-04 11:00:13 -07:00
Zach Fox	b01bff061e	Hover lock when uploading	2017-05-04 10:06:52 -07:00
Zach Fox	c7f5115e26	Move help text to above buttons	2017-05-04 10:06:52 -07:00
Seth Alves	9ab2a61a4b	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 10:04:18 -07:00
howard-stearns	a7e3fad23e	Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances	2017-05-04 10:03:57 -07:00
Seth Alves	ecd690e5e9	Merge pull request #10348 from ctrlaltdavid/21311 ... Don't sort recordings	2017-05-04 09:59:12 -07:00
Seth Alves	006c5a3c20	Merge pull request #10347 from ctrlaltdavid/21310 ... Don't warn that recording didn't start playing if you stop it	2017-05-04 09:58:25 -07:00
Seth Alves	ed09dcbdc9	don't call editEntity on overlays	2017-05-03 21:32:06 -07:00
howard-stearns	3e57e80465	use new request module.	2017-05-03 16:39:34 -07:00
howard-stearns	aa74dda9f3	cleanup	2017-05-03 16:29:37 -07:00
howard-stearns	a007c1fe4b	Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances	2017-05-03 13:46:00 -07:00
howard-stearns	42887d41c4	debugging	2017-05-03 13:45:48 -07:00
Howard Stearns	fb8cfd720e	Merge pull request #10362 from cfresquet/requestModuleRefactor ... Request module refactor	2017-05-03 11:57:23 -07:00
Zach Fox	ae72b9b73d	Merge pull request #10357 from zfox23/newSnapshotReview_Improvements2 ... Lots of Snapshot app improvements, Round Two	2017-05-03 11:44:40 -07:00
howard-stearns	33356b94d1	Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances	2017-05-03 11:43:18 -07:00
Zach Fox	c82a07016d	New Preparing text; Better disabled behavior	2017-05-03 11:30:44 -07:00
Zach Fox	09488c4987	Disabled state for share butotns	2017-05-03 11:02:44 -07:00
CFresquet	afa72210e0	requested tweaks to makeUserConnection.js	2017-05-03 10:28:44 -07:00
CFresquet	28b166c51f	further request fiddling	2017-05-03 07:51:49 -07:00
CFresquet	b54ea63af7	incremental request module fixes	2017-05-03 07:35:30 -07:00
Zach Fox	ff3a76f716	No magic numbers!	2017-05-02 18:23:15 -07:00
Zach Fox	653dda7000	Fix pausing after snapshot in HMD	2017-05-02 17:21:50 -07:00
Zach Fox	aa46534b60	Whoops.	2017-05-02 17:10:57 -07:00
Zach Fox	964e79ce14	It's working!	2017-05-02 16:58:33 -07:00
Zach Fox	68fa8e06ef	Super amped about this. Only need to add disabled state?	2017-05-02 16:38:16 -07:00
Seth Alves	0cd0e46ca5	make clone work again	2017-05-02 16:20:59 -07:00
howard-stearns	6f52bb4b37	Merge branch 'master' of https://github.com/highfidelity/hifi into notification-circumstances	2017-05-02 16:16:27 -07:00
Zach Fox	5d38cd543d	Yet another checkpoint	2017-05-02 16:06:13 -07:00
Zach Fox	7817c72ea1	Another checkpoint	2017-05-02 15:58:43 -07:00
Seth Alves	f1170dc17d	AvatarList not AvatarManager	2017-05-02 15:48:12 -07:00
Seth Alves	eed4da3570	some cleanups, delete far-grabs during transition to near-grab rather than set ttl to zero	2017-05-02 15:36:38 -07:00
Zach Fox	0beceae59b	Checkpoint	2017-05-02 15:19:20 -07:00
Zach Fox	1067d1e0f6	Don't let user blast in certain cases	2017-05-02 14:43:16 -07:00
Zach Fox	d8095c5ea5	New setup instructions; new 'blank snapshot' text	2017-05-02 14:20:27 -07:00
Zach Fox	d1dff7606c	Lint cleanup; Immediate share button visibility;	2017-05-02 14:10:24 -07:00
Zach Fox	5302110e7b	Merge pull request #10346 from zfox23/newSnapshotReview_Improvements ... Lots of Snapshot app improvements, Round One	2017-05-02 13:00:08 -07:00
Vladyslav Stelmakhovskyi	e789b69a8e	Merge branch 'master' into audio-source-sync	2017-05-02 20:57:01 +02:00
howard-stearns	9b117165bd	expire our announcements when we leave, and turn off messagesWaiting when ... everything is expired.	2017-05-02 11:44:16 -07:00
Howard Stearns	3a36feacad	On touch, grip is a trigger, not a button, so it can have lots of callbacks with slightly different values that we ignore. In that case, don't update hand/joint.	2017-05-02 11:29:51 -07:00
Zach Fox	c9e0679b70	Subscribe to changes to snapshotsLocation setter for better UX	2017-05-02 10:55:57 -07:00
Zach Fox	f453df36cf	Prevent cursor appearance in snaps	2017-05-02 10:11:54 -07:00
Zach Fox	a754c4d6cc	Still image on top	2017-05-02 10:11:54 -07:00
Zach Fox	0ead9e5a24	Visual fixes; Select only 1 image at a time	2017-05-02 10:11:53 -07:00
Zach Fox	d295b5a69d	ShareBarHeight-= 5px; Remove test call	2017-05-02 10:11:53 -07:00
Zach Fox	5b168301bc	Update some typefaces; Add margins to pics	2017-05-02 10:11:53 -07:00
Zach Fox	ac86c13477	Fix sharing; disable HiFi buttons independently	2017-05-02 10:11:53 -07:00
Seth Alves	dc569051f9	Merge branch 'master' of github.com:highfidelity/hifi into grab-try-timer-instead-of-update	2017-05-02 09:50:13 -07:00
David Rowe	cb8f75394d	Don't sort recordings	2017-05-02 12:08:39 +12:00
David Rowe	dd739d73a0	Don't warn that recording didn't start playing if you stop it	2017-05-02 12:01:55 +12:00
CFresquet	55fdf35c4a	merge of Request module	2017-05-01 13:02:18 -07:00
Howard Stearns	9fab66b66a	Merge pull request #10328 from howard-stearns/tablet-discovery-events ... fix announcement suggestions	2017-05-01 11:28:45 -07:00
Howard Stearns	0146d7550e	Merge pull request #10333 from howard-stearns/handshake-cleanup-2 ... Handshake cleanup	2017-05-01 11:15:54 -07:00
Clément Brisset	5c46d1e3ff	Merge pull request #10316 from sethalves/fix-stray-edit-laser ... fix -- show hand lasers when edit is enabled, but not if there are not hand-controllers	2017-05-01 10:48:59 -07:00
Vladyslav Stelmakhovskyi	dde363ef3d	Merge branch 'master' into audio-source-sync	2017-05-01 18:42:53 +02:00
Vladyslav Stelmakhovskyi	28447cde0b	Get rid of QML errors in HMD mode. Sync Audio menu in Tablet/HMD without recreating menu items	2017-05-01 18:41:38 +02:00
CFresquet	72a6403eb0	Merge remote-tracking branch 'upstream/master'	2017-05-01 08:11:26 -07:00
CFresquet	28aaa545d8	Created RequestModule	2017-05-01 08:07:16 -07:00
Howard Stearns	f980d6f435	Merge branch 'master' of https://github.com/highfidelity/hifi into handshake-cleanup-2	2017-04-30 15:51:12 -07:00
Howard Stearns	e740fb67f4	convert foreign handString to jointIndex once, not often	2017-04-30 15:50:30 -07:00
Howard Stearns	bc9049cb42	remove extra joint search	2017-04-30 14:19:33 -07:00
Howard Stearns	292065a918	It may be possible to switch hands without endHandshake, and thus not reset currentHandJointIndex on updateTrigger. That was filled in later by startHanshake ONLY if there was already waiting avatars so that we didn't have wait. As a result, our distance measure would be from hips instead of hand. This changes it to always compute currentHandJointIndex on updateTriggers (and not elsewhere).	2017-04-30 13:32:21 -07:00
Howard Stearns	eca7292651	check your own location data on failure, and notify if it is wrong	2017-04-30 09:44:34 -07:00
Howard Stearns	92481bf475	standardize data init/clear	2017-04-30 08:04:46 -07:00
Vladyslav Stelmakhovskyi	3fe8675b0c	Sync Tablet Audio and Desktop Audio menus	2017-04-30 12:39:36 +02:00
Howard Stearns	d41a911fd2	setupCandidate	2017-04-29 19:39:50 -07:00
Howard Stearns	18dbe3568c	clarify names, particularly hand vs handString	2017-04-29 18:25:33 -07:00
Howard Stearns	9c83e21e17	fix that	2017-04-29 15:50:04 -07:00
Howard Stearns	d7a2e571a7	simplify animation load and code	2017-04-29 14:39:35 -07:00
Howard Stearns	274cc5b555	unique message for exceeding poll limit	2017-04-29 14:29:43 -07:00
Howard Stearns	84ac863a32	lint	2017-04-29 13:58:20 -07:00
Howard Stearns	b6ae0a5bde	add nextTick, and cleanup	2017-04-28 20:06:13 -07:00
howard-stearns	f9debf1388	checkpoint	2017-04-28 16:53:08 -07:00
David Kelly	168cfa9b5d	upping polling time plus min grip	2017-04-28 16:39:58 -07:00
David Kelly	a99c242646	increase minimum grip pressure to initiate handshake	2017-04-28 15:52:32 -07:00
Vladyslav Stelmakhovskyi	368334e07e	Merge branch 'master' into audio-source-sync	2017-04-28 23:04:17 +02:00
Vladyslav Stelmakhovskyi	d18ac6dd49	Reimplemented Tablet Audio screen using C++ model	2017-04-28 23:02:28 +02:00
Seth Alves	4b0e7ceef5	show hand lasers when edit is enabled, but not if there are not hand-controllers	2017-04-28 10:24:04 -07:00
Howard Stearns	a2721d21ef	Merge pull request #10278 from zfox23/newSnapshotReview ... New Snapshot Review Dialog	2017-04-28 07:25:47 -07:00
Zach Fox	3f146fca9d	Fix announcement audience; Fix disabled buttons	2017-04-27 15:36:59 -07:00
Seth Alves	2c2f51689a	Merge pull request #10300 from vladest/tablet-edit-tocreate ... Renamed EDIT to CREATE	2017-04-27 15:31:14 -07:00
Zach Fox	4152e44d2c	Click anywhere on the image except the bottom to toggle share buttons	2017-04-27 14:01:08 -07:00
Zach Fox	3ce81844da	Snapshot JS interface for better Settings handling	2017-04-27 14:01:08 -07:00
Zach Fox	794751abfa	Nested objects aren't REAL!	2017-04-27 14:01:08 -07:00
Zach Fox	832e16ef86	Visual tweaks; fix active share buttons; comment out tests	2017-04-27 14:01:07 -07:00
Zach Fox	7297355183	Open ShareBar on P0 by default	2017-04-27 14:01:07 -07:00
Zach Fox	0ac660d4ab	Cleanup	2017-04-27 14:01:07 -07:00