Zach Fox
e21ee20ff8
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-14 15:18:07 -08:00
Andrew Meadows
ec872bfcf8
remove unused variable
2019-11-14 09:59:43 -08:00
Andrew Meadows
9dd0105ba5
only one copy of entityIDs instead of two
2019-11-14 09:59:43 -08:00
Andrew Meadows
dbeea4038d
remove unused argument
2019-11-14 09:59:43 -08:00
Andrew Meadows
b5ca93a019
remove redundant checks in 'if' clause
2019-11-14 09:59:43 -08:00
Andrew Meadows
b231dadba5
add check for local-entity when changing phys properties
2019-11-14 09:59:43 -08:00
Andrew Meadows
28f51f6204
add comments
2019-11-14 09:59:43 -08:00
Andrew Meadows
de44cdaf25
remove unnecessary check in if clause
2019-11-14 09:59:43 -08:00
Andrew Meadows
0f2d9027e1
fix indentation
2019-11-14 09:59:43 -08:00
Andrew Meadows
039f7cae13
avoid Qt container in another spot
2019-11-14 09:59:43 -08:00
Andrew Meadows
3546bab19a
use std::vector<> instead of QVector<>
2019-11-14 09:59:43 -08:00
Andrew Meadows
fb090d1388
force delete OtherAvatar entities when necessary
2019-11-14 09:59:43 -08:00
Andrew Meadows
4159bc4862
abide by domain-entity hierarchy deletion rules
2019-11-14 09:59:43 -08:00
Andrew Meadows
4e6a647718
don't restrict edit properties of myAvatarEntity
2019-11-14 09:59:43 -08:00
Andrew Meadows
9d92546a8b
revert the revert of PR-16307
2019-11-14 09:59:43 -08:00
milad
abf592f533
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-13 10:14:14 -08:00
Zach Fox
8aea0dd951
Merge in Howard's 'screenshare presence' open PR
2019-11-13 10:11:16 -08:00
Brad Hefta-Gaub
1f2deed941
Merge pull request #16477 from samcake/zorro
...
DEV-2711: Fix crash when highlighting custom pipeline shapes
2019-11-13 09:50:16 -08:00
amerhifi
3939c7e6fd
adding qaudio reset on switch.
2019-11-12 17:07:43 -08:00
Anthony Thibault
7736582f3b
Merge pull request #16486 from DouglasWilcox/HMD_strafe_transition_bug
...
Fix HMD strafe locomotion animation.
2019-11-12 15:49:15 -08:00
DouglasWilcox
f9f28fc286
Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states.
2019-11-12 14:15:19 -08:00
amer cerkic
35065cf4d8
Merge branch 'master' of https://github.com/highfidelity/hifi
2019-11-11 16:15:41 -08:00
Shannon Romano
5f2f647dfb
Merge pull request #16480 from kencooke/audio-hrtf-attn-improved
...
DEV-2330: Improved attenuation zones
2019-11-11 13:17:36 -08:00
amer cerkic
3a764169ba
adding new device to list if default not found
2019-11-11 11:13:44 -08:00
amer cerkic
549e181be0
adding safeguard in case device list is empty
2019-11-11 11:00:33 -08:00
Ken Cooke
ddd11305de
Improved HRTF algorithm to expose parametric occlusion/lowpass effect
2019-11-09 09:57:16 -08:00
dooglifeSF
055d5cdf9b
Simplify boolean statements, revise several settle anims
2019-11-08 13:46:38 -08:00
Sam Gateau
8175b9486f
Fix crash when highlighting custom pipeline shapes
2019-11-08 11:18:02 -08:00
dooglifeSF
8e11d91c03
Merge branch 'master' into rand_settles_and_by_momentum
2019-11-07 15:09:10 -08:00
Maia Hansen
7855747386
Merge pull request #16470 from samcake/zorro
...
Procedural Material crashes in shadow pass on deformed shape renderItems
2019-11-07 15:00:06 -08:00
Sam Gateau
86b62f921d
Now that avatars can potentially have their own custom pipeline, shadow pass needs to support it
2019-11-07 14:01:50 -08:00
Shannon Romano
176b463f16
Merge pull request #16458 from hyperlogic/bug-fix/anim-blend-directional-assert
...
Fix for assert in AnimBlendDirectional on startup
2019-11-07 13:11:11 -08:00
dooglifeSF
73202b9caf
Different settle transition depending on momentum
2019-11-07 09:52:26 -08:00
Shannon Romano
d30f30191f
Merge pull request #16457 from jennaingersoll/doc-193
...
DOC-193 Clarified legacy vs current camera modes
2019-11-06 10:59:32 -08:00
Shannon Romano
668061e154
Merge pull request #16445 from hyperlogic/bug-fix/remove-last-legacy-blendshapes
...
Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy blendshapes
2019-11-06 10:35:53 -08:00
Anthony J. Thibault
6e7f222608
Fix for assert in AnimBlendDirectional on startup
...
Specifically, std::vector subscript out of range.
2019-11-05 14:16:10 -08:00
ingerjm0
499a0a8067
Clean up code per review
2019-11-05 14:14:46 -08:00
ingerjm0
faa4c97f8a
Revisions per review
2019-11-05 14:04:01 -08:00
amerhifi
bc41087ea9
removing lock from WASAPI initialization
2019-11-05 12:50:59 -08:00
ingerjm0
27d4bfdd01
DOC-193 #comment Documented legacy vs current camera modes, along with code samples to re-enable legacy code
2019-11-05 12:20:51 -08:00
amerhifi
343807a9f5
Merge branch 'master' of https://github.com/highfidelity/hifi
2019-11-05 10:17:04 -08:00
amer cerkic
b2ab33116f
removing double calls to switch devices, handling default changes from scripting interface instead
2019-11-04 15:03:53 -08:00
Brad Hefta-Gaub
f5873e6f76
Merge pull request #16446 from samcake/zorro
...
Renaming the env variable to enable Material Procedural Shaders
2019-11-04 14:32:54 -08:00
Zach Fox
c39dbc600d
Merge pull request #16441 from zfox23/enableHashMapSignalsForESS
...
Implement DEV-2654: Allow ESS to make use of signals like `avatarRemovedEvent`
2019-11-04 11:59:15 -08:00
Sam Gateau
a4696992e8
Renaming the env variable to enable Material Proecural Shaders
2019-11-04 11:15:37 -08:00
Anthony J. Thibault
821a46697a
Update fixUpLegacyBlendshapes as well
2019-11-04 10:55:05 -08:00
Anthony J. Thibault
101ec9d753
Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy faceshift blendshapes
...
These blendshapes are not present in ARKit and are not used by any of our procedural
face animations (talking, blinking etc). This change should have been part of #16400 but
was accidently left out.
2019-11-04 09:49:24 -08:00
HifiExperiments
bae2ba7bae
merge with master
2019-11-02 01:08:56 -07:00
HifiExperiments
6e5217b80d
fix build error, add environment variable
2019-11-02 01:03:34 -07:00
Zach Fox
8d07d401c3
Add a line of JSDoc
2019-11-01 14:45:07 -07:00
