Commit graph

110 commits

Author SHA1 Message Date
Anthony J. Thibault
c2b832fb9c removed debug prints from pal.js 2017-02-08 18:55:22 -08:00
Anthony J. Thibault
a209d0372a First cut of pal on tablet. 2017-02-08 17:34:03 -08:00
howard-stearns
2e88f1ab1f conserving audio interval 2017-02-07 16:21:14 -08:00
howard-stearns
3bd11978aa low-hanging fruit on pal performance 2017-02-07 15:59:38 -08:00
Anthony J. Thibault
85e01e3922 tablet-ui: Added sortOrder property to buttons
By default user created buttons will appear after system buttons.
2017-02-02 17:18:22 -08:00
Seth Alves
4ae163ac60 hook pal audio meter up again 2017-02-01 19:01:55 -08:00
Faye Li
44fc8a5fbf update button name 2017-01-26 11:23:06 -08:00
Seth Alves
ff8d13ecc7 get button-states for toolbar buttons working again 2017-01-25 15:38:54 -08:00
Seth Alves
98f1664a46 use a setting to decide which UI is enabled 2017-01-25 14:17:45 -08:00
Seth Alves
f18094f565 make use of tablet or HUD depend on a single variable. avoid some duplicated code 2017-01-25 12:00:34 -08:00
Seth Alves
be8bc9652b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-23 09:44:04 -08:00
Seth Alves
2d220a557f unmangle merge 2017-01-20 10:29:18 -08:00
Zach Fox
c83cd4a94a Complex checkpoint 2017-01-20 10:24:51 -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
Zach Fox
534fcd9399 Potential fix 2017-01-19 10:20:36 -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
e9d3c36873 Final commit? 2017-01-18 12:55:25 -08:00
Zach Fox
346cfbfe02 First checkpoint 2017-01-18 12:55:24 -08:00
Dante Ruiz
8172329ec3 Fixed pal 2017-01-18 10:33:58 -08:00
Seth Alves
b57803057d Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-18 06:38:44 -08:00
Anthony J. Thibault
03f8a310fc Fix for exception on script ending 2017-01-17 18:17:41 -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
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
David Kelly
2460e89a57 CR feedback 2017-01-17 09:53:04 -08:00
Seth Alves
1eb7b668bf merge from upstream 2017-01-17 09:33:49 -08:00
Seth Alves
6bace4f451 merge from upstream 2017-01-17 09:29:30 -08:00
David Kelly
6c07a9aece remove debuggng logspam 2017-01-16 19:06:36 -08:00
David Kelly
6c701bb0f0 remove ignored avatars from PAL when they disconnect 2017-01-16 18:22:53 -08:00
David Kelly
95aad3140d Merge pull request #9386 from davidkelly/dk/manageAudioIntervalInPal
Manage audio interval timer in PAL
2017-01-16 11:29:05 -08:00
Zach Fox
32e330320e Cleanup after rebase 2017-01-16 11:26:57 -08:00
Zach Fox
6e4a4da92a Checkpoint 2017-01-16 10:42:29 -08:00
David Kelly
baed3bc3b3 Manage audio interval timer in PAL
Now, it is only running when PAL is up.  Was running (but doing nothing
before.  Somewhat more efficient this way.
2017-01-14 12:57:00 -07:00
Zach Fox
b9cddc31a9 Checkpoint before implementing Ken's suggestions 2017-01-13 13:00:03 -08:00
Zach Fox
8bb200902f First pass 2017-01-13 12:57:35 -08:00
Seth Alves
208c4686c4 merge from upstream 2017-01-12 15:44:27 -08:00
Dante Ruiz
a16b229c65 begining to remove hud items 2017-01-12 10:49:45 -08:00
David Kelly
1e3a00d1fb Enable the LT and RT signals, use them
A bit cleaner.  Still have to keep track of which hand is the mouse, but
this removes some of the hacky code.
2017-01-11 14:43:37 -07:00
David Kelly
0a018e133d Blue laser should be enough to hover 2017-01-10 18:23:39 -07:00
David Kelly
4fade3a53e CR feedback 2017-01-10 16:12:02 -07:00
David Kelly
5fd11ade9c minor tweak to hover color for glow effect 2017-01-10 16:00:19 -07:00
David Kelly
2d55ed2658 Fix hover - probably my merge didn't get this line 2017-01-10 15:51:24 -07:00
David Kelly
17333ee307 Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover 2017-01-10 15:24:31 -07:00
David Kelly
5c6ae6fe95 HMD hover working now
Had to hack a bit -- the trigger mappings were not firing so instead I
just get the hand that is triggering (when HMD is active) and handle the
hover almost as before, with mouse move events.  Some thought about how
to map a 'mouse move' event into something where 2 triggers can both be
pressed at same time was in order.
2017-01-10 14:47:34 -07:00
howard-stearns
e67675ac36 color nodes by audio level 2017-01-10 13:24:38 -08:00
howard-stearns
42b2b2154e store audio level in overlay data object (so that they gc properly and we
have the data to color with).
2017-01-10 13:08:07 -08:00
David Kelly
fef8c8900f Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover 2017-01-09 08:51:42 -07:00