Anthony J. Thibault
bcd31e3d99
Adjust size and offset of grab balls to better align with hand controllers.
...
(cherry picked from commit d97a8c2e7eace2494d3142e8187022a33aedc060)
2016-10-19 15:59:26 -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
Howard Stearns
fc8bbde60a
Merge pull request #8810 from ZappoMan/handControlsWhileLoading
...
make laser pointers work even while content is loading
2016-10-14 10:01:46 -07:00
Brad Hefta-Gaub
ef3c9ba78a
better handling of the teleport target overlays to prevent flashing and thrashing
2016-10-13 18:24:38 -07:00
Brad Hefta-Gaub
ddce0ef74a
make laser pointers work even while content is loading
2016-10-13 17:50:20 -07:00
howard-stearns
0099a4e549
allow hand controller operations when Interface doesn't have focus, but
...
ONLY when in hmd.
2016-10-12 11:23:06 -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
Brad Hefta-Gaub
4ec9299930
fix reticle depth when not moving mouse, but moving head relative to HUD
2016-10-08 14:31:30 -07: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
a5e3fa45c3
Fix advanced movement being disabled
2016-10-07 10:30:18 -07:00
Ryan Huffman
c74df965ba
Fix misnamed function and duplicate onFinish in tutorial
2016-10-07 10:30:18 -07:00
Ryan Huffman
fec8049226
Add proper disabling to advanced movement script
2016-10-07 10:30:18 -07:00
Ryan Huffman
827506e929
Disable 180 spin in tutorial
2016-10-07 10:30:18 -07:00
Ryan Huffman
a4ffa7b23f
Add disabling of right click menu with vive
2016-10-07 10:30:18 -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
d0ba53a069
Change name of isTooCloseToTeleport to be more descriptive
2016-10-04 20:22:22 -07:00
Ryan Huffman
1e6aba1928
Fix teleport not removing overlay on teleport
2016-10-04 20:21:32 -07:00
Ryan Huffman
2ef7c9a57a
Disable smooth movement in teleport.js
2016-10-04 20:21:32 -07:00
Ryan Huffman
53623f7583
Make teleport.js normal rejection more lenient
2016-10-04 20:21:30 -07:00
Ryan Huffman
813ed59f00
Update teleport to not collide with non collidable entities
2016-10-04 20:19:54 -07:00
Ryan Huffman
75265cff6e
Update teleport to not let you teleport into walls
2016-10-04 20:19:54 -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
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
