Commit graph

46298 commits

Author SHA1 Message Date
Stephen Birarda
edd4f5853e use temporary domain name as place name on ID lookup 2016-08-23 11:19:14 -07:00
Stephen Birarda
2b5d862263 request shareable name in AddressManager once connected 2016-08-23 11:19:14 -07:00
Anthony J. Thibault
b2dff8aa77 Easier to click buttons on web entities with shaky hand controllers
There is an angular and time dead spot on webEntity for scrolling vs clicking.
Currently, it's 150 ms and 3 degrees.  See POINTER_PRESS_TO_MOVE_DELAY and POINTER_PRESS_TO_MOVE_DEADSPOT_ANGLE

* Fix for warnings when clicking on window.open() links in WebEntity
2016-08-23 10:19:49 -07:00
Anthony J. Thibault
6be737993e bug fix for sensorToWorld translation transmission 2016-08-23 10:13:07 -07: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
e7dd9c4478 handheld marketplace should work for hydras 2016-08-23 10:10:30 -07:00
Anthony J. Thibault
df17913801 Mipmap generation, trilinear,anisotropic filtering for OffscreenQmlSurface 2016-08-23 10:10:29 -07:00
Anthony J. Thibault
af2c31f29b Renamed WebBuddy to WebTablet 2016-08-23 10:10:29 -07:00
Anthony J. Thibault
eafae1fcf3 Added tablet shell around web-buddy 2016-08-23 10:10:28 -07:00
Anthony J. Thibault
d607abc8f7 Add dpi to edit.js
Also, cap the maximum webEntity texture size to 4096
2016-08-23 10:10:27 -07:00
Anthony J. Thibault
31ed378dbf Added dpi entity property for web-entities 2016-08-23 10:10:26 -07:00
Anthony J. Thibault
6704ae9ad4 Added dpi parameter to userData (this is temporary) 2016-08-23 10:09:17 -07:00
Anthony J. Thibault
9bafd82b2c marketplace now pops up a marketplace web entity 2016-08-23 10:09:16 -07:00
Brad Hefta-Gaub
21bc06f154 Merge pull request #8335 from hyperlogic/feature/hand-controller-web-entity-integration
handControllerGrab and web entity input integration
2016-08-23 09:59:25 -07:00
Brad Hefta-Gaub
52cd222714 Merge pull request #8504 from zzmp/fix/argee
fix typo argee->agree
2016-08-23 09:52:43 -07:00
Howard Stearns
97c706f4cb Merge pull request #8511 from howard-stearns/size-card-up
size activity card up
2016-08-23 09:48:03 -07:00
howard-stearns
7601876641 Scale the activity card back up to match the window being scaled down, so
that it covers the address bar.
2016-08-23 09:44:28 -07:00
James B. Pollack
6ec429fa0b remove unused event listeners 2016-08-23 00:19:03 -07:00
James B. Pollack
d9a39553bd style edits and saved message 2016-08-23 00:14:53 -07:00
James B. Pollack
d0a25e7783 fix switching entities 2016-08-22 23:51:35 -07:00
Howard Stearns
7a9e832959 Merge pull request #8509 from ctrlaltdavid/discovery
Fix server card window scale
2016-08-22 21:35:07 -07:00
David Rowe
f7389dc059 Fix server card window scale 2016-08-23 16:28:32 +12:00
Seth Alves
6c80a35c4b Merge pull request #8477 from sethalves/fix-grab-ignore-ik-1
ignoreIK flag on action-grabbable objects works again
2016-08-22 18:48:39 -07:00
Seth Alves
219d9cefeb Merge pull request #8498 from birarda/temp-with-oauth
allow temp domains to use access token when present
2016-08-22 18:25:18 -07:00
James B. Pollack
e2a6c08f19 cleanup prints 2016-08-22 17:44:22 -07:00
James B. Pollack
4b61cc9f5f new user data editor 2016-08-22 17:30:08 -07:00
Zach Pomerantz
cbb115bbcc fix typo argee->agree 2016-08-22 16:34:23 -07:00
Howard Stearns
f53ce94b20 Merge pull request #8503 from howard-stearns/pr-review-comments-5
pr review
2016-08-22 16:10:47 -07:00
howard-stearns
bc90b0bc43 pr review 2016-08-22 16:09:09 -07:00
elisa-lj11
2d2cb45c5d Merge remote-tracking branch 'highfidelity/master' into zip_project 2016-08-22 16:05:16 -07:00
elisa-lj11
8bf87128d9 Fixed browser.qml 'onNewViewRequested' 2016-08-22 16:04:55 -07:00
Howard Stearns
bfb7d728ad Merge pull request #8502 from howard-stearns/pr-review-comments-4
pr review comments 4
2016-08-22 15:30:50 -07:00
howard-stearns
fc906df5f6 separate into three files 2016-08-22 15:04:38 -07:00
howard-stearns
6daf91166f pr comments 2016-08-22 15:03:51 -07:00
howard-stearns
056b90c662 separate into four files 2016-08-22 15:01:55 -07:00
Brad Hefta-Gaub
0397c6b6ca Merge pull request #8471 from AndrewMeadows/dont-assert-on-bad-data
workaround bad FBXMesh data rather than assert
2016-08-22 14:21:48 -07:00
Anthony J. Thibault
d015c5cfb5 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-22 14:13:17 -07:00
Zach Pomerantz
dbb916e2d9 fix redundant openvr fence condition 2016-08-22 13:59:18 -07:00
Zach Pomerantz
a67c5221e3 flush openvr fence before looking for it 2016-08-22 13:46:00 -07:00
Howard Stearns
f9d8ccaeac Merge pull request #8501 from howard-stearns/pr-review-comments-3
Pr review comments 3
2016-08-22 12:52:40 -07:00
howard-stearns
989974738a dead code removal 2016-08-22 12:50:51 -07:00
howard-stearns
d0b58d8f8e move thread safety into Application from caller 2016-08-22 12:49:51 -07:00
Howard Stearns
ba72dc6375 Merge pull request #8499 from howard-stearns/pr-review-comments-2
pr review comments
2016-08-22 11:04:57 -07:00
howard-stearns
80afc6a3b4 pr review comments 2016-08-22 10:59:21 -07:00
Anthony J. Thibault
b6a4904068 remove explicit check for WebEntity from setKeyboardFocus
Also, don't get entityTree from entityScriptInterface instead go thru EntityTreeRenderer
2016-08-22 10:56:35 -07:00
Stephen Birarda
d098a1ae28 allow temporary domains to use an access token when present 2016-08-22 10:50:39 -07:00
Ryan Huffman
bd86318611 Fix address bar being opened when moving between places on same domain 2016-08-22 10:36:56 -07:00
samcake
4da712fbdf Fixing bad include not respecting filename case (for linux) 2016-08-22 10:36:43 -07:00
Anthony J. Thibault
e1f7dfc4e1 Raised max iterations for IK to 16 from 4
* IK now returns early if solution is "good enough"
* IK now has nsight markers for profiling
2016-08-22 10:34:56 -07:00
samcake
44c6637160 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-22 10:32:06 -07:00