RebeccaStankus
092424569d
Added flag to ensure mouse event signals are not connected twice
2019-10-08 12:01:47 -07:00
sabrina-shanman
d48c8d897c
Clarify that a Grabber member function toggles both picks and pointers
2019-07-23 12:58:07 -07:00
sabrina-shanman
abac1787a6
Fix using invalid pick API functions on HMD ray pointer
2019-07-23 12:58:07 -07:00
sabrina-shanman
79d09f68fd
Disable grab.js picks when in HMD
2019-07-23 12:58:07 -07:00
sabrina-shanman
fcaa64b9ef
Fix teleport collision picks always enabled if user never enters HMD
2019-07-16 17:46:59 -07:00
sabrina-shanman
e043d181cd
Disable picks in controllerDispatcher when not in HMD
2019-07-16 17:46:54 -07:00
Anthony J. Thibault
3a6d8dc383
Disable handTouch.js to prevent finger twitching
...
This PR disables handTouch.js.
handTouch.js allows the fingers to animate on the surface of an object.
However, it can sometimes detect collisions with walls or tables when the avatar is standing next to them.
We will more properly fix handTouch.js in a future PR, but for now we will disable the functionality.
Also, a small bug fix was made to the Rig to prevent the idleOverlayAlpha from exceeding the 0.0 to 1.0 range.
This can cause the fingers to bend incorrectly for a moment.
Also, three new items were added to the Developer > Show Animation Stats panel.
* Joint Override Count: displays the current count of joints that are overriden by MyAvatar.setJointRotation() JS API calls.
* Flow: displays if flow is active of disabled.
* Network Graph: displays if the network anim graph, used for teleportation, is enabled or disabled.
https://highfidelity.atlassian.net/browse/BUGZ-154
2019-06-20 15:52:36 -07:00
r3tk0n
4fb7bbabe1
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
2019-04-01 14:52:21 -07:00
Seth Alves
84385e6061
work around fb-21767 with a timer
2019-03-26 09:40:22 -07:00
Seth Alves
4303dd589f
make sure equip attachment-points pulled from settings are reasonable before using them
2019-03-26 09:40:22 -07:00
Seth Alves
195472bd43
make equipping of clonables more reliable
2019-03-26 09:40:22 -07:00
r3tk0n
108e8b9994
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
2019-03-21 15:17:56 -07:00
r3tk0n
8f5a8d0caa
Fix typo that broke fargrab. Grip or Trigger on off hand will now manipulate.
2019-03-21 14:38:11 -07:00
r3tk0n
c9ade7ccb8
Add grip to fargrab.
2019-03-15 16:09:01 -07:00
Wayne Chen
84b177996b
removing dead code
2019-03-11 16:43:26 -07:00
r3tk0n
39342b9771
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
2019-03-11 16:27:05 -07:00
r3tk0n
ec0cf3ee3a
Fix typo.
2019-03-11 09:58:20 -07:00
Wayne Chen
18b86d550d
adding PushToTalk action
2019-03-08 16:07:48 -08:00
r3tk0n
5f48a6d104
Fix typo.
2019-03-08 16:07:47 -08:00
r3tk0n
24d6646e8d
Fix activation / deactivation criteria for PTT controller module.
2019-03-08 16:07:47 -08:00
r3tk0n
3b274c2b6e
Enable pushToTalk.js controller module.
2019-03-08 16:02:16 -08:00
r3tk0n
f6add9cafd
Add pushToTalk.js controllerModule.
2019-03-08 16:02:15 -08:00
Shannon Romano
e776cf2627
Merge pull request #15127 from danteruiz/fix-websurface-module
...
Case 20734: HMD lasers on 3D overlay do not appear + trigger event does not get called
2019-03-07 16:04:57 -08:00
danteruiz
87cfbe48d1
fix webSurfaceIntersection
2019-03-07 13:11:18 -08:00
danteruiz
272ca5dc1c
disable entity scaling
2019-03-05 16:23:40 -08:00
r3tk0n
12ffa41984
Prevent HUD and Web Surface lasers from interrupting FarGrab.
2019-03-02 13:55:06 -08:00
Jason Najera
d41c2d296b
Merge pull request #15043 from r3tk0n/fargrab-manipulation
...
FarGrab Entity Rotation with Off-Hand
2019-03-01 14:42:59 -08:00
danteruiz
f715dbe243
fix tablet scaling
2019-02-28 13:32:12 -08:00
r3tk0n
a72b02cd25
Clean up code and add comments.
2019-02-28 13:08:05 -08:00
r3tk0n
3a5698236b
Swap FarGrab from superpower to alternative version from PR#15043
2019-02-27 10:57:35 -08:00
r3tk0n
1ec887ffc2
Fix teleportation play area indicator not hiding on cancel.
2019-02-27 10:51:38 -08:00
r3tk0n
fcdfae5a67
Fix notion of hand dominance.
2019-02-27 08:39:35 -08:00
r3tk0n
7c515ccd45
Add 2x rotation multiplier.
2019-02-26 19:16:45 -08:00
r3tk0n
ca740c6254
Add a 2x multiplier for controller movement to entity rotation when manipulating with fargrab.
2019-02-26 18:44:00 -08:00
r3tk0n
52d80476a8
Fix activation criteria.
2019-02-26 17:55:16 -08:00
r3tk0n
9559f9ffd3
Add off-hand controller manipulation to fargrab.
2019-02-26 17:52:18 -08:00
r3tk0n
2077e012db
Fix case of repeated manipulations with fargrab.
2019-02-26 15:00:44 -08:00
r3tk0n
f3b65d06ad
Fix frame of reference for rotations.
2019-02-26 12:46:46 -08:00
r3tk0n
2a04d2b9c5
Closer...
2019-02-26 12:39:51 -08:00
r3tk0n
0b651a8d63
Fix fargrab rotation with dominant hand, need to fix activation criteria next.
2019-02-26 11:29:06 -08:00
r3tk0n
52b62784d6
Incremental, broken progress.
2019-02-25 14:10:48 -08:00
r3tk0n
a66c76bf38
Fixing typos.
2019-02-25 13:47:31 -08:00
r3tk0n
d79681470e
Saving changes before merging master...
2019-02-25 13:10:25 -08:00
r3tk0n
c6a3496b25
Add utility functions for adjusting target rotation and position.
2019-02-24 12:36:44 -08:00
r3tk0n
58906d84eb
Add grip button polling.
2019-02-21 15:22:21 -08:00
r3tk0n
7092513b7d
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
2019-02-19 17:42:58 -08:00
Dante Ruiz
6189aff6b3
Merge pull request #14933 from danteruiz/pick-manager-perf
...
Case 21271: Remove unnessary picks for quest
2019-02-19 14:20:56 -08:00
r3tk0n
ebbf48a11b
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
2019-02-19 12:02:50 -08:00
r3tk0n
03058775f6
Remove debug prints.
2019-02-19 11:27:13 -08:00
r3tk0n
f52b096bb9
Change far grab to chorded input 'superpower'
2019-02-19 11:26:42 -08:00
