David Rowe
d857f943f8
Handle Clara marketplace downloads
2016-12-07 09:16:59 +13:00
David Rowe
b83d5c6275
Inject Clara Web page modifications
2016-12-05 21:34:34 +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
Seth Alves
d2b32c3084
Merge pull request #9057 from druiz17/childParent
...
fixed children of parent object not being added back when performing an undo
2016-12-01 16:59:06 -08:00
Zach Fox
30dade242c
GIFs: Quality improvements; duration tweaks; processing notif ( #9139 )
2016-12-01 14:53:18 -08:00
Dante Ruiz
348c0c95e5
conforming to coding standard and better variable naming
2016-12-01 22:22:17 +00:00
Seth Alves
24e54f25bf
Merge pull request #9108 from PhilipRosedale/drifting
...
Grab.js weaker at a distance
2016-12-01 12:59:28 -08:00
Philip Rosedale
c60b0c7ef5
Fix indents
2016-12-01 12:54:38 -08:00
Seth Alves
efe9571ab8
Merge pull request #8691 from highfidelity/out-of-body-experience
...
Room Scale HMD comfort features.
2016-12-01 11:09:39 -08:00
Dante Ruiz
a35f28725b
fixed child not commit back when performing undo
2016-12-01 10:54:26 -08:00
Dante Ruiz
3c1d434449
fixed typo
2016-12-01 10:54:26 -08:00
Dante Ruiz
0c9cd5803a
added descendant checking
2016-12-01 10:54:26 -08:00
Dante Ruiz
cb0e01bfa4
fixed child of parent not being added when performing an undo
2016-12-01 10:54:26 -08: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
Chris Collins
c0a0a16ff8
Merge pull request #9127 from huffman/fix/hand-controller-grab-release
...
Fix 'releaseGrab' not being called when using grip buttons
2016-12-01 09:58:36 -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
David Rowe
a75d0b3fe8
Merge branch 'master' into 21089
2016-11-30 14:50:51 +13:00
Anthony J. Thibault
78559934a1
Merge branch 'master' into third-person-lasers
2016-11-29 16:38:34 -08:00
Ryan Huffman
aa1e813d72
Fix 'releaseGrab' not being called when using grip buttons
2016-11-29 15:04:14 -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
Howard Stearns
030f0d7103
Merge pull request #9114 from howard-stearns/bubble-state
...
bubble state
2016-11-28 12:16:39 -08:00
howard-stearns
8b9efb461e
bubble state
2016-11-23 10:22:24 -08:00
howard-stearns
414371d1fc
record starting href/domainId, not ending
2016-11-22 16:13:08 -08:00
howard-stearns
2c9046742e
allow movement during .gif recording
2016-11-22 16:02:01 -08:00
howard-stearns
5188de924f
allow for SnapshotReview dialog to be up during a change of href for all
...
media capture
2016-11-22 11:09:43 -08:00
Philip Rosedale
664b54c004
remove whitespace
2016-11-22 10:27:27 -08:00
Philip Rosedale
c1e044364f
Added distance attentuation of linear and angular rate
2016-11-22 10:24:02 -08:00
Philip Rosedale
c81d5b0793
Merge branch 'master' of git://github.com/highfidelity/hifi into drifting
2016-11-22 09:07:13 -08:00
howard-stearns
066a518142
expose metaverse url to javascript and use it rather than hardcoding
2016-11-21 13:07:38 -08:00
howard-stearns
5b216578d7
Merge branch 'master' of https://github.com/highfidelity/hifi into location-cleanup
2016-11-21 11:47:30 -08:00
Brad Hefta-Gaub
fe709f51de
personal space feature
2016-11-19 16:30:15 -08:00
howard-stearns
da56457c4a
Merge branch 'master' of https://github.com/highfidelity/hifi into location-cleanup
2016-11-18 17:13:32 -08:00
howard-stearns
f1806eb649
server protocols
2016-11-18 17:05:14 -08:00
Ryan Huffman
541ef21801
Merge pull request #9094 from Atlante45/edit-js
...
Turn Edit.js on when importing entities
2016-11-18 15:36:50 -08:00
Zach Fox
35d075a78f
Fix notifications.js formatting
2016-11-18 14:39:30 -08:00
Zach Fox
20a2d1275a
Bugfixes and GIF uploads workinggit add -A!
2016-11-18 14:39:30 -08:00
Zach Fox
adcbb0b760
Code clarity and potential bugfix
2016-11-18 14:39:30 -08:00
Zach Fox
a81289a0d7
Huge progress today. Buggy behavior with multiple snapshots remains
2016-11-18 14:39:29 -08:00
Zach Fox
f726ea546f
code cleanup; simultaneous gif and still capture
2016-11-18 14:39:29 -08:00
Zach Fox
704476c197
Initial progressgit add -A!
2016-11-18 14:39:28 -08:00
Atlante45
cfd4294743
Turn Edit.js on when importing SVO
2016-11-18 11:31:12 -08:00
Anthony J. Thibault
270adfe692
removed debug prints
2016-11-17 11:40:05 -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
