Seth Alves
1e6b2682c9
use timers rather than relying on update calls
2017-04-21 10:17:57 -07:00
Brad Hefta-Gaub
a555846d5d
Merge pull request #10235 from volansystech/21206
...
21206 Far grab improvement to draw held entity toward yourself
2017-04-19 14:33:09 -07:00
volansystech
b194ddeb66
Resolve Comments of @sethalves
2017-04-19 16:39:23 +05:30
volansystech
e5c7587ad8
Improve far grabbing based on timescale.
2017-04-18 20:01:02 +05:30
volansystech
7e0efed062
Improve speed of grabbing.
2017-04-18 00:54:01 +05:30
Seth Alves
110cfb47d1
turn off handControllerGrab debug prints
2017-04-14 14:23:27 -07:00
Seth Alves
6420ddd038
grab script checks for touch devices continually, rather than just when the script starts
2017-04-14 14:20:04 -07:00
Seth Alves
af5a352f02
turn on handControllerGrab debug prints
2017-04-14 08:10:31 -07:00
volansystech
7bc3435cfa
Initial Commit..
...
If distanceToObject from avatar is more than 15, we are accelarting entity travel by 2x.
This will help user to grab the entity in lesser time.
2017-04-13 02:51:30 +05:30
Seth Alves
2e4e10759f
teleport raypick now ignores equipped or grabbed entities
2017-04-05 13:17:03 -07:00
Seth Alves
54c66aff07
use tablet-ui stylus as default, rather than avatar finger
2017-03-31 13:18:40 -07:00
Seth Alves
8e38b41e44
Merge branch 'tablet-ui' of github.com:sethalves/hifi into tablet-ui
2017-03-28 11:41:58 -07:00
Seth Alves
851ea7dabc
fix initial finger/stylus setting
2017-03-28 11:41:51 -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
Seth Alves
cdac011472
fix home button
2017-03-27 18:21:00 -07:00
Anthony J. Thibault
5796cbc898
Bug-fix for touching deleted entities or overlays.
2017-03-27 10:26:33 -07: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
Dante Ruiz
d2c139ce6e
fix error from using a misspelled function
2017-03-21 22:25:45 +01:00
Dante Ruiz
1811a2edc7
fixed third eye laser
2017-03-21 19:45:00 +01:00
Anthony J. Thibault
3abc78e7d3
Fix for finger/sytlus on invisible/hidden tablet.
2017-03-10 17:18:13 -08:00
Anthony J. Thibault
07e10ae862
Merge branch 'tablet-ui' into feature/can-touch-this
2017-03-10 17:05:26 -08:00
Seth Alves
2098cd5b5e
remove stylus and search-beams when grab script is shut down
2017-03-10 13:02:16 -08:00
Anthony J. Thibault
d8f04d90a7
Merge branch 'master' into feature/can-touch-this
2017-03-09 14:24:10 -08:00
Anthony J. Thibault
6f53aaed5c
Small simplification of building stylusTarget list.
2017-03-09 14:04:13 -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
66d44ac6f0
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-08 09:26:51 -08:00
Seth Alves
a67f8ac0ed
Merge pull request #9807 from Menithal/21166-remove-limit
...
#9761 Cloneable Improvement
2017-03-08 07:15:06 -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
Seth Alves
4886f1cbfc
don't run stylus-on-overlay code unless the overlay is a web3d overlay
2017-03-06 12:38:19 -08:00
Seth Alves
27066e89a6
Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-03-06 11:46:19 -08:00
Seth Alves
a2d2c41f02
remove debug print
2017-03-06 11:45:49 -08:00
Seth Alves
eb47db4441
Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-03-06 11:07:22 -08:00
Seth Alves
19a31d7630
don't automatically unhook overlays from hands unless they were grabbable overlays
2017-03-06 10:15:53 -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
Seth Alves
c677326025
Merge pull request #9754 from hyperlogic/feature/fingers-on-tablet
...
Touch the tablet with your finger
2017-03-04 11:58:47 -08:00
Menithal
d85cb645b0
Changed limit logic, default limit is now 0
...
Clones now have a named based on the original entity id
Limit is now calculated from the source instance, instead of just clone
name to avoid a single box being calculated as something else
Default limit is now 0, which disables limit
2017-03-04 11:42:43 +02:00
Anthony J. Thibault
e56f02d94f
Changed default for preferFingerOverStylus to false.
2017-03-03 14:12:04 -08:00
Seth Alves
bccfa79e8b
Merge pull request #9749 from ctrlaltdavid/21176
...
If someone else is grabbing entity you want to grab show their grab beam
2017-03-03 13:43:28 -08:00
Anthony J. Thibault
45febe8565
Merge branch 'master' into feature/fingers-on-tablet
2017-03-03 09:04:43 -08:00
Seth Alves
40caa1ea49
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-03 09:01:57 -08:00
David Rowe
388a144af1
Tidying after merge
2017-03-03 18:44:50 +13:00
David Rowe
482c23ead5
Merge branch 'master' into 21186
...
# Conflicts:
# scripts/system/controllers/handControllerGrab.js
2017-03-03 18:38:42 +13:00
Brad Hefta-Gaub
e655e442a0
Merge pull request #9799 from sethalves/steady-hand-lasers
...
Steady hand lasers
2017-03-02 18:27:39 -08:00
Seth Alves
3b581a8dfe
merge from upstream
2017-03-02 16:35:44 -08:00
Seth Alves
155a310852
Merge pull request #9761 from Menithal/21166
...
WL#21166 Cloneable Equipment
2017-03-02 16:33:13 -08:00
Anthony J. Thibault
644e29a43d
disable WANT_STATE_DEBUG in handControllerGrab.js
2017-03-02 14:15:05 -08:00
Seth Alves
bbfd373887
Merge branch 'steady-hand-lasers' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-03-02 12:51:52 -08:00
Seth Alves
9b3c16d489
get handControllerGrab overlay lines working again
2017-03-02 12:48:37 -08:00
Seth Alves
2047e0194d
Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers
2017-03-02 12:44:10 -08:00
Seth Alves
94b5e6333c
get handControllerGrab overlay lines working again
2017-03-02 11:02:06 -08:00
