2421 commits

Author	SHA1	Message	Date
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
Howard Stearns	3c652a52d8	Merge pull request #10431 from davidkelly/dk/messageLoggedInStatus ... minor handshake script update	2017-05-10 13:54:21 -07: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
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
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
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