Faye Li
6531efffbc
hook up qml button to edit.js
2017-03-17 11:22:07 -07:00
Faye Li
10ebb6efd7
simplify asset server button
2017-03-15 16:55:21 -07:00
Faye Li
42216b6986
create import entities button on create tab
2017-03-15 16:47:31 -07: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
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
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
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
Anthony J. Thibault
40b7e34c0b
Fix for visible empty toolbar when switching from desktop to HMD mode.
2017-03-13 14:23:13 -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
Vladyslav Stelmakhovskyi
48db6201e5
Basic statistics showed. TODO: servers statistics, coloring, wrapping
2017-03-13 19:48:50 +01: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
