Seth Alves
|
b5919d89a5
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-15 08:26:10 -08:00 |
|
Brad Hefta-Gaub
|
a38ab4ff80
|
Merge pull request #9884 from Atlante45/old-stable
Merge Stable back into Master.
|
2017-03-14 16:59:41 -07:00 |
|
Seth Alves
|
08ee2fd43f
|
Merge pull request #9887 from druiz17/tablet-keyboard-focus
dialogs that are push onto the menu stack now have focus
|
2017-03-14 12:55:47 -08:00 |
|
Dante Ruiz
|
4c686eaa67
|
fix tablet menu stack focus issue
|
2017-03-14 21:20:41 +01:00 |
|
Seth Alves
|
5a557c9fe6
|
Merge pull request #9865 from vladest/tablet-ui-graphics
Add Graphics preferences to Tablet
|
2017-03-14 08:32:55 -08:00 |
|
Brad Hefta-Gaub
|
a8d18adf83
|
Merge pull request #9872 from ZappoMan/fadeInWhenOpeningNoiseGate
code review changes
|
2017-03-14 09:26:14 -07: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 |
|
Seth Alves
|
e0562e27d4
|
Merge pull request #9863 from ctrlaltdavid/21209
Port Avatar > Attachments to tablet
|
2017-03-14 05:32:18 -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 |
|
ZappoMan
|
956fdd0933
|
CR feedback
|
2017-03-13 12:06:38 -07:00 |
|
ZappoMan
|
099ee1db7f
|
CR feedback
|
2017-03-13 12:05:42 -07:00 |
|
ZappoMan
|
f5e434bc40
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fadeInWhenOpeningNoiseGate
|
2017-03-13 11:59:38 -07:00 |
|
ZappoMan
|
3e020ede78
|
CR feedback
|
2017-03-13 11:58:43 -07:00 |
|
Andrew Meadows
|
546f32431d
|
Merge pull request #9862 from ZappoMan/fadeInWhenOpeningNoiseGate
Various noise gate, scope, and audio stats improvements
|
2017-03-13 11:52:16 -07:00 |
|
ZappoMan
|
81d01da21d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fadeInWhenOpeningNoiseGate
|
2017-03-13 10:55:09 -07:00 |
|
Andrew Meadows
|
6e7f4b0418
|
Merge pull request #9829 from ZappoMan/addDoubleClick
Add double click message support to entities and overlays
|
2017-03-13 10:44:54 -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 |
|
Seth Alves
|
524e4bdfbc
|
Merge pull request #9853 from sethalves/tablet-ui-fix-edit-props-race
Tablet ui fix edit props race
|
2017-03-13 08:56:56 -08:00 |
|
Seth Alves
|
75493230b2
|
Merge pull request #9869 from sethalves/tablet-ui
Tablet ui
|
2017-03-13 08:47:14 -08:00 |
|
Seth Alves
|
7e7bbe8785
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-13 09:43:17 -07:00 |
|
Seth Alves
|
b3003acb97
|
Merge pull request #9856 from druiz17/tablet-imporove-dialogs
Bring of menu window if tablet is closed on desktop
|
2017-03-12 12:20:29 -08: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
|
74839b24a3
|
Merge branch 'tablet-ui' into 21209
|
2017-03-11 15:56:38 +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 |
|
Brad Hefta-Gaub
|
aa65f03509
|
fix mac warning and remove accidentally added whitespace
|
2017-03-10 18:14:00 -08:00 |
|
Brad Hefta-Gaub
|
23e47f2fdc
|
added icons to the audioScope app
|
2017-03-10 18:13:35 -08:00 |
|
Anthony Thibault
|
2cc723762c
|
Merge pull request #9861 from hyperlogic/bug-fix/invisible-tablet-clicking
Fix for finger/stylus on invisible/hidden tablet.
|
2017-03-10 17:45:37 -08:00 |
|
Brad Hefta-Gaub
|
7eb4b8f5f7
|
expose AudioScope to QML
|
2017-03-10 17:38:13 -08:00 |
|
Brad Hefta-Gaub
|
b8a2525f9e
|
add auto pause/resume to the Audio Scope App
|
2017-03-10 17:38:00 -08:00 |
|
David Rowe
|
d261e48b9d
|
Use existing model browser dialog as base content
|
2017-03-11 14:33:03 +13:00 |
|