Zach Fox
d9dc8ebc41
More improvements
2017-04-13 15:48:51 -07:00
Anthony Thibault
999bd0d339
Merge pull request #10075 from sethalves/tablet-ui
...
Tablet ui -- misc changes + landscape mode
2017-04-03 10:43:34 -07:00
Seth Alves
43e1cec8a3
merge from upstream
2017-04-03 06:28:59 -07:00
David Rowe
2b4afdb987
Fix tablet window getting stuck to pointer if release mouse off tablet
2017-04-02 12:58:11 +12:00
Chris Collins
3c62826ef9
Merge pull request #10091 from ctrlaltdavid/21248
...
Fix HTML controls not working properly in the tablet
2017-04-01 08:41:44 -07:00
Zach Fox
8a96969471
Merge pull request #9873 from highfidelity/PAL_v2
...
PAL v2.0
2017-03-31 17:00:41 -07:00
David Rowe
25ac82f162
Don't send "move" events for non-move events
2017-04-01 10:47:04 +13:00
David Rowe
b03fd44240
Fix controls in HTML pages not responding to mouse events on tablet
2017-04-01 10:40:06 +13:00
Seth Alves
c62b07d26f
add setLandscape call to tablet
2017-03-30 11:36:21 -07:00
David Rowe
06910d1881
Add comment re scrollbar stability in tablet
2017-03-30 14:20:02 +13:00
David Rowe
f954767b84
Get entities list and entity properties scrollbars working on tablet
2017-03-30 14:04:03 +13:00
Zach Fox
b776f25b3b
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-28 18:09:17 -07:00
Zach Fox
81264c998b
Revert "Merge from upstream/master"
...
This reverts commit b5ba4a109d
2017-03-28 17:39:45 -07:00
Zach Fox
b5ba4a109d
Merge from upstream/master
2017-03-28 17:37:34 -07:00
Seth Alves
39ec53d69a
Merge pull request #10032 from hyperlogic/bug-fix/null-tablet-proxy
...
Mark the system TabletProxy object as Cpp ownership.
2017-03-28 10:08:05 -07:00
Seth Alves
9e675d4c93
Merge pull request #9990 from hyperlogic/bug-fix/sliders
...
Added inputMode property to Web3DOverlay
2017-03-28 10:07:37 -07:00
Anthony J. Thibault
ec6ef01600
Mark the system TabletProxy object as Cpp ownership.
...
This should prevent the problem where the QML engine erroneously thinks the QObject has been collected/destroyed.
2017-03-28 09:53:00 -07:00
Vladyslav Stelmakhovskyi
edb66ae704
Merge branch 'tablet-ui' into tablet-ui-audio-screen
2017-03-25 13:20:43 +01:00
Vladyslav Stelmakhovskyi
fc23c348cb
Implemented Audio settings screen for Tablet UI
2017-03-25 13:17:38 +01:00
Anthony J. Thibault
bab9890fea
Added inputMode property to Web3DOverlay.
...
This allows user to switch between Touch messages and Mouse messages.
Added a sliderTestMain.js script which demonstrates this behavior.
2017-03-23 13:54:18 -07:00
Anthony J. Thibault
8915ecd23d
compile time option to switch from touch to mouse events for web tablet
2017-03-23 13:54:17 -07:00
Zach Fox
e48123b5bb
Merge from Master
2017-03-23 09:54:14 -07:00
Seth Alves
ff3fc244d1
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-23 09:50:53 -07:00
Zach Fox
0506fc0033
New goTo() behavior; Fix goBack
2017-03-20 12:55:38 -07:00
Zach Fox
fc2a501474
Cleanup JS<->QML messaging
2017-03-16 15:38:39 -07:00
Zach Fox
05fec328c0
Make tablet popups work like they should
2017-03-16 10:38:46 -07:00
Vladyslav Stelmakhovskyi
856e15060d
Implemented Domain Connection statistics for Tablet UI
2017-03-15 21:05:13 +01:00
Vladyslav Stelmakhovskyi
99c74cec41
Merge branch 'tablet-ui' into tablet-ui-entity-statistics
2017-03-14 15:59:27 +01: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
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
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
druiz17
0069569e96
Merge branch 'tablet-ui' into 21197
2017-03-09 09:31:15 -08:00
druiz17
8750982567
Merge pull request #9785 from druiz17/menuFix
...
More dialog porting to tablet
2017-03-09 09:29:31 -08:00
David Rowe
1fc6d82456
Tablet and desktop versions of avatar attachments dialog
2017-03-09 13:04:57 +13:00
Seth Alves
28ade45f97
make maxFPS a property
2017-03-08 15:30:15 -08:00
Vladyslav Stelmakhovskyi
a02807fb26
Merge branch 'menuFix' into menuFix_AssetServer
2017-03-07 21:07:53 +01:00
Brad Davis
8782fe1d93
Merge branch 'master' into smarter_textures
...
Conflicts:
libraries/model-networking/src/model-networking/TextureCache.cpp
2017-03-06 15:29:41 -08: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
Seth Alves
08e2e421e4
Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js
2017-03-06 11:08:27 -08:00
Seth Alves
93246b24b0
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-06 08:54:49 -08:00
Dante Ruiz
d5948079c7
Merge branch 'master' of github.com:highfidelity/hifi into menuFix
2017-03-06 16:29:37 +00:00
David Rowe
0333122b23
Make Save and Cancel buttons close preferences dialog
2017-03-04 15:27:31 +13:00
David Rowe
b31cf23c8d
Fix tablet QML fonts path
...
This is the path for running scripts from build/install directory rather
than from source directory.
2017-03-03 17:45:23 +13:00
David Rowe
3285816fca
Fix up audio stats displayed in tablet
2017-03-03 16:45:35 +13:00
Anthony J. Thibault
465a9e2008
Responsiveness improvement to tablet
...
PointerEvents sent from handControllerGrab.js to the Qml window are now direct connections, instead of queued.
This should reduce latency of laser and finger pressed onto the tablet.
2017-03-01 14:31:04 -08:00
samcake
6938948501
Merge branch 'master' of https://github.com/highfidelity/hifi into texmex
2017-02-22 12:00:11 -08:00
Dante Ruiz
f58a018c64
fixing merge conflicts
2017-02-21 15:46:41 +00:00
