Zach Fox
c83cd4a94a
Complex checkpoint
2017-01-20 10:24:51 -08:00
howard-stearns
2f5f53c8e4
cr
2017-01-06 10:28:09 -08:00
howard-stearns
83685740c4
change wording for common case
2017-01-05 16:37:40 -08:00
Howard Stearns
bbf7d16537
process consistent select message
2017-01-05 13:45:03 -08:00
Howard Stearns
12fffe8530
messages
2017-01-04 20:37:56 -08:00
howard-stearns
9709bedca7
checkpoint
2017-01-04 16:55:58 -08:00
David Rowe
efb784f703
Code review
2016-12-13 13:11:21 +13:00
David Rowe
c87149cfc2
Tidying
2016-12-10 12:59:01 +13:00
David Rowe
2f42f4cfa5
Merge branch 'master' into 21089
2016-12-05 18:33:38 +13:00
David Rowe
f04c493e16
Fix navigation bar and opaqueness of Web page
2016-12-05 17:48:20 +13:00
David Rowe
a5bdd9066f
Add JavaScript event bridge for Web 3D overlay
2016-12-05 17:20:30 +13:00
David Rowe
a8a04cfbba
Add script injection to Web 3D overlay
2016-12-05 12:19:49 +13:00
David Rowe
b723f3d92e
Fix Web tablet screen size
2016-12-05 10:03:30 +13:00
Chris Collins
19b5e7cd86
Merge pull request #9054 from howard-stearns/third-person-lasers
...
make hand-controller ui work in third person
2016-12-01 10:11:12 -08:00
David Rowe
0136534954
Use overlay instead of entity to display tablet Web content
2016-12-01 21:32:57 +13:00
Anthony J. Thibault
7f840d3a08
Can use 'xboxLaser' in third person camera
2016-11-30 10:01:11 -08:00
Ryan Jones
a59df5b04d
one last indentation fix
2016-11-28 17:19:43 -08:00
Ryan Jones
3961dbcf55
revert changes to dev utils, apply changes to system utils
2016-11-28 17:18:31 -08:00
Ryan Jones
4be1922df5
add bind polyfill
2016-11-28 14:47:15 -08:00
Anthony J. Thibault
38ac6fff03
Hand Controller rendering is camera relative
...
Basically, when using the third person camera in HMD mode. If the controllers are shown.
They should be shown in front of the users camera, not in front of the users avatar.
To accomplish this, two new faux joint indices are introduced.
CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX and CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX.
These joint indices can be used for Overlay parenting. (But not for entity parenting because they are not transmitted over the network).
They can also be queried for by using the MyAvatar.getAbsoluteJointRotationInObjectFrame() call.
These new indices are now used by the controllerDisplay.js for the hand controller rendering.
They are also used by system/libraries/controllers.js as the origin for hand controller grabbing and interaction lasers.
2016-11-17 11:33:12 -08:00
howard-stearns
e2fded846f
make hand-controller ui work in third person
2016-11-11 11:10:42 -08:00
Brad Hefta-Gaub
779f326452
cleanup
2016-10-24 15:03:41 -07:00
Brad Hefta-Gaub
0f8967970a
Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers
2016-10-24 08:11:31 -07:00
Brad Hefta-Gaub
a282d83546
more work on extra lasers
2016-10-24 07:46:04 -07:00
Anthony J. Thibault
53864abaf2
edit.js: Fix for picking and manipulating objects via hand controllers.
...
The ray picking was not using the proper grab sphere offset, so it became detached from the visual ray, making picking difficult.
2016-10-20 13:37:31 -07:00
Brad Hefta-Gaub
1a28732b64
Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers
...
Conflicts:
libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
2016-10-20 09:38:03 -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
Brad Hefta-Gaub
c082c74cc0
use head pose for controller in case there are no hand controllers available
2016-10-18 10:01:00 -07:00
howard-stearns
140caf84d8
never interact with hud elements while holding something
2016-10-14 18:30:52 -07:00
howard-stearns
d232d115d5
persist tablet data, and clean it up on startup
2016-10-13 16:53:44 -07:00
howard-stearns
b377127fc1
make marketplace tablet be clientOnly
2016-10-12 14:46:04 -07:00
Brad Hefta-Gaub
93d9cf7917
adjust grab indicators
2016-10-11 12:42:26 -07:00
howard-stearns
03a8af76e3
don't do hand-controller edit object-selection when pointed at a HUD
...
element
2016-09-14 12:02:33 -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
David Rowe
fe8b3b4d0d
Merge branch 'master' into 21040
2016-09-13 09:12:47 +12:00
David Rowe
487cb7d893
Use findInFrustum in entities list and filter results per search radius
2016-09-09 18:58:38 +12:00
Seth Alves
9e99cc1f78
fix mod.js
2016-09-08 07:35:52 -07:00
David Rowe
28cfca993f
Add and wire up "search in view" JavaScript API stub
2016-09-08 14:58:48 +12:00
David Rowe
7d6ab77c16
Merge branch 'master' into 21040
2016-09-08 11:30:19 +12:00
Seth Alves
746d0cd91c
get various hand lasers to all line up with grab-point sphere
2016-09-07 16:10:37 -07:00
Anthony J. Thibault
9f0550ea7e
Raised dpi of WebTablet to fit 480 width keyboard
2016-09-07 10:59:54 -07:00
SamGondelman
88d0aa3737
removed showButtonDown, which didn't exist
2016-09-06 17:36:55 -07:00
David Rowe
c44bd902c3
Display render info values only if provided
2016-09-03 13:07:40 +12:00
David Rowe
980df19db1
Merge branch 'master' into 21040
...
Conflicts:
libraries/entities/src/EntityItemProperties.cpp
2016-09-03 11:38:27 +12:00
Anthony J. Thibault
0f42943bfb
Marketplace tablet is a bit larger and lower DPI.
...
Bug fix for grabbing/equipping large objects, they no longer will drop immediately
if your grab point is too far away from the grabbed entity position.
2016-08-29 11:55:04 -07:00
David Rowe
0d1daecf12
Provide count of textures for entity items
2016-08-27 12:13:34 +12:00
David Rowe
1147adae78
Add columns in entity list for render performance information
2016-08-26 15:16:23 +12:00
Anthony J. Thibault
c6ea64926c
Sensor space entity support
...
You can do this by parenting an entity to an avatar's -2 joint index.
This will mean that the entity will follow the avatar as it moves in the world, but
will not follow the avatar's position as it moves in sensor space. Essentially, this
gives you the ability to place objects in the user's physical room.
WebTablets now are located in this feature and no longer jitter.
2016-08-23 10:13:06 -07:00
Anthony J. Thibault
af2c31f29b
Renamed WebBuddy to WebTablet
2016-08-23 10:10:29 -07:00
