Anthony J. Thibault
75b3523c33
Simplify grab animation logic
...
Moved all animation control out of the handControllerGrab.js script and back into
squeezeHands.js
Deleted old hydra/squeezeHands.js to avoid confusion.
Added new sqeezeHands.js script to the default scripts.
2016-01-13 17:57:51 -08:00
Andrew Meadows
c52c543ab8
use strings for JS collisionGroup API
2016-01-12 15:11:27 -08:00
Andrew Meadows
00e5d040a2
use collision masks to prevent grab-bootstrap
2016-01-12 15:10:18 -08:00
Anthony J. Thibault
3d8f8e5618
Set WANT_DEBUG_STATE to false
2016-01-11 10:39:27 -08:00
Anthony J. Thibault
4c1ad6900d
handControllerGrab.js: removed previous animationStateHandler
...
Which was conflicting with the new HandAnimationBuddy animationStateHandler
2016-01-08 11:28:02 -08:00
Anthony J. Thibault
cac19b8579
grab animation work
...
Hand animations now have 5 states:
* idle
* open
* grasp
* point
* farGrasp
The handControllerGrab.js script now chooses one of these five animations, based on the state of the HandController object.
Also, removed hand trigger AnimVar setting from C++ Rig class.
2016-01-07 19:36:57 -08:00
Anthony J. Thibault
1251be1b2b
Merge branch 'master' into tony/grab-script-hand-animation
2016-01-06 16:26:56 -08:00
Anthony J. Thibault
b42fe22e03
Fixing bad line ending.
2016-01-06 16:26:16 -08:00
ericrius1
1f6e45d135
Fix for close grab jumping
2016-01-06 15:10:53 -08:00
ericrius1
67f4c250fd
Search sphere goes away on far to near grab
2016-01-06 14:59:31 -08:00
ericrius1
cb03eda6d1
Instant far to near grabbing now works by using the bumper, or equip, button
2016-01-06 13:37:26 -08:00
Anthony J. Thibault
3e6ff0eb68
Moved hand animation control into grab script.
2016-01-05 19:56:56 -08:00
ericrius1
eb44e54d87
fixed merge conflicts
2016-01-05 16:28:22 -08:00
ericrius1
882ec9fe80
Using offset from intersection point to center of object for insta-grab
2016-01-05 16:24:15 -08:00
ericrius1
a80e77ff80
Squeezing bumper while distance grabbing now brings object to your hand
2016-01-05 11:01:00 -08:00
Seth Alves
212d2d9e8f
merge from upstream
2016-01-05 10:27:45 -08:00
Andrew Meadows
f888cc93f6
Merge pull request #6752 from imgntn/particle_grab_cleanup
...
Add Dynamic Lifetimes to Grab Beam Particle Systems
2016-01-05 10:12:21 -08:00
James B. Pollack
4bb03f8c2d
add beam visualization if sphere doesnt actually hit anything
2016-01-04 12:34:08 -08:00
Seth Alves
e1299ee290
be more careful about grab action -- if it somehow expires, reinstate it
2016-01-03 07:27:14 -08:00
Philip Rosedale
60bc023d6e
Merge pull request #6754 from PhilipRosedale/master
...
Show hand-sphere search line and point just with hand direction again
2015-12-31 13:53:21 -08:00
Philip Rosedale
85a0dfa21a
remove debug line
2015-12-31 13:49:24 -08:00
Philip Rosedale
f4389c3b1f
Add head-to-hand mixing ratio, default to zero (hands only)
2015-12-31 13:36:24 -08:00
Philip Rosedale
c18a2fc264
blend 50/50 between head and hands for search
2015-12-31 11:56:37 -08:00
Philip Rosedale
0d4ac4387a
Show hand-sphere search line and point just with hand direction again
2015-12-31 11:46:35 -08:00
James B. Pollack
40aee910d7
disconnect
2015-12-30 20:18:52 -08:00
James B. Pollack
58257b00e7
reduce gap btw refresh
2015-12-30 17:18:33 -08:00
James B. Pollack
eae8b48513
fix conditional
2015-12-30 11:58:18 -08:00
James B. Pollack
2de517c70f
remove unused line
2015-12-30 11:50:20 -08:00
James B. Pollack
7b14fa0070
Merge branch 'master' into particle_grab_cleanup
2015-12-30 11:46:44 -08:00
James B. Pollack
b7d0a75f25
dynamic lifetimes for particle systems
2015-12-30 11:46:16 -08:00
Eric Levin
9276c78368
Merge pull request #6741 from PhilipRosedale/master
...
Improved hand controller grab and mouse movement
2015-12-30 11:10:37 -08:00
Brad Davis
76eba89f7d
Merge pull request #6745 from hyperlogic/tony/neuron-plugin
...
Support for Perception Neuron
2015-12-30 11:39:32 -05:00
Philip Rosedale
118f919c8b
fix merge conflicts
2015-12-30 00:42:14 -08:00
Philip Rosedale
e995b29712
can target without grabbing
2015-12-30 00:36:11 -08:00
Philip Rosedale
6d857296f9
show search sphere instead of beams, start at center of view
2015-12-29 23:37:10 -08:00
Anthony J. Thibault
4661152aa7
NeuronAvatar.js: Now aligns the head with the HMD if active
2015-12-28 17:57:24 -08:00
James B. Pollack
2ec712a5db
disable near grabbing on sliders
2015-12-28 15:27:17 -08:00
Philip Rosedale
36beea17fa
Improved hand controller reticle movement
2015-12-28 14:59:43 -08:00
James B. Pollack
f0a12e0251
switch
2015-12-28 14:50:35 -08:00
Eric Levin
890b39f04b
Merge pull request #6740 from imgntn/blacklist_grab
...
Add Raypick Blacklisting to handControllerGrab.js
2015-12-28 13:39:23 -08:00
James B. Pollack
7d7d0d4c07
mege
2015-12-28 13:21:00 -08:00
James B. Pollack
8eeae5ddf0
Merge pull request #6736 from ericrius1/handGrabCalcs
...
Hand grab calcs
2015-12-28 10:49:55 -08:00
Anthony Thibault
1f834a9c01
neruonAvatar.js: attempt to adjust hips for HMD mode.
...
It attempts to adjust the hips so that the avatar's head is at the same location & orientation as the HMD
in world space, however it's fighting with the internal c++ code that also attempts to adjust the hips as well.
2015-12-27 16:29:30 -08:00
James B. Pollack
0e30393c81
make sure theres something on the blacklist
2015-12-27 12:47:56 -08:00
James B. Pollack
546e908633
protect blacklisting to my id
2015-12-27 12:46:40 -08:00
James B. Pollack
28c53822b1
add raypick blacklisting to hand grab script
2015-12-27 12:37:33 -08:00
Brad Davis
8e2a79ba4c
Merge pull request #6735 from ZappoMan/headPoseReticle
...
add a test script for HMD.getHUDLookAtPositionXX()
2015-12-27 13:19:18 -05:00
Anthony Thibault
fd3eed3d41
NeruonPlugin: translation support
...
Warn if translations are not present.
2015-12-26 11:50:54 -08:00
Anthony Thibault
878fe80040
Merge branch 'master' into tony/neuron-plugin
2015-12-25 10:24:55 -08:00
Anthony Thibault
84260192fb
Set up controller poses to match hifi standard skeleton
...
Neuron plugin in fills in the gap (thumb1) with identity.
Updated neuronAvatar script to work with new controller pose names.
2015-12-25 09:57:50 -08:00
