2962 commits

Author	SHA1	Message	Date
Vladyslav Stelmakhovskyi	e395a51c60	Merge with master	2017-05-05 07:05:16 +02: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
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
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
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
howard-stearns	3e57e80465	use new request module.	2017-05-03 16:39:34 -07:00
Seth Alves	a259d00b63	Merge pull request #10332 from sethalves/bullet-constraints-5 ... Bullet constraints	2017-05-03 16:30: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
Ryan Huffman	44b6d12b75	Merge pull request #10356 from sethalves/fix-grab-cleanups ... Fix grab cleanups	2017-05-03 09:53:31 -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
CFresquet	15db80c8ba	request module updates	2017-05-03 07:32:23 -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
Seth Alves	ef628eaec6	Merge pull request #10352 from highfidelity/move-recorder ... Move old recorder.js script to script-archive	2017-05-02 16:03:36 -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
Seth Alves	cc586b7c6d	make ragdoll test honor lifetime from UI	2017-05-02 14:12:55 -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
Anshuman Dewangan	a22be93d69	Move old recorder.js script to script-archive	2017-05-02 12:15:06 -07: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