Howard Stearns
3da66dacc9
Merge branch 'master' of github.com:highfidelity/hifi into ddv-all
2019-03-27 15:08:03 -07:00
Howard Stearns
489fadda6e
and now it's a list that cleans up after itself
2019-03-27 14:58:58 -07:00
Shannon Romano
8ff47659d3
Merge pull request #15273 from SamGondelman/transparency
...
Case 21949: Fix transparent shape flickering
2019-03-27 14:21:04 -07:00
Ken Cooke
abb0a166b1
Merge pull request #15260 from kencooke/audio-mixer-volume-control
...
Case 21902: System-wide independent volume controls
2019-03-27 13:19:30 -07:00
Howard Stearns
f6ee77a6ae
an entity list of one
2019-03-27 12:23:02 -07:00
Simon Walton
e62270fccf
Fixes for inline jsdoc
2019-03-27 12:00:30 -07:00
SamGondelman
36921276c6
fix transparent shape flickering
2019-03-27 11:52:37 -07:00
Howard Stearns
71111936a2
prep for entity lists
2019-03-27 11:42:16 -07:00
Angus Antley
fcb45802bd
removed debug print
2019-03-27 11:19:28 -07:00
Ken Cooke
dae69ea4cd
Ensure server echo always has unity gain
2019-03-27 10:58:52 -07:00
Sam Gondelman
2005293b3f
Merge pull request #15269 from sethalves/audio-loopback-button-is-local
...
case 21932: the test-audio button causes a local audio-loopback rather than a server one
2019-03-27 10:54:57 -07:00
Simon Walton
6b21fc1af7
Merge remote-tracking branch 'upstream/master' into avatar-hero-zone-improvements
...
Fix jsdoc conflict, also minor clean-up.
2019-03-27 10:54:49 -07:00
Sam Gondelman
0a28090aa4
Merge pull request #15213 from MiladNazeri/Fix/avatarDominantHandChanged
...
Updated engine code to not emit if dominant hand isn't actually changed
2019-03-27 10:53:00 -07:00
Sam Gondelman
ffbf678695
Merge pull request #15217 from jherico/fix/framereader_files
...
Case 21793: Fix loading relative files
2019-03-27 10:52:35 -07:00
Sam Gondelman
0f99280c15
Merge pull request #15265 from hyperlogic/bug-fix/blendshape-precision
...
Improve blendshape precision for small models
2019-03-27 10:51:22 -07:00
Sam Gondelman
3c42cb34ed
Merge pull request #15251 from SamGondelman/animation82
...
Case 21888: Revert changes that impacted animation performance
2019-03-27 10:50:43 -07:00
Andrew Meadows
fb7daa185d
improved physics for grabbed AvatarEntities
2019-03-27 10:12:59 -07:00
Seth Alves
e085a00256
cause 'save' button to unghost if an attachment is adjusted via grab while the adjust-wearables page is open
2019-03-27 10:12:58 -07:00
Seth Alves
d25d290394
refer to ungrabbable wearables as 'frozen' rather than locked, because locked is such an overloaded term
2019-03-27 10:12:58 -07:00
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
howard-stearns
bf1982564c
pass id around instead of relying on latest ivar value in a singleton
2019-03-26 19:26:38 -07:00
Simon Walton
b8f79d3364
Guard against Node linked-data being null
2019-03-26 17:41:22 -07:00
Howard Stearns
57da21cec2
more about challenges use entity id as id, not cert id
2019-03-26 17:12:28 -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
Howard Stearns
c9b79b24e3
track nonces by entity id instead of by cert
2019-03-26 15:23:13 -07:00
Howard Stearns
4dfd0fbda3
challenge ownership packet has an id that gets reflected back. It doesn't have to be a cert.
2019-03-26 15:02:13 -07:00
Howard Stearns
be74218d93
eliminate copy of hash table
2019-03-26 12:05:10 -07:00
Howard Stearns
91a165b4c3
separate out the certified entity map stuff (no-op refactor)
2019-03-26 11:49:08 -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
