1337 commits

Author	SHA1	Message	Date
Seth Alves	dfa949f2d8	switch to new click sound	2017-01-20 13:35:41 -08:00
Seth Alves	c492319be2	merge from upstream	2017-01-20 10:14:11 -08:00
Ryan Downe Karpf	03851d4188	Merge pull request #9441 from davidkelly/dk/makeUsSomeAnalytics ... Some initial analytics for PAL usage	2017-01-20 08:30:46 -08:00
David Kelly	5adc2cc593	Couple improvements ... Only send one message when gain is changed. Eliminated the bool and now just sending un-personalMute, etc...	2017-01-19 17:22:39 -08:00
David Kelly	d9fbf832e2	Some initial analytics for PAL usage	2017-01-19 11:35:17 -08:00
Dante Ruiz	342a6c67fb	menu checkable button fix	2017-01-19 08:12:49 -08:00
Seth Alves	3517daaad2	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-18 15:49:12 -08:00
Zach Fox	7f57251a0e	Remove logs also removed in Master	2017-01-18 13:38:19 -08:00
Zach Fox	f8dd7f5433	Cleanup	2017-01-18 12:55:25 -08:00
Zach Fox	e9d3c36873	Final commit?	2017-01-18 12:55:25 -08:00
Zach Fox	d067ba7dcc	Alan's feedback	2017-01-18 12:55:24 -08:00
Zach Fox	9d19aa3c79	Checkpoint	2017-01-18 12:55:24 -08:00
Zach Fox	202d4e8107	Checkpoint	2017-01-18 12:55:24 -08:00
Zach Fox	346cfbfe02	First checkpoint	2017-01-18 12:55:24 -08:00
Dante Ruiz	0f3ac2831e	fix tablet menu selection issue	2017-01-18 17:20:42 +00:00
Dante Ruiz	1c13f538f7	removed debug output	2017-01-18 17:08:13 +00:00
Dante Ruiz	fa3bea52cd	fixed bug with menu	2017-01-18 16:45:27 +00:00
Dante Ruiz	baff07b0f9	controller with menus finally work	2017-01-18 07:41:25 -08:00
Dante Ruiz	9a61b6030b	tabletFocus update	2017-01-18 07:40:15 -08:00
Dante Ruiz	d3fa7651c9	some what working d-pad	2017-01-18 07:40:15 -08:00
dante ruiz	865a78a8c8	saving work	2017-01-18 07:40:14 -08:00
Seth Alves	b57803057d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-18 06:38:44 -08:00
Seth Alves	0abb41ca2d	Merge pull request #9413 from hyperlogic/tablet-ui ... clara.io marketplace works on tablet	2017-01-18 06:37:55 -08:00
David Kelly	f5300d3862	Removing some PAL-related interface log spam ... Probably more, but these _seem_ to be the worst	2017-01-17 17:06:18 -08:00
Faye Li Si Fi	d7209ef7f7	syntax	2017-01-17 16:56:54 -08:00
Faye Li Si Fi	42a96a94b4	fix	2017-01-17 16:54:40 -08:00
Faye Li Si Fi	126bfba512	fix tablet menu scrolling issue	2017-01-17 16:40:12 -08:00
Zach Fox	7a568ed8a7	Merge pull request #9401 from zfox23/PAL_DisplayName ... PAL: Editable Display Names & Immediate Update	2017-01-17 16:00:41 -08:00
Anthony J. Thibault	56fc42a2bd	clara.io marketplace works on tablet	2017-01-17 15:38:44 -08:00
Zach Fox	59ff970d5b	CR feedback	2017-01-17 15:01:02 -08:00
Faye Li Si Fi	20ac96a7f9	fix clicking on checkboxes in menus or on ghosted menu items slides in a blank page	2017-01-17 12:29:38 -08:00
Faye Li Si Fi	965f9ab0a7	fix tapping menu when already at the top-level menu blanks the tablet	2017-01-17 11:58:48 -08:00
Seth Alves	6bace4f451	merge from upstream	2017-01-17 09:29:30 -08:00
David Kelly	6c701bb0f0	remove ignored avatars from PAL when they disconnect	2017-01-16 18:22:53 -08:00
Zach Fox	3b56f46206	Style changes	2017-01-16 13:18:24 -08:00
Zach Fox	32e330320e	Cleanup after rebase	2017-01-16 11:26:57 -08:00
Zach Fox	2f176f50fa	Another checkpoint	2017-01-16 10:44:54 -08:00
Zach Fox	6e4a4da92a	Checkpoint	2017-01-16 10:42:29 -08:00
Zach Fox	117e302b2a	First pass	2017-01-16 10:39:11 -08:00
Zach Fox	a5343d9aa9	Final tweaks before PR!	2017-01-13 17:20:29 -08:00
Zach Fox	a89868dcad	Make sliders appear only when row is selected	2017-01-13 15:41:17 -08:00
Zach Fox	8343769352	NameCard improvements & user feedback	2017-01-13 15:25:07 -08:00
Zach Fox	a69a10b8e4	Cleanup after rebase	2017-01-13 13:15:01 -08:00
Zach Fox	a9226e303c	Pull out visual changess & move them to other PR	2017-01-13 13:00:23 -08:00
Zach Fox	b0b6aeac6c	Ken's feedback	2017-01-13 13:00:03 -08:00
Zach Fox	b9cddc31a9	Checkpoint before implementing Ken's suggestions	2017-01-13 13:00:03 -08:00
Zach Fox	503468e49b	Style changes	2017-01-13 12:59:23 -08:00
Zach Fox	dcff873cd4	Modify slider function	2017-01-13 12:57:35 -08:00
Zach Fox	8bb200902f	First pass	2017-01-13 12:57:35 -08:00
Seth Alves	50ad0d881d	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui	2017-01-13 10:15:00 -08:00