Commit graph

131 commits

Author SHA1 Message Date
Clément Brisset
8e62bdea40 Merge pull request #10538 from ctrlaltdavid/21345
Position tablet relative to hand
2017-06-09 17:01:37 -07:00
David Rowe
fff8876b21 Code review 2017-06-10 09:33:45 +12:00
Vladyslav Stelmakhovskyi
8068e7201d Fix position after rotation. May be fix rotation in HMD mode 2017-06-02 18:58:18 +02:00
Vladyslav Stelmakhovskyi
b0e4b752d5 Implements landscape mode for tablet as rotation instead of stretching 2017-06-01 19:07:17 +02:00
David Rowe
367b3ec603 Handle nonvertical avatar orientation 2017-05-28 09:59:32 +12:00
David Rowe
f1dca5019a Fix making the tablet horizontal 2017-05-25 11:48:28 +12:00
David Rowe
6452e92ac9 Hand controller data may not be valid 2017-05-25 11:28:26 +12:00
David Rowe
925cca97db Make the tablet horizontal 2017-05-25 09:16:17 +12:00
David Rowe
39654779fb Position tablet relative to hand 2017-05-24 13:35:00 +12:00
Ryan Huffman
51db0cef98 Fix tablet showing up for a short time on launch 2017-05-09 15:12:12 -07:00
Seth Alves
960bab6e4e Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire 2017-05-04 16:42:57 -07:00
Seth Alves
ed09dcbdc9 don't call editEntity on overlays 2017-05-03 21:32:06 -07:00
Seth Alves
15661987be load tablet overlay models with higher priority 2017-04-27 10:16:08 -07:00
Dante Ruiz
daf25c1fe8 fix crashes when clicking in the homebutton 2017-04-11 00:25:08 +01:00
Seth Alves
715493922e code review 2017-03-30 17:33:01 -07:00
Seth Alves
c62b07d26f add setLandscape call to tablet 2017-03-30 11:36:21 -07:00
Seth Alves
ce9eb1a377 more tablet landscape changes 2017-03-29 14:21:38 -07:00
Seth Alves
371df35013 remove code related to tablet being a model rather than an overlay. start on landscape mode 2017-03-29 14:16:14 -07:00
Anthony J. Thibault
29a159b90d WebTablet.js: Don't remove or add mouse callbacks onHMDChanged
This should prevent the exception on destroy, caused by disconnecting a signal that is not attached.
2017-03-28 09:27:13 -07:00
Seth Alves
902e3d41d6 merge from upstream 2017-03-24 08:20:35 -07:00
Anthony J. Thibault
2c38d7ff89 Tablet spawn orientation now takes hand orientation into account.
Perhaps this will make the tablet spawn location feel more predictable and consistent to the user.
2017-03-22 11:03:03 -07:00
Triplelexx
2d1ca99e2e change variable names that use Quat.getForward 2017-03-22 17:00:12 +00:00
Triplelexx
a964edee91 change all references of Quat.getFront to Quat.getForward in scripts directory 2017-03-21 22:25:30 +00:00
Anthony J. Thibault
f5c3d41f2c Tablet scale settings now take effect soon after they are changed. 2017-03-20 14:51:47 -07:00
Anthony J. Thibault
07e10ae862 Merge branch 'tablet-ui' into feature/can-touch-this 2017-03-10 17:05:26 -08:00
Anthony J. Thibault
1acc5ea760 Finger now points when near tablet + deadspot added when touching the tablet 2017-03-08 19:03:56 -08:00
Seth Alves
de2dd7383d didn't need invis flag, after all 2017-03-08 15:30:49 -08:00
Seth Alves
371c20ee25 hide tablet by making it not visible rather than destroying it 2017-03-08 10:33:59 -08:00
Anthony J. Thibault
836c701cb3 More accurate and responsive stylus and finger touching.
The algorithm used to detect when and where the stylus or finger is touching the tablet has been improved.

* hovering the finger/stylus over the surface of the tablet should cause buttons to highlight.
* flicking or using the stylus like a drum stick, should more accurately click buttons on the tablet.
* stabbing the tablet quickly, should also more accurately trigger button presses.
* moving the hand/stylus from behind the tablet should be less likely to cause press events.
2017-03-07 18:19:32 -08:00
Dante Ruiz
d5714bfa6e Merge branch 'master' into menuFix 2017-02-28 16:55:44 +00:00
Seth Alves
117be16c31 pull from upstream 2017-02-27 16:48:23 -08:00
Dante Ruiz
21c15927cf Homebutton dimension and position scales with tablet 2017-02-27 19:33:52 +00: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
b2a35f45db when tablet is an overlay, use the model-fbx from the distribution (local disk copy) rather than the one on s3 2017-02-24 13:04:43 -08:00
Seth Alves
9c0104a060 don't use Entities.getEntityProperties on tablet when it's an overlay 2017-02-23 14:55:52 -08:00
Seth Alves
37004e4347 steps toward making mouse work on tablet 2017-02-23 08:11:31 -08:00
Seth Alves
84f95e6776 oops 2017-02-22 19:18:42 -08:00
Seth Alves
b4be942348 trying to get tablet overlay to show up in the right place 2017-02-22 19:18:03 -08:00
Seth Alves
bcf1f9ab4c Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay 2017-02-22 16:50:29 -08:00
Seth Alves
bfc4853947 make overlays near-grabbable. make tablet be an overlay 2017-02-22 16:50:02 -08:00
Chris Collins
94517057d6 Merge pull request #9721 from hyperlogic/bug-fix/tablet-ui-tablet-placement
More consistent tablet angle when first creating the tablet.
2017-02-22 15:00:17 -08:00
Anthony J. Thibault
4866be1f52 More consistent tablet angle when first creating the tablet.
The tablet should more constantly be placed above your hand, while facing your head.
It fixes the issue where the tablet would appear almost horizontal when your hand was close to your HMD and at eye level.
2017-02-21 16:01:46 -08:00
Seth Alves
47cdade1e9 fix home-button on tablet 2017-02-17 11:47:37 -08:00
Anthony J. Thibault
cb58c567b8 In desktop mode create tablet near mouse click location.
But prevent the tablet from being displayed off screen.
2017-02-07 18:18:34 -08:00
Seth Alves
f635cd8a07 use tablet models from s3 until relative model urls work 2017-02-03 15:17:33 -08:00
Chris Collins
bac5bd5c0e Merge pull request #9595 from hyperlogic/bug-fix/tablet-ui-bugfixes
tablet-ui: Bug fixes
2017-02-02 17:53:47 -08:00
Anthony J. Thibault
6bef9e888b Merge branch 'master' into bug-fix/tablet-ui-no-domain 2017-02-02 17:21:20 -08:00
Anthony Thibault
59b33bbc53 Merge pull request #9585 from sethalves/use-local-tablet-model
use tablet model from distribution rather than from s3
2017-02-02 16:01:15 -08:00
Anthony J. Thibault
b44e5b5a1f tablet-ui: preferences for tablet ui scaling
One for the tablet in HMD mode, one for desktop mode.
The default desktop mode scaling factor is now 75%, which should
reduce the size of the for users with low resolution monitors,
while still being somewhat readable.
2017-02-02 14:05:07 -08:00