Brad Hefta-Gaub
368f48f0a7
Merge pull request #9247 from huffman/feat/tutorial-touch-grip
...
Add support for new Touch grip mappings to tutorial
2017-01-04 17:58:05 -08:00
Seth Alves
a585d43a5e
attempt to get laser-based web scrolling to work, again
2017-01-04 16:51:47 -08:00
Seth Alves
ed934c37ae
put code that allows lasers vs web entities or overlays back in
2017-01-04 15:23:55 -08:00
Brad Hefta-Gaub
d440532cff
make sure RPC is timely
2017-01-03 11:10:07 -08:00
Anthony Thibault
c201b6a7f9
Merge pull request #9256 from druiz17/moreButtons
...
all hub button now on tablet
2017-01-03 10:44:19 -08:00
Anthony J. Thibault
00980366d6
Merge branch 'master' into tablet-ui
2017-01-03 09:45:23 -08:00
Brad Hefta-Gaub
82ab8635d7
debugging
2016-12-30 12:02:48 -08:00
Brad Hefta-Gaub
7c7d239e00
first cut at using wait signals to improve RPC timing
2016-12-30 09:13:21 -08:00
Dante Ruiz
61277c0605
Stylus now works in edit mode
2016-12-22 17:33:25 +00:00
Ryan Huffman
df0dfc761d
Add ability to disable avatar and object scaling in handController grab
2016-12-20 18:01:53 -08:00
Stephen Birarda
ebd347fc15
only respect release of secondary for hold once pressed
2016-12-20 14:46:55 -08:00
Stephen Birarda
4fcccb5455
check for release of equip in this.nearGrabbing
2016-12-20 14:32:47 -08:00
Stephen Birarda
c3d736dd16
return after release, duh
2016-12-20 14:30:08 -08:00
Stephen Birarda
8cd13eaedf
always unequip on secondary release
2016-12-20 14:25:26 -08:00
Stephen Birarda
0a024616cc
add special equip for oculus style grab
2016-12-20 14:21:23 -08:00
Philip Rosedale
13e03b35cc
removed initial delay for seek beams
2016-12-20 14:11:52 -08:00
Philip Rosedale
938734d3fc
Grip controllers can grab objects, slight delay on search beam
2016-12-20 14:11:33 -08:00
Seth Alves
36e843178a
diff minimization
2016-12-20 09:21:41 -08:00
Seth Alves
e5804dade0
get stylus working with web entities
2016-12-20 07:43:48 -08:00
Seth Alves
ae7af3e227
don't hide stylus so quickly
2016-12-20 07:43:48 -08:00
Seth Alves
e9c848bfe8
stylus for web overlays
2016-12-20 07:43:48 -08:00
David Rowe
25651800dd
Code review
2016-12-20 07:43:48 -08:00
Seth Alves
67093dc519
don't flutter tablet when menu button is pressed. start on a stylus
2016-12-20 07:43:48 -08:00
David Rowe
7a36e4eed8
Fix keyboard focus when switch highlight between overlays and entities
2016-12-20 07:42:21 -08:00
David Rowe
0accdddc8f
Fix Web overlay x, y coordinate calcs
2016-12-20 07:42:21 -08:00
David Rowe
f749c76ced
First pass at controller interaction with 3D Web overlay
2016-12-20 07:42:21 -08:00
David Rowe
9459b967be
Merge branch 'master' into 21089
2016-12-16 20:02:43 +13:00
Anthony J. Thibault
8b99fa90e8
Merge branch 'master' into tablet-ui
2016-12-15 13:28:23 -08:00
Philip Rosedale
14c867fdbd
Can't resize if objects in both hands, avatar resize is seek + grips
2016-12-14 13:38:37 -08:00
David Rowe
efb784f703
Code review
2016-12-13 13:11:21 +13:00
Philip Rosedale
9370c8af6b
Added ability to rescale avatar
2016-12-12 15:26:53 -08:00
Philip Rosedale
8572950a09
Both grip buttons enable rescale for a held object
2016-12-12 09:39:32 -08:00
David Rowe
e956608fa4
Fix keyboard focus when switch highlight between overlays and entities
2016-12-09 18:31:52 +13:00
David Rowe
7d8926c802
Fix Web overlay x, y coordinate calcs
2016-12-09 17:00:00 +13:00
Seth Alves
369f61e172
bring over some previous tablet-ui work
2016-12-08 16:54:39 -08:00
David Rowe
4c236b293e
First pass at controller interaction with 3D Web overlay
2016-12-09 01:47:40 +13:00
Dante Ruiz
08301d488d
clean up
2016-12-05 18:10:54 +00:00
Dante Ruiz
09d5dc382f
better solution
2016-12-05 18:08:36 +00:00
Dante Ruiz
1b24d373d2
fixed near grab issue
2016-12-01 10:18:34 -08:00
Dante Ruiz
dc7bb5b083
grip button fix
2016-12-01 10:17:54 -08:00
Ryan Huffman
aa1e813d72
Fix 'releaseGrab' not being called when using grip buttons
2016-11-29 15:04:14 -08:00
Anthony J. Thibault
2193c5faad
Integrated controller display from tutorial scripts + assets
2016-10-20 18:24:58 -07:00
Brad Hefta-Gaub
9008de72e0
Merge pull request #8864 from hyperlogic/feature/grab-sphere-adjustments
...
Adjustment to position and visibility of grab sphere.
2016-10-19 21:51:02 -07:00
Anthony J. Thibault
55c062098a
Adjustment to position and visibility of grab sphere.
...
* The grab sphere used to detect near grabbing is now 10cm in radius instead of 4cm.
* The visual representation of this grab sphere is always hidden, by default.
* This representation can be enabled in via the "Developer > Show Grab Sphere" menu item.
2016-10-19 17:33:05 -07:00
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
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
Seth Alves
3a5f92d7a2
ignoreIK for equipping. change how auto-unequip searches
2016-08-30 11:16:13 -07:00
Brad Davis
eb0a8db0af
Merge pull request #8539 from hyperlogic/bug-fix/snappy-search-beam
...
When trigger is pulled, snap search beam to correct length instead of animating
2016-08-30 11:13:58 -07:00
Seth Alves
f4eee8d480
Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers
2016-08-30 09:12:53 -07:00
Anthony J. Thibault
e34aecde49
Bug fix for click events received by entity scripts
...
PointerEvent.isLeftButton should be true even on left button release events.
in a previous PR this behavior was changed. isLeftButton was used as a flag indicating the button state, which would be false on left button release events.
Because we have scripts that rely on the old behavior, I've changed it back to the original and introduced isPrimaryHeld properties instead.
2016-08-29 16:21:39 -07:00
Anthony J. Thibault
3ed11d2e5f
When trigger is pulled, snap search beam to correct length instead of animating.
...
This improves interaction on web browser tablets. Instead of the beam shooting
through the tablet and animating back to the surface, it starts at the correct length.
2016-08-29 13:22:57 -07:00
