Dante Ruiz
571783b90d
fixed home buttons issues
2016-12-16 09:19:22 -08:00
Anthony J. Thibault
8b99fa90e8
Merge branch 'master' into tablet-ui
2016-12-15 13:28:23 -08:00
Brad Hefta-Gaub
0923a79139
Merge pull request #9187 from PhilipRosedale/rescale
...
Rescale yourself or entities using the grip buttons
2016-12-15 12:32:04 -08:00
Anthony J. Thibault
d2c4417b24
Hook up Help button to the new Tablet interface
2016-12-14 17:05:47 -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
Zach Fox
c53111781b
Fix the bug
2016-12-14 12:17:00 -08:00
Jazmin
b7b4c685e7
Fixed typo
2016-12-13 11:48:06 -08:00
Jazmin
4effdd0394
Update Bubble model in script
2016-12-13 11:46:40 -08:00
Jazmin
0a031e204e
Delete old bubble model
2016-12-13 11:46:22 -08:00
Jazmin
efc9f6549b
Add new bubble model
2016-12-13 11:45:50 -08:00
Jazmin
d9fbde2f66
Update bubble height
...
This height allows my friends to stay in my view comfortably, even when the space bubble is on. Even though it's significantly lower, I don't think anyone is not going to look down when someone starts to shrink down in front of them.
2016-12-13 11:43:09 -08:00
Seth Alves
16128f5087
Merge pull request #9191 from druiz17/homeButton
...
Home button prototype
2016-12-12 16:27:06 -08:00
Seth Alves
d97be52542
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2016-12-12 16:24:17 -08:00
Dante Ruiz
cc0e25720e
mimimize the git diffs
2016-12-12 23:29:11 +00:00
Philip Rosedale
9370c8af6b
Added ability to rescale avatar
2016-12-12 15:26:53 -08:00
Dante Ruiz
6a8465a6ca
removed more whitespace
2016-12-12 23:26:06 +00:00
Chris Collins
4ce1bb3abc
Merge pull request #9172 from thoys/avatarFinderBeacon
...
avatarFinderBeacon.js -- Find other avatars more easily
2016-12-12 15:25:36 -08:00
Dante Ruiz
92993202a4
removed double variable definition
2016-12-12 23:24:56 +00:00
Dante Ruiz
ccecce77de
removed unneeded whitespace
2016-12-12 23:21:14 +00:00
Dante Ruiz
737f11fb7a
merge fix
2016-12-12 23:03:38 +00:00
Dante Ruiz
1b7c89c41d
home button working
2016-12-12 14:34:42 -08:00
Zach Fox
7030c7b0a6
Space bubble improvements ( #9142 )
...
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
2016-12-12 14:22:54 -08:00
Philip Rosedale
a142c830fa
Merge branch 'master' of git://github.com/highfidelity/hifi into rescale
2016-12-12 09:41:34 -08:00
Philip Rosedale
8572950a09
Both grip buttons enable rescale for a held object
2016-12-12 09:39:32 -08:00
Thijs Wenker
3ec06b1a6e
Remove redundant parentheses
2016-12-10 00:21:20 +01:00
Thijs Wenker
4d467deb5e
Fix if statement to match style rule 4.2.8
2016-12-09 21:26:59 +01:00
Thijs Wenker
3f9aa00fd6
Increased show-radius to 20 meters
2016-12-09 19:39:48 +01:00
Seth Alves
37b179b00b
remove commented-out code
2016-12-09 09:55:02 -08:00
Seth Alves
6c99b5e9ca
code review
2016-12-09 06:50:10 -08:00
Thijs Wenker
9397108b3b
clear -> cleanup typo
2016-12-09 03:14:05 +01:00
Thijs Wenker
3ceac7d071
Fix for "cannot access member `sessionUUID' of deleted QObject" error
2016-12-09 02:44:43 +01:00
Thijs Wenker
28e8bb69ec
ignore camera man
2016-12-09 02:29:21 +01:00
Thijs Wenker
387f73b349
reset avatar beacons on domain change
2016-12-09 02:11:05 +01:00
Seth Alves
e06a445959
remove some cruft
2016-12-08 17:00:50 -08:00
Seth Alves
369f61e172
bring over some previous tablet-ui work
2016-12-08 16:54:39 -08:00
Thijs Wenker
dfb4c7cf89
avatarFinderBeacon
2016-12-09 01:41:19 +01:00
howard-stearns
3ba5e1ed4a
new mic toolbar button art
2016-12-06 10:52:40 -08:00
Andrew Meadows
7db8e8f31b
Merge pull request #9156 from hyperlogic/out-of-body-revert
...
Revert Out of Body experience
2016-12-06 08:37:20 -08:00
howard-stearns
7621672964
new mic unumute art
2016-12-05 16:00:03 -08:00
Anthony J. Thibault
89ae3b3d6e
Revert "Merge pull request #8691 from highfidelity/out-of-body-experience"
...
This reverts commit efe9571ab8333e9ec7f4
2016-12-05 15:18:03 -08:00
Ryan Huffman
996d3f5875
Merge pull request #9135 from druiz17/nearGrab
...
Fixed pressing the grip button causes a near grabbed object to drop
2016-12-05 11:07:15 -08: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
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
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
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
Anthony J. Thibault
7f840d3a08
Can use 'xboxLaser' in third person camera
2016-11-30 10:01:11 -08: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
David Kelly
40914d9790
Logging to help find audio device issue
...
We sometimes show duplicate devices in Audio > Devices menu. But
I cannot reproduce it, so maybe best thing is log timing and contents
of input and output device arrays, to try to run down where the issue
is.
2016-11-15 12:58:51 -08:00
Andrew Meadows
6bb3dd6830
Merge hifi/master into hifi/out-of-body-experience
2016-11-14 15:08:04 -08:00
Philip Rosedale
981f505a9c
Merge branch 'master' of git://github.com/highfidelity/hifi into drifting
2016-11-14 14:26:45 -08:00
howard-stearns
47bef18bd4
show the hand controllers when in third-person+hmd, but currently, they're
...
at avatar hands instead of physical hand, which is not what we want!
2016-11-14 13:05:35 -08:00
howard-stearns
06a6da3931
Merge branch 'master' of https://github.com/highfidelity/hifi into third-person-lasers
2016-11-14 09:58:54 -08:00
Stephen Birarda
212d518109
use for loop for kick and mute overlay cleanup
2016-11-13 12:17:12 -08:00
Chris Collins
6581a51bc9
Merge pull request #9052 from davidkelly/dk/2226
...
Add ability to mute user
2016-11-11 16:02:08 -08:00
David Kelly
3d7e075897
Added mute to mod.js script
2016-11-11 11:18:24 -08:00
howard-stearns
e2fded846f
make hand-controller ui work in third person
2016-11-11 11:10:42 -08:00
Brad Hefta-Gaub
a90a0fe8ba
Merge pull request #8976 from druiz17/FixMenuOutOfView
...
Fixed menu out of view with HMD and Xbox controller
2016-11-10 18:49:34 -08:00
Brad Hefta-Gaub
f55b660820
Merge pull request #9033 from huffman/fix/usersjs-hide-show-laser
...
Fix users.js maximize button unclickable with hand controllers
2016-11-10 17:53:17 -08:00
howard-stearns
8299e23cc3
diable some viewpoint menu options when in hmd.
2016-11-10 15:15:11 -08:00
Philip Rosedale
c0b1392685
Merge branch 'master' of git://github.com/highfidelity/hifi into drifting
2016-11-10 13:41:13 -08:00
humbletim
35f857ef9d
inhibit user interactions when window is disabled
2016-11-09 13:21:24 -05:00
