Commit graph

77293 commits

Author SHA1 Message Date
Seth Alves
e6c279ee5b unlock, rather than lock entities when adjust-attachments window is open, because the windows says you can adjust with hand-controllers 2019-03-27 10:12:58 -07:00
Seth Alves
5695c15809 avoid a deadlock when code invoked by onAddingEntity or onDeletingEntity runs more code that locks the entity tree 2019-03-27 10:12:57 -07:00
Seth Alves
fa36f12145 lock wearables when adjust-wearables page is opened 2019-03-27 10:12:57 -07:00
Seth Alves
4fe94a4b32 when new wearables are added or removed, rerun getWearablesLocked() and update UI 2019-03-27 10:12:57 -07:00
Seth Alves
29af3b1612 add a button to Avatar panel to lock or unlock wearables.
allow grabbing / adjusting others' wearables if they are unlocked.
2019-03-27 10:12:57 -07:00
Sam Gondelman
5f76c96340
Merge pull request #15196 from sethalves/fix-equip-drops
case 21740: make equipping of clonables more reliable
2019-03-27 09:55:12 -07:00
Shannon Romano
d464415e0b
Merge pull request #15255 from AndrewMeadows/fix-owningAvataID
Case 21897: fix bug where AvatarEntities vanish after going to serverless and back
2019-03-27 09:11:36 -07:00
Simon Walton
b8f79d3364 Guard against Node linked-data being null 2019-03-26 17:41:22 -07:00
Seth Alves
5f8139a44c audio-loopback test ignores mute 2019-03-26 16:56:10 -07:00
Seth Alves
16f842b2ac missed one 2019-03-26 16:07:18 -07:00
Seth Alves
7d21222232 the test-audio button causes a local audio-loopback rather than a server one 2019-03-26 16:03:56 -07:00
Shannon Romano
1d5f9cc0ec
Merge pull request #15149 from ctrlaltdavid/M21222
Case 21222: Agent, Avatar, and MyAvatar JSDoc
2019-03-26 15:43:32 -07:00
Ken Cooke
b1d4753464
Merge pull request #1 from wayne-chen/addNewAudioControls
fixing audio screen to match master
2019-03-26 11:30:20 -07:00
Anthony Thibault
08c6acdf99 Improve blendshape precision for small models
For avatars authored in meters, the max component length would often be less then 1.
In that case, the blendshape offset was not normalized before quantization, resulting in loss of precision.
This change will normalize the offset for all cases, except when the max component length is 0.
2019-03-26 11:21:13 -07:00
David Back
754b281bbf
Merge pull request #15249 from dback2/avatarExporterNoNameMaterial
Case 21761: Avatar Exporter v0.4.0 - fix no name material override
2019-03-26 11:07:13 -07:00
Wayne Chen
c0b71150ea removing an extra button 2019-03-26 10:58:04 -07:00
Simon Walton
da6ca38282 Revert to using avatar's _globalPosition for zone membership
According to Tony this should be the hip position, i.e.
a joint pos in T-pose, not neccesarily OK root. Also
SpatiallyNestable::WorldPos may depend on parent entity
and so not known by mixer.
2019-03-26 10:48:59 -07:00
Wayne Chen
e44cdb0d7b
Merge branch 'audio-mixer-volume-control' into addNewAudioControls 2019-03-26 10:39:29 -07:00
Wayne Chen
a2d754cebd fixing audio screen with master 2019-03-26 10:26:29 -07:00
Ken Cooke
7b56bef838 Prototype an updated Audio tab with 3 independent volume controls 2019-03-26 09:41:58 -07:00
Seth Alves
84385e6061 work around fb-21767 with a timer 2019-03-26 09:40:22 -07:00
Seth Alves
4303dd589f make sure equip attachment-points pulled from settings are reasonable before using them 2019-03-26 09:40:22 -07:00
Seth Alves
195472bd43 make equipping of clonables more reliable 2019-03-26 09:40:22 -07:00
Ken Cooke
3d7c3e7b6f Persist the audio-mixer settings across domain changes and server resets 2019-03-26 09:38:50 -07:00
Ken Cooke
c15813b442 Cleanup 2019-03-26 09:38:50 -07:00
Ken Cooke
155bd39da6 Quantize and limit the local injector gains to match the network protocol 2019-03-26 09:38:50 -07:00
Ken Cooke
37429a07b8 Add local injector gains to the Audio scripting interface 2019-03-26 09:38:50 -07:00
Ken Cooke
95b4f954a6 Add AudioClient mixing gains for local injectors and system sounds 2019-03-26 09:38:50 -07:00
Ken Cooke
a2d261d20c Move the new audio volume API from Users scripting interface to Audio scripting interface 2019-03-26 09:38:07 -07:00
Ken Cooke
4a6e495f5f Add Users.setInjectorGain() and Users.getInjectorGain() to the scripting interface 2019-03-26 09:38:07 -07:00
Ken Cooke
755762e8ec Send InjectorGainSet packet to the audio-mixer 2019-03-26 09:38:07 -07:00
Ken Cooke
b15651f1eb Handle InjectorGainSet packet at the audio-mixer 2019-03-26 09:38:07 -07:00
Ken Cooke
1057166418 Add master injector gain to audio-mixer 2019-03-26 09:38:07 -07:00
Shannon Romano
de5b5301d6
Merge pull request #15261 from thoys/fix/avatarTools/clashingHyperlinks
Case 21910: Fix clashing hyperlinks in AvatarPackager project page
2019-03-25 18:21:53 -07:00
Simon Walton
c4fd58eb3e Merge remote-tracking branch 'origin/avatar-hero-zone-improvements' into avatar-hero-zone-improvements 2019-03-25 15:43:06 -07:00
Simon Walton
46f897b693 Better estimate of avatar centre for zone membership 2019-03-25 15:42:30 -07:00
John Conklin II
e5a999b66a
Merge pull request #15256 from SamGondelman/shadow
Case 21898: Fix shadows when tablet is open and misc threading issues
2019-03-25 15:20:23 -07:00
Thijs Wenker
0173c87695 Fix clashing hyperlinks in AvatarPackager project page 2019-03-25 22:48:30 +01:00
Roxanne Skelly
90b9de8623 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20832 2019-03-25 14:48:26 -07:00
Roxanne Skelly
1608b24be1 ase 20832 - Inventory app login and cancel buttons don't work on logout 2019-03-25 14:48:17 -07:00
Sam Gondelman
85024bcc0b
Merge pull request #15214 from SamGondelman/lasers
Case 21505: Fix laser ghosting
2019-03-25 14:43:52 -07:00
Shannon Romano
16d791703d
Merge pull request #15206 from thoys/feat/avatarTools/avatarDoctorWarningURLs
Case 21353: Avatar Doctor documentation / Video URLs
2019-03-25 14:36:30 -07:00
David Rowe
4a832be8c6 Fix JSDoc post-merge 2019-03-26 10:03:30 +13:00
David Rowe
cf4370ed3a Merge branch 'master' into M21222 2019-03-26 09:44:48 +13:00
David Rowe
839a03ebe6 Miscellaneous JSDoc fixes noticed in passing 2019-03-26 09:41:07 +13:00
David Rowe
b78ae80ae6 Address review comments and add further examples 2019-03-26 09:40:47 +13:00
Shannon Romano
6710cd3e03
Merge pull request #15233 from roxanneskelly/Case20407
Case 20407 - Pay-In API doesn't display error when no username specified
2019-03-25 12:41:57 -07:00
Andrew Meadows
cd2dbbb955 fix logic typo 2019-03-25 11:52:52 -07:00
Wayne Chen
afe46cd78b
update indent spacing 2019-03-25 11:29:34 -07:00
Wayne Chen
4658e34b4b
update indent spacing 2019-03-25 11:29:27 -07:00