Seth Alves
34c5d480c4
Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-02-27 06:35:50 -08:00
Seth Alves
1864975c51
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
2017-02-27 06:35:22 -08:00
Philip Rosedale
4925b3c47c
Merge pull request #9756 from ctrlaltdavid/21122
...
Point index finger and raise thumb if not touching controller
2017-02-25 14:59:48 -08:00
David Rowe
0cc499b08b
Point index fingers and raise thumbs if not touching controls
2017-02-25 14:20:23 +13:00
David Rowe
a205d2a00c
Use animation for pointing index finger instead of setting joint angles
2017-02-25 11:36:06 +13: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
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
eedc5c1647
don't allow tablet to get stuck to a hand when passing it back and forth between hands
2017-02-24 12:10:52 -08:00
Seth Alves
71ab6a1a84
fix a couple of problems related to grabbing tablet while edit.js is active
...
Conflicts:
scripts/system/controllers/handControllerGrab.js
2017-02-24 11:38:42 -08:00
Seth Alves
70060eb464
in 2d mode, clicks on tablet don't get used for other things
...
Conflicts:
scripts/system/libraries/entitySelectionTool.js
2017-02-24 11:37:04 -08:00
Seth Alves
73774a6590
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
2017-02-24 11:34:59 -08:00
Seth Alves
f208f5e2d1
fix a couple of problems related to grabbing tablet while edit.js is active
2017-02-24 11:34:10 -08:00
Seth Alves
e43c4c17f5
in 2d mode, clicks on tablet don't get used for other things
2017-02-23 21:27:25 -08:00
Seth Alves
ce717d04e9
merge in tablet-as-overlay code
2017-02-23 18:40:20 -08:00
Seth Alves
610c20e01a
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-23 17:41:38 -08:00
Seth Alves
d6428ee98c
Merge pull request #6 from fayeli/tablet-edit-layout-fix
...
fix overlapping issue with the delete button
2017-02-23 17:40:15 -08:00
Seth Alves
0a2a1b1637
include visible_to_others in UserActivityLoggerScriptingInterface::openedTablet
2017-02-23 15:25:09 -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
Howard Stearns
cddba43837
Merge branch 'master' into filter-pal-by-view-distance
2017-02-23 08:25:16 -08:00
Seth Alves
37004e4347
steps toward making mouse work on tablet
2017-02-23 08:11:31 -08:00
Seth Alves
4a778b9113
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
2017-02-22 20:39:47 -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
Chris Collins
b295a146e0
Merge pull request #9715 from hyperlogic/bug-fix/tablet-ui-toolbar-highlight
...
More consistent highlights/toggle for toolbar buttons
2017-02-22 18:07:38 -08:00
Seth Alves
273f0130f3
fix sphere vs box check for grabbing overlays. fix newly introduced equipping bug.
2017-02-22 17:43:09 -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
Anthony Thibault
44136e550c
Merge pull request #9729 from sethalves/tablet-ui-no-haptics-for-tablet
...
don't do a haptic pulse when av's hand goes near grabbable tablet
2017-02-22 15:55:01 -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
Seth Alves
aed1d69377
don't do a haptic pulse when av's hand goes near grabbable tablet
2017-02-22 14:14:10 -08:00
howard-stearns
023a32563c
work around .qml settings issues
2017-02-22 12:59:40 -08:00
Seth Alves
5bff2034c3
cleanups, attempt to get particle explorer to work right
2017-02-22 12:07:18 -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
howard-stearns
2b9c69926b
Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance
2017-02-21 15:42:00 -08:00
howard-stearns
1ddc7de581
remove debugging (and fix missing brace)
2017-02-21 15:41:17 -08:00
Seth Alves
8cf71ebc65
Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid
2017-02-21 13:54:21 -08:00
howard-stearns
aff44d682e
Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance
2017-02-21 13:45:25 -08:00
howard-stearns
15d8041683
snapshot working, before button change
2017-02-21 13:14:45 -08:00
Anthony J. Thibault
7564b6f0f5
More consistent highlights/toggle for toolbar buttons
...
When the "app" for a button is visible the button should become active.
Also clicking on a highlighted/active button should close the associated "app".
This should be noticeable on the following tablet apps.
* audio
* menu
* people
* market
* users
2017-02-21 10:59:36 -08:00
Seth Alves
92580a977b
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-20 13:54:12 -08:00
Philip Rosedale
5c782deb4d
Merge pull request #9701 from ctrlaltdavid/21175
...
Fix laser beam jumping upon grabbing entity
2017-02-20 13:37:11 -08:00
Seth Alves
43f47c1106
merge from upstream
2017-02-20 12:45:39 -08:00
Seth Alves
70c9853189
Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid
2017-02-20 12:38:13 -08:00
David Rowe
71ba38afb0
Process controller and script updates only when finger painting is on
2017-02-18 21:28:30 +13:00
David Rowe
05c63e16ca
Send messages local only
2017-02-18 20:40:27 +13:00
David Rowe
6827a28807
Fix grab position
2017-02-18 16:36:14 +13:00
David Rowe
692fa52aca
Disable drawing pointer lasers while painting
2017-02-18 15:21:48 +13:00
David Rowe
2c02b42c96
Finger paint button icon files
2017-02-18 14:21:54 +13:00
David Rowe
0689557ba5
Draw smoother lines
2017-02-18 13:39:59 +13:00
David Rowe
777a0b51c1
Ignore spurious finger tip position values
2017-02-18 13:35:16 +13:00
