Commit graph

1435 commits

Author SHA1 Message Date
Dante Ruiz
8fbcead6d1 removed/renamed some files 2017-02-14 07:46:33 -08:00
Dante Ruiz
948352cdb6 general preferences work on tablet 2017-02-14 07:46:33 -08:00
Dante Ruiz
888d4ff706 basic prefreneces done 2017-02-14 07:46:32 -08:00
Dante Ruiz
46cfa7cf13 saving work 2017-02-14 07:46:31 -08:00
Anthony J. Thibault
1c783031b1 Removed ColorOverlay from TabletButton, added more icon & text states
Now uses separate images for each state. Now tabletButtonProxy has 4 state properties, one for icon and images.

  * icon
  * hoverIcon
  * activeIcon
  * activeHoverIcon

  * text
  * hoverText
  * activeText
  * activeHoverText

Updated scripts to set new button states, if necessary.
2017-02-13 15:09:46 -08:00
David Rowe
77f0fb1491 Change the "Mute" tablet button to "Audio" 2017-02-11 22:40:19 +13:00
kunalgosar
9c537726e5 Fix stuck in pause error with browsers 2017-02-10 18:13:09 -08:00
David Rowe
a08347936e Make clicking the tablet mic icon or audio bar toggle the mute state 2017-02-11 15:11:27 +13:00
David Rowe
acaf8c69c6 Better tablet mic muted and unmuted iconography 2017-02-11 11:07:31 +13:00
David Rowe
b5b92c1508 Make the tablet's mic icon reflect the current mute state 2017-02-11 09:53:02 +13:00
Brad Hefta-Gaub
bc22326ec8 Merge pull request #9640 from ZappoMan/avatarSimulationStats
New stats for avatar simulation
2017-02-09 12:58:30 -08:00
Dante Ruiz
ff60058cbe checking if desktop exists 2017-02-09 17:54:41 +00:00
Brad Hefta-Gaub
ae071aec0d add a bunch more stats for avatar processing 2017-02-09 09:52:09 -08:00
Dante Ruiz
6bc685b02a saving work 2017-02-09 07:13:29 -08:00
Dante Ruiz
5c5ace7c7b goto in tablet 2017-02-09 07:13:29 -08:00
Anthony J. Thibault
090f632189 Pal: Moved keyboard tray to be flush with bottom of window. 2017-02-08 18:16:48 -08:00
Anthony J. Thibault
7cc3079328 Tightened up margins for the tablet. 2017-02-08 17:58:24 -08:00
Anthony J. Thibault
a209d0372a First cut of pal on tablet. 2017-02-08 17:34:03 -08:00
Seth Alves
90fa8bf572 Merge pull request #9612 from druiz17/users
some tweaks to users and menus got tablet
2017-02-07 15:38:43 -08:00
Dante Ruiz
5ff91c018b snapshot fix 2017-02-06 19:39:57 +00:00
Dante Ruiz
dd8f095bd8 minimize diff 2017-02-04 00:36:41 +00:00
Dante Ruiz
0c28776ea2 some tweaks to users and menus got tablet 2017-02-04 00:13:39 +00: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
Dante Ruiz
2cc1ee008d added clicking sounds to tablet menus 2017-02-02 17:46:42 +00:00
Anthony J. Thibault
de55a5dfe6 tablet-ui: reduced volume of button click 2017-02-01 18:47:50 -08:00
Zach Fox
8b1161b0b0 Fix it 2017-02-01 12:32:30 -08:00
Anthony J. Thibault
8f362861eb tablet-ui: button icon images now work with http urls. 2017-01-31 16:53:25 -08:00
Seth Alves
ac475300f6 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-30 08:15:29 -08:00
Zach Fox
5cba928540 Do it! 2017-01-27 16:30:59 -08:00
Seth Alves
204652514e fix some fallout from toolbar changes 2017-01-25 16:29:36 -08:00
Seth Alves
f382b541c7 merge from upstream 2017-01-25 15:42:33 -08:00
Seth Alves
ff8d13ecc7 get button-states for toolbar buttons working again 2017-01-25 15:38:54 -08:00
Dante Ruiz
6671d7f9e6 removed some unnessary menu item 2017-01-25 21:23:04 +00:00
Dante Ruiz
0d7f15e41b removed more qml errors 2017-01-25 18:22:28 +00:00
Seth Alves
7d370fb791 Merge pull request #9507 from cozza13/tablet-ui
Changes to tablet formatting
2017-01-25 09:29:16 -08:00
Dante Ruiz
096b2e876f removing qml null print error 2017-01-25 08:00:40 -08:00
Chris Collins
df9bfa6eff Changes to tablet formating
Changes to QML and .js formating to match style of mockup.
2017-01-25 07:41:04 -08:00
Anthony J. Thibault
bff0eeef75 Added username to tablet header 2017-01-24 14:31:57 -08:00
Anthony J. Thibault
d2f024e84d Fix for "ReferenceError: globalPosition is not defined" warning 2017-01-24 11:40:20 -08:00
Seth Alves
200105c856 Merge pull request #9484 from hyperlogic/tablet-ui
UI navigation work with game pads
2017-01-23 16:01:45 -08:00
Anthony J. Thibault
584a9a3c98 UI navigation work with game pads
The tablet UI can be long lived, unlike the previous VRMenu.
So instead of using a dynamic mapping that was only enabled when the VRMenu was shown, standard_navigation.json.
standard_navigation is always active.  Also, standard_navigation.json has been changed.
Left and Right click and stick events never become UINav events. Only Dpad A, B, X, Y, LB and RB are mapped to UINav events.
2017-01-23 15:22:49 -08:00
Seth Alves
cdb14e7662 put name of button-click file back 2017-01-23 13:55:11 -08:00
Seth Alves
702aba9646 use a softer button-click sound 2017-01-23 10:13:45 -08:00
Seth Alves
be8bc9652b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-23 09:44:04 -08:00
Zach Fox
11a57efafb Fix it! 2017-01-20 13:44:29 -08:00
Seth Alves
dfa949f2d8 switch to new click sound 2017-01-20 13:35:41 -08:00
Zach Fox
8f3c4794c6 Comments 2017-01-20 10:24:52 -08:00
Zach Fox
9c9206acc0 Prevent logspam 2017-01-20 10:24:51 -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
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
Seth Alves
bbff372097 Merge pull request #9377 from fayeli/tablet-menu-qml
Rework Context Menu QML to Be Suitable for Tablet
2017-01-13 09:59:57 -08:00
Seth Alves
481cc47f79 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-13 09:28:18 -08:00