1544 commits

Author	SHA1	Message	Date
Faye Li Si Fi	32eda3a49c	redo	2017-01-09 14:02:14 -08:00
Faye Li Si Fi	c39eb6294e	undo	2017-01-09 14:01:59 -08:00
Faye Li Si Fi	5323e7f34d	set showKeyboardHighlight to false when initialising tablet	2017-01-09 13:36:58 -08:00
Seth Alves	2bff5582bc	Merge pull request #9321 from hyperlogic/tablet-ui ... Made back button entity collisionless	2017-01-05 15:43:14 -08:00
Anthony J. Thibault	baf2fce2c3	Made back button entity collisionless	2017-01-05 15:33:21 -08:00
Seth Alves	d072b1524a	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-05 15:27:11 -08:00
Anthony J. Thibault	f63ee4ffe0	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui	2017-01-05 15:06:35 -08:00
Dante Ruiz	879fb93def	bug fixed	2017-01-05 22:00:09 +00:00
Anthony J. Thibault	85de0d3bbf	Added local only spatialized button click sounds to tablet	2017-01-05 13:54:06 -08:00
Anthony Thibault	c972e9ac51	Merge pull request #9301 from fayeli/tablet-button-states ... Tablet Button Active State's Text and Icon	2017-01-05 10:00:10 -08:00
Brad Hefta-Gaub	e78582ebae	Merge pull request #9285 from PhilipRosedale/springAway ... script to push things with your hands	2017-01-05 08:02:10 -08:00
Brad Hefta-Gaub	368f48f0a7	Merge pull request #9247 from huffman/feat/tutorial-touch-grip ... Add support for new Touch grip mappings to tutorial	2017-01-04 17:58:05 -08:00
howard-stearns	97780ac97e	color, infront	2017-01-04 16:09:15 -08:00
howard-stearns	d78b7d9a28	Merge branch 'master' of https://github.com/highfidelity/hifi into pal-show-lastEditedBy	2017-01-04 15:48:45 -08:00
Howard Stearns	3d8da683db	Merge pull request #9290 from zfox23/PersonalMute ... Personal mute; Quasi-ignore; Reversible PAL actions	2017-01-04 14:37:09 -08:00
Zach Fox	675159be45	Last commit to fix final bugs	2017-01-04 14:33:02 -08:00
Zach Fox	ac41e8abc4	Bugfix re: population; remove user image for now	2017-01-04 14:06:51 -08:00
Zach Fox	03fbfc85f9	Short delay before populating PAL when changing domains	2017-01-04 13:50:37 -08:00
Zach Fox	c695878025	Clear local ignored list upon domain change	2017-01-04 13:31:16 -08:00
Faye Li Si Fi	934b56bd50	replace redundant toggle logic	2017-01-04 12:41:49 -08:00
Zach Fox	dde5f69ac9	More CR & simplifications	2017-01-04 12:41:30 -08:00
Faye Li Si Fi	475430c1e0	testing new active state with mute.js	2017-01-04 12:25:27 -08:00
howard-stearns	c79c489002	selecting user in pal shows entities lastEditedBy user this session	2017-01-04 11:19:32 -08:00
Dante Ruiz	4dd8a8aa0d	added new model	2017-01-04 11:09:27 -08:00
Dante Ruiz	3f34cb863e	removed whitespace	2017-01-04 11:09:26 -08:00
Dante Ruiz	f81402fb0f	improved tablet position	2017-01-04 11:09:26 -08:00
Zach Fox	14def61eb8	More CR comments; 1 bug remaining re: sig slot	2017-01-03 17:32:47 -08:00
Anthony J. Thibault	e4a08709c6	Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui	2017-01-03 16:23:57 -08:00
Anthony Thibault	9502a8b0c4	Merge pull request #9294 from fayeli/tablet-mic-level ... Audio level calculation in tabletUI.js	2017-01-03 16:12:04 -08:00
Anthony J. Thibault	94c6cc8e6a	Added test script demonstrating event bridge on the tablet	2017-01-03 15:44:02 -08:00
Faye Li	fc186a281f	update audio bar only when tablet is shown	2017-01-03 14:37:25 -08:00
Faye Li	4391e9eaee	send the mic level from js	2017-01-03 12:57:08 -08:00
Brad Hefta-Gaub	3c7fa41be9	update test script	2017-01-03 11:29:52 -08:00
Brad Hefta-Gaub	d440532cff	make sure RPC is timely	2017-01-03 11:10:07 -08:00
Anthony Thibault	c201b6a7f9	Merge pull request #9256 from druiz17/moreButtons ... all hub button now on tablet	2017-01-03 10:44:19 -08:00
Anthony J. Thibault	00980366d6	Merge branch 'master' into tablet-ui	2017-01-03 09:45:23 -08:00
Faye Li	656ddfe287	audio level calculation in tabletUI.js	2017-01-03 09:27:33 -08:00
Brad Hefta-Gaub	82ab8635d7	debugging	2016-12-30 12:02:48 -08:00
Zach Fox	f26b7c0134	Checkpoint	2016-12-30 09:51:43 -08:00
Brad Hefta-Gaub	7c7d239e00	first cut at using wait signals to improve RPC timing	2016-12-30 09:13:21 -08:00
August Rosedale	8613cd35ea	entity script to push entities with hands	2016-12-30 07:11:02 -08:00
Zach Fox	10b5b957f2	Ahh...It's beautiful and simple now.	2016-12-29 13:09:40 -08:00
Zach Fox	bb2b48d424	Getting very close.	2016-12-29 11:35:20 -08:00
Zach Fox	af1c67a252	Progress!	2016-12-28 17:23:56 -08:00
Zach Fox	e26d347682	It seems to be working, minus removing from list	2016-12-28 15:15:39 -08:00
Zach Fox	46e8bf5283	First steps, holding off til Howard finishes	2016-12-28 15:12:21 -08:00
howard-stearns	768b747b3a	Make avatar go away when ignored, even when pal is up. (But currently, it ... comes back!)	2016-12-27 10:17:39 -08:00
howard-stearns	0ad9786f6b	requestsDomainsListData	2016-12-27 10:14:20 -08:00
Zach Fox	72da05bb30	Merge pull request #9268 from zfox23/PalRefresh ... Add PAL refresh button	2016-12-23 15:16:51 -08:00
David Kelly	68fb81902b	Merge pull request #9261 from davidkelly/dk/workingVUMetersInPal ... Working VU meters in PAL	2016-12-23 13:24:38 -08:00