Seth Alves
7e4964db3e
Merge pull request #8684 from Menithal/controller-grab-unequip
...
Fixed HandcontrollerGrab distance unequip
2016-10-19 09:53:04 -07:00
Ryan Huffman
5f5dedaa40
Fix equip sphere not showing up
2016-10-17 10:53:02 -07:00
howard-stearns
140caf84d8
never interact with hud elements while holding something
2016-10-14 18:30:52 -07:00
Brad Hefta-Gaub
ddce0ef74a
make laser pointers work even while content is loading
2016-10-13 17:50:20 -07:00
Seth Alves
16af14d1f6
Merge pull request #8758 from hyperlogic/bug-fix/allow-ignoreik-false
...
allow equipped object to follow hand and not controller
2016-10-12 09:52:57 -07:00
Brad Hefta-Gaub
e1a3bc7d55
hide/show grab point sphere only when in a grabbable entity
2016-10-11 16:22:42 -07:00
Brad Hefta-Gaub
93d9cf7917
adjust grab indicators
2016-10-11 12:42:26 -07:00
Menithal
4bed3ee036
Adjusted theoretical Unequip time to 250 ms
2016-10-08 01:36:57 +03:00
Anthony J. Thibault
7c7a9055d1
Allow grabbed objects to override the ignoreIK = true default.
...
They can do this by adding the following to their userData.
grabbableKey: {
ignoreIK: false
}
When this is present and false, the object will follow the hand joint, otherwise it will follow the hand controller.
2016-10-07 14:50:00 -07:00
Anthony J. Thibault
0c2ebc27cb
Fix for exception in handControllerGrab.js
...
Specifically this:
[UncaughtException] TypeError: Result of expression 'this.handToController' [undefined] is not a function. in file:///C:/msys64/home/anthony/code/hifi/build/interface/Release/scripts/defaultScripts.js:1388
2016-10-07 14:48:55 -07:00
Ryan Huffman
14323a06b3
Add interface to disable hand controller grab functionality
2016-10-07 10:30:18 -07:00
Ryan Downe Karpf
ed2571704f
Merge pull request #8735 from huffman/feat/teleport-improvements
...
Update teleport.js to ignore invisible or collisionless objects and disallow teleporting to certain surfaces
2016-10-07 09:56:30 -07:00
Ryan Huffman
d50689b795
Remove disabling of teleport in hand grab
2016-10-04 20:25:46 -07:00
Ryan Huffman
b0c7e91737
Disable ray picking against invisible objects in far grab and teleport
2016-10-04 20:19:51 -07:00
Ryan Huffman
17c63eb722
Add the ability to ignore invisible entities in findRayIntersection
2016-10-04 20:19:32 -07:00
Ryan Huffman
8343cfd687
Add grip to unequip
2016-10-04 16:34:18 -07:00
Ryan Huffman
289cd6ba2b
Adjust hand controller unequip rotation threshold
2016-10-04 16:34:18 -07:00
Menithal
a6040197eb
Fixed HandcontrollerGrab unequip.
...
Will now use deltaTime and a second instead of instantly disconnecting on
if more than 0.1 off. This is to avoid accidental disconnection due to
acceleration and latency
2016-09-29 22:24:07 +03:00
Brad Hefta-Gaub
2b01c60a55
Merge pull request #8615 from davidkelly/dk/1264
...
Make the equip sphere emissive
2016-09-19 16:33:55 -07:00
Anthony J. Thibault
aefe224215
Fix for jittery far-grab at low update rates
...
Clamp the blendFactor used to smooth out the motion of the far-grabbed object.
This prevents the newTargetPosition from over shooting it's goal.
2016-09-19 10:51:46 -07:00
David Kelly
22d80914e2
whitespace
2016-09-16 14:17:44 -07:00
David Kelly
ade17e6456
PR feedback
2016-09-16 14:15:14 -07:00
David Kelly
2ddd46f30b
Switch to the cool looking model instead
2016-09-16 10:56:59 -07:00
David Kelly
1acfe017e1
Make the equip sphere emissive
...
maybe this will make it visible in low ambient light situations?
2016-09-15 17:12:35 -07:00
Seth Alves
e5e9bb0052
Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments
2016-09-14 11:28:10 -07:00
Seth Alves
ecb0669972
try to keep far grab from getting stuck if the entity is brought very near to the grab-point
2016-09-08 17:02:29 -07:00
Seth Alves
0f98c51d89
distance-grabbed things collide with static entities
2016-09-08 16:13:22 -07:00
Seth Alves
9c96ffc9cb
don't show grab-point spheres if controller poses aren't valid
2016-09-07 16:31:02 -07:00
Seth Alves
746d0cd91c
get various hand lasers to all line up with grab-point sphere
2016-09-07 16:10:37 -07:00
Seth Alves
b45181ea92
don't back up pick-ray from hand
2016-09-07 13:32:26 -07:00
Anthony J. Thibault
dc0d0c2d5c
Merge branch 'master' into feature/tablet-ui-foundation
2016-09-07 09:49:55 -07:00
Seth Alves
616b094111
experimenting with position of grab sphere
2016-09-06 16:16:09 -07:00
Seth Alves
34e4b4ae19
move haptic-pulse for when grab-point enters a grabbable entity to the right section of code
2016-09-06 15:37:37 -07:00
Seth Alves
215fd4ddfd
fix grab-point sphere for right hand
2016-09-06 15:15:46 -07:00
Seth Alves
43c98b3f1e
attempt to avoid a very-still far-grab leaving something non-dynamic in bullet upon release. adjust position of grab-point sphere
2016-09-06 14:42:53 -07:00
Seth Alves
b8b1127d55
merge from upstream
2016-09-02 15:11:21 -07:00
Anthony J. Thibault
0128d7c61b
Merge branch 'master' into feature/tablet-ui-foundation
2016-09-02 12:16:25 -07:00
Anthony J. Thibault
3d5e8fc213
First pass of keyboard raising and lowering
2016-09-02 12:15:30 -07:00
Brad Hefta-Gaub
cf242eca9f
Merge pull request #8537 from hyperlogic/feature/larger-marketplace-tablet
...
Marketplace tablet is a bit larger and lower DPI.
2016-09-02 08:45:29 -07:00
Seth Alves
9ef03b1205
avoid having auto-unequip code trigger during a teleport
2016-09-01 19:13:08 -07:00
Seth Alves
8505d1eeed
avoid a bootstrap
2016-09-01 17:51:02 -07:00
Seth Alves
da35281941
don't assume collides-with-dynamic during a multi-grab
2016-09-01 16:57:23 -07:00
Seth Alves
b1eb4c361d
if a hand is disabled while holding something, release it
2016-09-01 15:02:41 -07:00
Seth Alves
dd7e25441c
include which hand in grab messages
2016-09-01 14:58:37 -07:00
Seth Alves
a35e527128
try to fix far-trigger
2016-09-01 11:46:08 -07:00
Seth Alves
53ba190ca6
don't do auto-release test unless the hand is equipping
2016-09-01 09:57:46 -07:00
Anthony J. Thibault
823420ae0a
Working web entity keyboard
...
* Missing many keys
* Does not dynamically appear and disappear
2016-08-31 17:57:13 -07:00
Seth Alves
47259ee053
find equip-points with controller position rather than hand
2016-08-31 16:52:46 -07:00
Seth Alves
78f54a7f33
get rid of some jitter in equipped items. do a better job of deciding when something equipped has been torn-away
2016-08-30 14:39:11 -07:00
Seth Alves
617880479a
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-30 11:19:40 -07:00
