3028 commits

Author	SHA1	Message	Date
samcake	b466964817	REvisiting the stats counter for the gpu context in the hope of better understanding the gpu texture streaming behavior	2017-05-16 18:21:24 -07:00
Zach Fox	aa0394c2ef	Fix case when user stories would be incorrectly deleted	2017-05-16 11:07:03 -07: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
Brad Hefta-Gaub	bffa3185d0	Merge pull request #10402 from MrRoboman/W-21305-floating-lanterns ... added floating lantern box that spawns floating lanterns	2017-05-12 15:57:03 -07:00
Rob Kayson	9fc0ad0d28	fix indent floatingLanternBox	2017-05-12 15:12:43 -07:00
Rob Kayson	f3d8d1641f	fix indent createFloatingLanternBox.js	2017-05-12 15:10:40 -07:00
Rob Kayson	a12e8e34db	coding standard	2017-05-12 15:06:22 -07:00
Zach Fox	d189f3f110	Fix the twitter mention	2017-05-12 12:39:10 -07: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
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
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
Chris Collins	4bfb23b5d2	Merge pull request #10388 from humbletim/21308 ... CR #21308 Fix Script.print	2017-05-08 10:46:49 -07:00
Chris Collins	d88d52cd2e	Merge pull request #9735 from humbletim/21190-fix-unit-tests ... CR 21190 unit_tests: add support for jasmine.done() and pending	2017-05-08 09:19:01 -07:00
Rob Kayson	1873558df1	added floating lantern box that spawns floating lanterns	2017-05-06 18:41:57 -07:00
Mike Moody	03490c81da	v1 with bug, looking into.	2017-05-06 15:36:18 -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