Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-08 23:08:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
53612 commits 25 branches 0 tags 1.1 GiB
Commit graph

1782 commits

Author SHA1 Message Date
Vladyslav Stelmakhovskyi
856e15060d Implemented Domain Connection statistics for Tablet UI 2017-03-15 21:05:13 +01:00
Zach Fox
786180291b Bugfixes and improvements 2017-03-15 11:46:33 -07:00
Zach Pomerantz
789bb7c855 rename audio(Mic)OutboundPPS 2017-03-15 13:30:39 -04:00
Seth Alves
563d59bda9 Merge pull request #9886 from vladest/tablet-ui-entity-statistics 
Tablet ui entity statistics
 2017-03-15 08:40:52 -08:00
Seth Alves
df82c30e83 Merge pull request #9892 from hyperlogic/bug-fix/tablet-running-scripts-improvements 
Tablet Running Scripts dialog fixes
 2017-03-15 08:38:40 -08:00
Seth Alves
b5919d89a5 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-15 08:26:10 -08:00
howard-stearns
6c88bc98b4 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-15 09:24:30 -07:00
Zach Fox
0a6bcd7fca Massive performance boost 2017-03-14 16:24:06 -07:00
Anthony J. Thibault
3a788d31de Tablet Running Scripts dialog fixes 
* The "Currrently Running" section is now visible by default, this includes the "Reload All" and "Remove All" buttons
* The entire dialog is flickable/scrollable.  We need to do this because the entire dialog is too tall to fit on the tablet.
* The keyboard now appears when the filter edit text has focus.
  The content is scrolled in such away that the focus edit field, and the tree view are above the keyboard.
 2017-03-14 15:38:53 -07:00
Zach Fox
5da0dfc4ac Merging from Pal_v2_Zach 2017-03-14 14:05:50 -07:00
Dante Ruiz
4c686eaa67 fix tablet menu stack focus issue 2017-03-14 21:20:41 +01:00
Vladyslav Stelmakhovskyi
e2a4011b05 Coloring implemented 2017-03-14 19:10:41 +01:00
Vladyslav Stelmakhovskyi
56d4bfe077 Servers stats added. TODO: coloring 2017-03-14 18:38:49 +01:00
Vladyslav Stelmakhovskyi
d9ca8a826d TabletEntityStatistics.qml refactored. Text now wrapped. TODO: coloring, server stats 2017-03-14 17:02:09 +01:00
Vladyslav Stelmakhovskyi
99c74cec41 Merge branch 'tablet-ui' into tablet-ui-entity-statistics 2017-03-14 15:59:27 +01:00
Vladyslav Stelmakhovskyi
0accce5337 TabletComboBoxPreference.qml not needed anymore 2017-03-14 15:53:41 +01:00
Vladyslav Stelmakhovskyi
ee7dd458ca Merge branch 'tablet-ui' into tablet-ui-graphics 2017-03-14 15:37:36 +01:00
Seth Alves
c89a4c4786 Merge pull request #9874 from hyperlogic/bug-fix/toolbar-fade 
Fix for visible empty toolbar when switching from desktop to HMD mode.
 2017-03-14 05:33:54 -08:00
Seth Alves
f8a6a82371 Merge pull request #9881 from ctrlaltdavid/21197 
Browse for avatar in Marketplace from tablet avatar settings dialog
 2017-03-14 05:33:11 -08:00
David Rowe
43687d4773 Tidying 2017-03-14 21:41:04 +13:00
David Rowe
d141d5b683 Add keyboard 2017-03-14 21:36:57 +13:00
David Rowe
f3a99a2437 Implement avatar browser for tablet avatar settings 2017-03-14 15:36:51 +13:00
David Rowe
2e96b8a59b Merge branch 'tablet-ui' into 21197 2017-03-14 14:47:22 +13:00
Zach Fox
e3d0842ddc Implement browser in PAL 2017-03-13 18:39:47 -07:00
David Rowe
7504c124e4 Make attachment model browser dialog modal 2017-03-14 13:34:06 +13:00
David Rowe
01c313ad60 Fix QML errors 2017-03-14 13:33:20 +13:00
Brad Davis
3bef5ad528 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-13 14:30:25 -07:00
Anthony J. Thibault
40b7e34c0b Fix for visible empty toolbar when switching from desktop to HMD mode. 2017-03-13 14:23:13 -07:00
Zach Fox
d04b1da1c2 Merging from PAL_v2_Zach 2017-03-13 12:54:01 -07:00
David Rowe
4dd7667fd7 Merge branch 'tablet-ui' into 21209 
# Conflicts:
#	interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
#	interface/src/ui/overlays/Web3DOverlay.cpp
 2017-03-14 08:50:01 +13:00
Vladyslav Stelmakhovskyi
9e9c64021c Merge branch 'tablet-ui' into tablet-ui-entity-statistics 2017-03-13 19:54:40 +01:00
howard-stearns
db06c2650f Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-13 11:53:48 -07:00
Vladyslav Stelmakhovskyi
48db6201e5 Basic statistics showed. TODO: servers statistics, coloring, wrapping 2017-03-13 19:48:50 +01:00
Zach Fox
beb848373b Update from zfox23/PALv2 branch 2017-03-13 10:15:06 -07:00
Seth Alves
4f71a5b234 Merge pull request #9864 from vladest/tablet-ui-lod-settings 
Add LOD settings to Tablet UI
 2017-03-13 08:59:40 -08:00
Seth Alves
ffd4d1488c Merge pull request #9866 from vladest/tablet-ui-lodtools 
Fixed slider groove size calculation. Added LOD Tools to Tablet UI
 2017-03-13 08:59:06 -08:00
Vladyslav Stelmakhovskyi
49055cfa5c Some statistics showed 2017-03-13 16:31:29 +01:00
David Rowe
05e4c2a1bb MyAvatar is available in tablet now 2017-03-12 09:59:52 +13:00
Brad Hefta-Gaub
a38965d628 add more audio stats 2017-03-11 09:50:30 -08:00
Vladyslav Stelmakhovskyi
81bc56f124 Fixed slider groove size calculation. Added LOD Tools to Tablet UI 2017-03-11 14:44:33 +01:00
Vladyslav Stelmakhovskyi
d70943dd6c Add Graphics preferences to Tablet. Use TabletComboBox instead of desktop ComboBox for Tablet preferences 2017-03-11 12:23:31 +01:00
Vladyslav Stelmakhovskyi
9f7c5a1603 Add LOD settings to Tablet UI 2017-03-11 11:54:44 +01:00
David Rowe
0fc45799ed Remove redundant keyboard handling code 2017-03-11 17:04:55 +13:00
David Rowe
6a8d0b1064 Refactor some tablet dialog headers 2017-03-11 16:55:22 +13:00
David Rowe
327e3c9973 Don't expand height of higlighted row 2017-03-11 15:46:43 +13:00
David Rowe
0a2976deab Add tablet keyboard 2017-03-11 15:43:33 +13:00
Brad Hefta-Gaub
6ce50269ac add audio mixer in/out stats to the client stats 2017-03-10 18:42:18 -08:00
David Rowe
ffbb04d3bc Tablet and desktop versions of attachment model browser dialog 2017-03-11 15:38:21 +13:00
David Rowe
d261e48b9d Use existing model browser dialog as base content 2017-03-11 14:33:03 +13:00
David Rowe
25364c0628 Make dropdown scrollbar wider 2017-03-11 12:59:15 +13:00
David Rowe
713c50f2e8 Fix attachments dialog joint dropdown in tablet 2017-03-11 12:52:22 +13:00
Dante Ruiz
8a973dae3c fixed bring menu dialogs in tablet 2017-03-10 23:21:29 +00:00
David Rowe
189eee01a6 Refactor TabletComboBox.qml into ComboBox.qml 2017-03-11 11:02:09 +13:00
David Rowe
71713b10f3 Merge remote-tracking branch 'upstream/tablet-ui' into 21209 
# Conflicts:
#	interface/src/ui/overlays/Web3DOverlay.cpp
 2017-03-11 09:14:06 +13:00
Dante Ruiz
78da936344 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-imporove-dialogs 2017-03-10 19:33:51 +00:00
Dante Ruiz
b63ab05eec improved general settting coloring 2017-03-10 19:33:14 +00:00
Vladyslav Stelmakhovskyi
e27ccab2f4 Eliminate pathToFonts not found errors at startup. Change TableFiledialog folder on click 2017-03-10 19:53:20 +01:00
David Rowe
7af9f879dd Fix scrollbar and keyboard behavior 2017-03-10 21:44:20 +13:00
David Rowe
9291d272fe Add scrollbar 2017-03-10 18:25:16 +13:00
David Rowe
b539c55c02 Scroll and snap to attachment with focus 2017-03-10 14:33:51 +13:00
David Rowe
c7d1aa8ff4 Make attachments list flickable 2017-03-10 08:26:00 +13:00
druiz17
0069569e96 Merge branch 'tablet-ui' into 21197 2017-03-09 09:31:15 -08:00
David Rowe
53dcf80cc0 Add dialog title 2017-03-09 22:38:49 +13:00
David Rowe
4be106cbae Remove obsolete rounded border 2017-03-09 18:20:26 +13:00
David Rowe
66dded5e28 Scroll attachments if necessary when raise keyboard to keep focus 2017-03-09 18:13:26 +13:00
David Rowe
1fc6d82456 Tablet and desktop versions of avatar attachments dialog 2017-03-09 13:04:57 +13:00
David Rowe
22e5229036 Use existing attachments dialog as base dialog content 2017-03-09 09:57:45 +13:00
Brad Davis
e94f803b84 Merge remote-tracking branch 'upstream/master' into HEAD 2017-03-08 09:03:21 -08:00
Dante Ruiz
74fe3da035 Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-03-08 16:28:24 +00:00
David Rowe
950f91965d Merge branch 'tablet-ui-edit-js' into 21197 2017-03-08 17:35:58 +13:00
Seth Alves
509ce3f2d2 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-07 18:41:36 -08:00
howard-stearns
cb41b9135b fix broken merge 2017-03-07 12:10:52 -08:00
howard-stearns
8a489f36f4 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-ban-remove-from-pal 2017-03-07 10:49:53 -08:00
Seth Alves
df2e73c2f0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-07 09:44:41 -08:00
David Kelly
b760e86226 rest of cr feedback 2017-03-07 10:17:32 -07:00
David Kelly
c6dbfc85f0 cr feedback 2017-03-07 09:54:00 -07:00
David Rowe
fb1ff5be89 Port Developer > Network > Networking to tablet 2017-03-07 17:02:29 +13:00
David Kelly
3d39aae35b minor tweak - just in case 2017-03-06 15:52:33 -07:00
David Kelly
e14a1ad1af minor cleanup 2017-03-06 15:26:03 -07:00
David Kelly
db036d997c first pass 2017-03-06 15:18:35 -07:00
David Rowe
af4bdd5943 Port Developer > Audio > Buffers to tablet 2017-03-07 09:57:02 +13:00
Vladyslav Stelmakhovskyi
6d9e7de6dc Implemented AssetBrowser in Tablet view 2017-03-06 21:45:55 +01:00
David Rowe
09ecb12510 Merge branch 'tablet-ui-edit-js' into 21197 
# Conflicts:
#	interface/src/ui/overlays/Web3DOverlay.cpp
 2017-03-07 08:59:40 +13:00
howard-stearns
632cdc1b38 semicolons and whitespace per coding standard 2017-03-06 11:04:12 -08:00
David Rowe
0333122b23 Make Save and Cancel buttons close preferences dialog 2017-03-04 15:27:31 +13:00
howard-stearns
a715a694f0 fix 'banned user doesn't disappear from pal until refresh' 2017-03-03 16:27:38 -08:00
David Rowe
53cfad65cd Add keyboard to preferences dialogs 2017-03-04 13:01:02 +13:00
Dante Ruiz
88c0db969c added tabletComboBox to tabletFileDialog 2017-03-03 17:14:00 +00:00
Bradley Austin Davis
efad7da508 Merge remote-tracking branch 'upstream/master' into HEAD 2017-03-03 08:59:24 -08:00
Dante Ruiz
f867f4e739 Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-03-03 15:40:41 +00:00
David Rowe
9384dfd89c Merge branch 'tablet-ui-edit-js' into 21197 2017-03-03 18:05:18 +13:00
David Rowe
4d624ad256 Merge branch 'menuFix' into 21199 2017-03-03 09:42:16 +13:00
Seth Alves
cf37845f9e Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-02 10:06:38 -08:00
Dante Ruiz
5ba89e67af fixed message dialog bug 2017-03-02 16:50:42 +00:00
David Kelly
79e440be81 fix unmute when ignoring in PAL (you can't) 2017-03-02 08:36:58 -07:00
David Rowe
62f91b4af6 Work around MyAvatar not being available in avatar preference control 2017-03-02 15:01:31 +13:00
David Rowe
ebe41bb443 Add a title to the tablet settings dialogs 2017-03-02 14:11:56 +13:00
Dante Ruiz
58c1a2fb99 Merge branch 'master' into menuFix 2017-03-02 00:55:18 +00:00
David Rowe
b9869264ba Display avatar settings dialog in tablet 2017-03-02 13:16:23 +13:00
David Rowe
9f56d2f6f6 Make tablet general settings dialog naming more consistent with desktop 2017-03-02 12:30:36 +13:00
Bradley Austin Davis
fa5b315e09 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-01 15:16:18 -08:00
howard-stearns
5be952c4e8 persist sort info for tablet re-opening, and start with column 1 2017-03-01 14:51:48 -08:00
David Rowe
6fafc829e1 Merge branch 'menuFix' into tablet-ui 2017-03-02 09:28:35 +13:00
David Rowe
f60c2f8ec9 Merge branch 'tablet-ui-edit-js' into tablet-ui 2017-03-02 09:27:09 +13:00
David Kelly
45293ab130 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting 2017-03-01 12:55:54 -07:00
David Kelly
55d049ff5c style updates 2017-03-01 12:43:45 -07:00
David Kelly
efe44425a6 cr feedback, plus something I missed 2017-03-01 09:26:03 -07:00
Dante Ruiz
e2479a78bd Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-03-01 16:04:12 +00:00
David Kelly
678020fed6 now use it (plus a bit of cleanup) 2017-02-28 15:03:45 -07:00
Dante Ruiz
16d3f22e77 remove uncommented code 2017-02-28 21:39:33 +00:00
Dante Ruiz
f0f2b8c4da fix comboBox and PushOntoStack 2017-02-28 21:30:25 +00:00
howard-stearns
c04fd0ec66 smaller glyph size 2017-02-27 16:07:05 -08:00
David Kelly
3bf3f16a6a whitespace 2017-02-27 12:56:03 -07:00
David Kelly
e7c8085bc8 switch to using glyph button 2017-02-27 12:44:23 -07:00
David Kelly
baa7f81d79 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting 2017-02-24 18:38:57 -08:00
Dante Ruiz
73c337efd0 Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-02-25 00:42:22 +00:00
Dante Ruiz
835b23832f some modal clean up 2017-02-25 00:40:38 +00:00
Seth Alves
fcd3c09404 Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js-tablet-as-overlay 2017-02-24 14:27:30 -08:00
Brad Davis
cd8bba47cf Add pending texture transfer size to tracked stats 2017-02-24 12:39:38 -08:00
David Kelly
d6f0d8c960 styling changes, first pass 2017-02-24 11:45:03 -08:00
Howard Stearns
a9b8045697 Merge pull request #9720 from howard-stearns/filter-pal-by-view-distance 
Filter pal by view distance
 2017-02-24 11:10:13 -08:00
David Kelly
d399f648d5 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting 2017-02-24 10:32:43 -08:00
Dante Ruiz
89f5e5112f Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-02-24 15:25:32 +00:00
David Kelly
4a4c914ca8 First cut at new styling 2017-02-23 18:53:22 -08:00
Seth Alves
610c20e01a Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-23 17:41:38 -08:00
Seth Alves
57ab2ba7ca Merge pull request #7 from fayeli/edit-js-create-tab 
Create Tab and Tab Bar QML Styling
 2017-02-23 17:40:48 -08:00
Brad Davis
61e341db75 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-02-23 17:22:03 -08:00
Faye Li
c60360b6e0 particle explorer icon 2017-02-23 16:34:10 -08:00
Dante Ruiz
4a5be4238e messages and file dialogs in tablet 2017-02-24 00:19:32 +00:00
Faye Li
80c3c00398 switch to properties tab when you create an entity 2017-02-23 14:48:06 -08:00
Faye Li
d4ea0c116d asset server button 2017-02-23 14:36:39 -08:00
Faye Li
3850bc35a9 icons on new entity buttons 2017-02-23 13:31:03 -08:00
Faye Li
bd834097d5 tab bar styling 2017-02-23 12:36:27 -08:00
Faye Li
8e89e07732 text choose an entity type to create 2017-02-23 11:50:39 -08:00
Faye Li
88318c1911 create tab background and new entity buttons 2017-02-23 11:40:26 -08:00
Howard Stearns
cddba43837 Merge branch 'master' into filter-pal-by-view-distance 2017-02-23 08:25:16 -08:00
Dante Ruiz
93ae93a45a Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-02-23 15:43:24 +00:00
Andrew Meadows
6ac33dbf61 count avatar joint updates and non-updates 2017-02-22 17:23:36 -08:00
Dante Ruiz
3ba605bf23 saving work 2017-02-23 00:28:30 +00:00
howard-stearns
de3a0d3d0c button styling 2017-02-22 13:02:05 -08:00
howard-stearns
023a32563c work around .qml settings issues 2017-02-22 12:59:40 -08:00
Seth Alves
5bff2034c3 cleanups, attempt to get particle explorer to work right 2017-02-22 12:07:18 -08:00
samcake
6938948501 Merge branch 'master' of https://github.com/highfidelity/hifi into texmex 2017-02-22 12:00:11 -08:00
Seth Alves
84b93826d0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-22 09:30:16 -08:00
Anthony J. Thibault
379b7bc56d Fix for system toolbar hiding when scripts are reloaded 2017-02-21 17:24:22 -08:00
howard-stearns
a20590a2f9 fixed myCard width in all cases (admin or not) 2017-02-21 16:03:59 -08:00
howard-stearns
1ddc7de581 remove debugging (and fix missing brace) 2017-02-21 15:41:17 -08:00
howard-stearns
f21e17d512 new buttons 2017-02-21 15:32:41 -08:00
howard-stearns
aff44d682e Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance 2017-02-21 13:45:25 -08:00
howard-stearns
15d8041683 snapshot working, before button change 2017-02-21 13:14:45 -08:00
David Kelly
76229905f2 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting 2017-02-21 09:24:22 -08:00
Seth Alves
43f47c1106 merge from upstream 2017-02-20 12:45:39 -08:00
Brad Davis
07506b0078 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-02-19 14:00:52 -08:00
Dante Ruiz
3f8ea4ac54 fixed merge conflict 2017-02-17 23:33:39 +00:00
Anthony J. Thibault
5963c6ddc3 Fix for toolbar visibility after snapshots. 2017-02-17 11:04:04 -08:00
Dante Ruiz
dedd85d296 saving work 2017-02-17 18:47:59 +00:00
David Kelly
d938c70b48 volume goes 0-9 now 2017-02-17 11:11:08 -07:00
Seth Alves
0d10667bb4 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-17 09:58:33 -08:00
David Kelly
51246a2e45 first cut, pretty ugly 2017-02-17 10:24:01 -07:00
Dante Ruiz
08ffa18008 Merge branch 'master' into menuFix 2017-02-17 15:53:33 +00:00
Brad Davis
35a6359d59 Fixing transfer logic, adding stats display & profile ranges 2017-02-17 07:53:21 -08:00
Dante Ruiz
3189b44612 refreshing with master 2017-02-17 15:50:08 +00:00
Anthony J. Thibault
cffdecbf68 Merge branch 'master' into feature/toolbar-tablet-switcheroo 2017-02-16 16:28:43 -08:00
Dante Ruiz
628b97bfc6 fixed merge issues 2017-02-17 00:08:31 +00:00
Dante Ruiz
afd56bbbbe fixed qml font path issue for desktop and tablet 2017-02-17 00:01:12 +00:00
Anthony J. Thibault
8ccca86dee Settings for Tablet Becomes Toolbar 2017-02-16 15:57:36 -08:00
Anthony J. Thibault
5b1f150171 Fix for race condition when switching between Main Menu and Audio Menu 2017-02-16 12:52:46 -08:00
howard-stearns
6e3ae1fe4f cleanup some accumulated cruft in pal code 2017-02-16 10:53:02 -08:00
Dante Ruiz
b50bc99cbd updated menu stack 2017-02-16 08:13:16 -08:00
Dante Ruiz
2a97ebb076 updating branch with master 2017-02-16 08:11:50 -08:00
Anthony J. Thibault
03b6280ed0 Fix for empty toolbar issue 2017-02-15 16:50:08 -08:00
Anthony J. Thibault
67302cbd2b toolbar work to better support tablet buttons 2017-02-15 15:53:08 -08:00
Anthony J. Thibault
ed11edad56 EventBridge support 2017-02-15 13:59:04 -08:00
Dante Ruiz
e6853a9255 updated menu stack 2017-02-15 18:57:06 +00:00
Dante Ruiz
485592751f fixing merge changes 2017-02-15 15:38:22 +00:00
Dante Ruiz
22baab1359 updating branch with master 2017-02-15 15:24:08 +00:00
Anthony J. Thibault
912e8aa04a Tablet buttons now work in toolbar. 
Switching between tablet and toolbar is not as dynamic as I'd like but it's a start.
 2017-02-14 15:37:24 -08:00
Anthony J. Thibault
4503923665 Initial version of TabletProxy.toolbarMode boolean 
Copies all tablet buttons between the tablet and the system toolbar.

To test type this in the console:

    Tablet.getTablet("com.highfidelity.interface.tablet.system").toolbarMode = true;
 2017-02-14 15:36:03 -08:00
Seth Alves
838d7f6f10 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-14 13:58:18 -08:00
David Rowe
625f5efdf8 Merge branch 'master' into 21164 
# Conflicts:
#	scripts/system/audio.js
 2017-02-15 10:00:52 +13:00
Chris Collins
442e8d68ef Merge pull request #9650 from kunalgosar/browserFix 
Added isAway (paused) property to myAvatar
 2017-02-14 11:16:07 -08:00
Dante Ruiz
968ba1e03d updated file headers 2017-02-14 16:08:25 +00:00
Dante Ruiz
aa164bbf8f diff minimize 2017-02-14 15:55:32 +00:00
Dante Ruiz
9d5f392be3 removed more qml log errors 2017-02-14 07:46:34 -08:00
Dante Ruiz
773ade5b61 removing qml errors 2017-02-14 07:46:34 -08:00
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
Seth Alves
d40402faae Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-14 06:53:34 -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
Faye Li
6f506d6023 some attempts to get icons in create tab 2017-02-13 14:40:45 -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
Seth Alves
44aa3e044b make it so near grabbing while edit is active doesn't select a new entity 2017-02-10 16:56:53 -08:00
Seth Alves
fead52f626 put new-entity buttons in a tab of the edit app 2017-02-10 15:18:01 -08:00
David Rowe
acaf8c69c6 Better tablet mic muted and unmuted iconography 2017-02-11 11:07:31 +13:00
Seth Alves
0b358a2ac7 finish hooking up new-model dialog 2017-02-10 13:29:06 -08:00
David Rowe
b5b92c1508 Make the tablet's mic icon reflect the current mute state 2017-02-11 09:53:02 +13:00
Seth Alves
e851ece343 merge from upstream 2017-02-10 12:09:00 -08:00
Seth Alves
3171ce1602 hook up more of new-model dialog 2017-02-10 12:03:26 -08:00
Seth Alves
7a63b07462 attempting to handle new-model dialog 2017-02-09 17:14:10 -08:00
Seth Alves
d0d13cdde1 fix tab titles 2017-02-09 15:52:15 -08:00
Seth Alves
e12c77e576 move the edit tabs into tablet 2017-02-09 14:43:44 -08:00
Seth Alves
c4ac719d2c merge from upstream + cleanups 2017-02-09 14:26:29 -08:00
Seth Alves
4c3a6842a5 start on moving edit.js to tablet 2017-02-09 14:03:01 -08: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