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 |
|
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 |
|
Vladyslav Stelmakhovskyi
|
81bc56f124
|
Fixed slider groove size calculation. Added LOD Tools to Tablet UI
|
2017-03-11 14:44:33 +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 |
|
David Rowe
|
ffbb04d3bc
|
Tablet and desktop versions of attachment model browser dialog
|
2017-03-11 15:38:21 +13: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 |
|
David Rowe
|
d261e48b9d
|
Use existing model browser dialog as base content
|
2017-03-11 14:33:03 +13:00 |
|
Anthony J. Thibault
|
3abc78e7d3
|
Fix for finger/sytlus on invisible/hidden tablet.
|
2017-03-10 17:18:13 -08:00 |
|
Anthony Thibault
|
d7c6531d13
|
Merge pull request #9849 from hyperlogic/feature/can-touch-this
More accurate and responsive stylus and finger touching.
|
2017-03-10 17:07:11 -08:00 |
|
Anthony J. Thibault
|
07e10ae862
|
Merge branch 'tablet-ui' into feature/can-touch-this
|
2017-03-10 17:05:26 -08: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 |
|
Chris Collins
|
49efd8ad42
|
Merge pull request #9841 from AndrewMeadows/fix-crash-copying-joint-data
fix crash when unpacking too many joints
|
2017-03-10 14:39:27 -08:00 |
|
David Rowe
|
189eee01a6
|
Refactor TabletComboBox.qml into ComboBox.qml
|
2017-03-11 11:02:09 +13:00 |
|
Seth Alves
|
74df4e9508
|
Merge pull request #9860 from sethalves/tablet-ui-del-stylus-when-script-stops
remove stylus and search-beams when grab script is shut down
|
2017-03-10 13:03:03 -08:00 |
|
Seth Alves
|
2098cd5b5e
|
remove stylus and search-beams when grab script is shut down
|
2017-03-10 13:02:16 -08:00 |
|
Seth Alves
|
88e74251a1
|
cleanups
|
2017-03-10 12:51:34 -08:00 |
|
Seth Alves
|
78092e1ae6
|
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-fix-edit-props-race
|
2017-03-10 12:51:06 -08:00 |
|
Seth Alves
|
7e7b3e040e
|
Merge pull request #9859 from druiz17/tablet-blankscreenv2
force tablet on to home screen option
|
2017-03-10 12:49:52 -08:00 |
|
Dante Ruiz
|
2cd194104f
|
force on to home screen
|
2017-03-10 20:46:01 +00: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 |
|
Seth Alves
|
cb1505d51e
|
Merge pull request #9855 from vladest/ImportEntitiesToTablet
Eliminate pathToFonts not found errors at startup. Change TableFiledi…
|
2017-03-10 11:22:40 -08:00 |
|
Vladyslav Stelmakhovskyi
|
e27ccab2f4
|
Eliminate pathToFonts not found errors at startup. Change TableFiledialog folder on click
|
2017-03-10 19:53:20 +01:00 |
|
Dante Ruiz
|
9b3810814e
|
fiexed putting menu items on the hud when tablet not open when on desktop screen
|
2017-03-10 18:40:18 +00:00 |
|
Seth Alves
|
411ec9a791
|
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-fix-edit-props-race
|
2017-03-10 10:22:10 -08:00 |
|
Seth Alves
|
bc338a0852
|
Merge pull request #9854 from sethalves/tablet-ui
Tablet ui
|
2017-03-10 10:21:45 -08:00 |
|
Seth Alves
|
fffff817a3
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-10 10:20:40 -08:00 |
|
Seth Alves
|
494b602d4c
|
Merge pull request #9850 from druiz17/toolbar-MIA-afetr-snapshot
toolbar becomes visible after taking a snapshot
|
2017-03-10 10:20:01 -08:00 |
|
Seth Alves
|
cef4c988c4
|
Merge pull request #9835 from druiz17/toolbar-window-dont-close
Close toolbar windows when reloading scripts
|
2017-03-10 10:19:07 -08:00 |
|
Seth Alves
|
2068b93ccc
|
Merge pull request #9817 from druiz17/goto-home-bug
cant call gotohomescreen when tablet is closed
|
2017-03-10 10:17:23 -08:00 |
|
Seth Alves
|
531b77928a
|
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-fix-edit-props-race
|
2017-03-10 09:59:35 -08:00 |
|
Seth Alves
|
d792559d9a
|
have edit.js resend properties of selected entity to entityProperties.js once it's ready
|
2017-03-10 09:59:23 -08:00 |
|
Seth Alves
|
b1079d3719
|
Merge pull request #9852 from sethalves/tablet-ui
Tablet ui
|
2017-03-10 09:55:53 -08:00 |
|
Seth Alves
|
e3f1d80933
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-10 09:54:35 -08: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 |
|