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 |
|
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 |
|
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 |
|
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 |
|
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
|
0a2976deab
|
Add tablet keyboard
|
2017-03-11 15:43:33 +13: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
|
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
|
b63ab05eec
|
improved general settting coloring
|
2017-03-10 19:33:14 +00: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 |
|
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
|
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
|
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 |
|
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
|
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 |
|
David Kelly
|
d6f0d8c960
|
styling changes, first pass
|
2017-02-24 11:45:03 -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
|
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 |
|
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 |
|