18876 commits

Author	SHA1	Message	Date
Seth Alves	e96a3d4bcb	try another click sound	2017-01-20 14:50:24 -08:00
Seth Alves	dfa949f2d8	switch to new click sound	2017-01-20 13:35:41 -08:00
Seth Alves	6641f9bafd	Merge pull request #9444 from druiz17/homeButtonFix ... Home button is now an overlay	2017-01-20 10:32:31 -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
Dante Ruiz	a319db3cb4	removed duplicate code	2017-01-20 00:57:48 +00:00
Dante Ruiz	1e7e4576cc	comparing with ID instead of strings	2017-01-19 16:38:55 -08:00
Seth Alves	47b59ffae3	don't save tablet to Settings when logging out or switching domains	2017-01-19 14:10:48 -08:00
Zach Fox	64ef3d5665	Merge pull request #9426 from zfox23/PAL_AdminLabel ... PAL: Admin Labels, Updated Letterboxes	2017-01-19 13:48:05 -08:00
David Kelly	d9fbf832e2	Some initial analytics for PAL usage	2017-01-19 11:35:17 -08:00
Seth Alves	eb25e1c12d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-19 09:41:49 -08:00
Brad Davis	70de00c6bf	Merge pull request #9421 from jherico/more_trace_details ... Additional trace details for GPU timing, frame data updates	2017-01-19 09:12:34 -08:00
Dante Ruiz	342a6c67fb	menu checkable button fix	2017-01-19 08:12:49 -08:00
Dante Ruiz	30b57b62da	toggle help	2017-01-19 08:12:49 -08:00
samcake	05304c72e0	Merge branch 'master' of https://github.com/highfidelity/hifi into meta	2017-01-18 17:00:20 -08:00
Seth Alves	7c938728e5	don't do constant haptics if stylus touches tablet frame. home button triggers only once per click	2017-01-18 16:56:39 -08:00
Brad Davis	1ef4ac9a6c	Additional trace details for GPU timing, frame data updates	2017-01-18 16:19:32 -08:00
Seth Alves	c4d85c91d0	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui	2017-01-18 15:51:54 -08:00
Seth Alves	3517daaad2	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-18 15:49:12 -08:00
Anthony J. Thibault	bcd94203e6	Raised min fps of tablet overlay for smoother scrolling	2017-01-18 15:32:39 -08:00
Seth Alves	c6d0c0909e	avoid unthreadsafe use of getJointIndex	2017-01-18 14:54:38 -08:00
Zach Fox	7f57251a0e	Remove logs also removed in Master	2017-01-18 13:38:19 -08:00
David Kelly	3b70fa08a3	Merge pull request #9417 from davidkelly/dk/palLogSpam ... Removing some PAL-related interface log spam	2017-01-18 13:20:57 -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
Brad Davis	cbc89e77ab	Consume fewer resources in AssetServer when interface is running locally	2017-01-17 18:15:39 -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
samcake	246dcbd0c0	Removing the warning	2017-01-17 15:01:27 -08:00
Zach Fox	59ff970d5b	CR feedback	2017-01-17 15:01:02 -08:00
Seth Alves	c8382e6853	Merge pull request #9412 from fayeli/menu-fix ... Fixes for Tablet Menu Issues	2017-01-17 14:58:47 -08:00
David Kelly	341ac685e9	Merge pull request #9404 from davidkelly/dk/removeKilledAvatarsFromPalLists ... remove ignored avatars from PAL when they disconnect	2017-01-17 14:21:36 -08:00