Sabrina Shanman
769a332d22
Merge pull request #16485 from highfidelity/master
...
Merge master into instancing
2019-11-12 10:07:28 -08:00
sabrina-shanman
f39121c53b
Fix build error/warning
2019-11-12 09:52:58 -08:00
amerhifi
89d494cf81
Merge branch 'master' of https://github.com/amerhifi/hifi
2019-11-12 09:35:47 -08:00
milad
7cce153b6d
working flow. Needs clean up and final ui tweaks
2019-11-11 20:13:23 -08:00
sabrina-shanman
2169952613
Remove unused mesh.part.materialID
2019-11-11 17:52:16 -08:00
sabrina-shanman
9a65d78cdf
Fix model baking to work with new hfm::Shape material definition (1
...
material per mesh part)
2019-11-11 17:52:00 -08:00
Rebecca Stankus
b85b582d16
Merge branch 'master' of github.com:highfidelity/hifi into MiladNazeri-screenshareElectronApp
2019-11-11 17:32:45 -08:00
Rebecca Stankus
f806c930aa
Electron app css UI changes
2019-11-11 17:31:19 -08:00
milad
ae35ec0975
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-11 16:42:55 -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
DouglasWilcox
64634f51b1
Merge branch 'master' into improve_seated_rotation
2019-11-11 11:31:56 -08:00
DouglasWilcox
c36c4a17b1
first pass hookup of seated rotation with acceleration and animation response
2019-11-11 11:31:34 -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
Shannon Romano
75ba65c2c9
Merge pull request #16467 from DouglasWilcox/rand_settles_and_by_momentum
...
Different settle transition depending on momentum
2019-11-11 10:48:57 -08:00
milad
c7b8d97639
updated api to try and communicate over EB, but still not working
2019-11-11 09:56:46 -08:00
Ken Cooke
ddd11305de
Improved HRTF algorithm to expose parametric occlusion/lowpass effect
2019-11-09 09:57:16 -08:00
Ken Cooke
63eb905712
Redefine audio zone attenuation coefficient of 1.0 to mean "silent at any distance"
...
instead of extreme rate of falloff with distance.
2019-11-09 09:32:00 -08:00
Sabrina Shanman
66d00c745e
Merge pull request #16478 from sabrina-shanman/instancing_raypick
...
(DEV-563) Use HFM::Shapes when initializing raypick geometry
2019-11-08 16:29:15 -08:00
Anthony J. Thibault
52acfc9333
Speculative fix for infinite loop in SafeLanding
...
This PR containts two fixes.
1) Tightening up the locks in the SafeLanding class to prevent race conditions.
By inspection there are cases where variables are read and modified outside of locks.
2) A check to help prevent an infinite loop in the _sequenceNumber std::distance calculation.
This is the main issue, in some cases backtrace is reporting the main thread as deadlocked.
The stacktrace points to an issue with the std::distance() calculation.
If the EntityQueryInitialResultsComplete is delayed signficantly, there could be a rare
case where the _sequenceNumber map grows large enough for the wraparound less then operator
will no longer function correctly. This will cause the std::distance calculation to never complete.
I've added a guard to prevent this from happening and some logs to help diagnose this issue in the future.
2019-11-08 14:22:04 -08:00
sabrina-shanman
b7da5d0d72
Update Model::calculateTriangleSets to use hfm::Shapes
2019-11-08 13:56:49 -08:00
dooglifeSF
055d5cdf9b
Simplify boolean statements, revise several settle anims
2019-11-08 13:46:38 -08:00
Rebecca Stankus
4af1ddf48b
Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into MiladNazeri-screenshareElectronApp
2019-11-08 12:20:15 -08:00
milad
b206c102e8
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-08 12:19:06 -08:00
dooglifeSF
02045a9fdf
add random versions of full sized settle
2019-11-08 11:57:06 -08:00
Shannon Romano
2a30f0fcba
Merge pull request #16472 from Nex-Pro/patch-1
...
Update WindowScriptingInterface.h
2019-11-08 11:44:09 -08:00
Sam Gateau
8175b9486f
Fix crash when highlighting custom pipeline shapes
2019-11-08 11:18:02 -08:00
Brad Hefta-Gaub
757d77ac5d
Merge pull request #16473 from thoys/fix/quest/handControllersFix
...
Oculus Quest: Fix for the hand controllers in the latest version
2019-11-08 11:00:23 -08:00
Shannon Romano
895619c71f
Merge pull request #16461 from ctrlaltdavid/DEV-2649
...
DEV-2649: Fix entities list "filter to frustum" eye button
2019-11-08 10:28:24 -08:00
Shannon Romano
79df071c23
Merge pull request #16468 from RebeccaStankus/webEntities
...
Made web entities not grabbable by default
2019-11-08 10:27:44 -08:00
Sabrina Shanman
eebb9ad51f
Merge pull request #16475 from highfidelity/master
...
Merge master into instancing
2019-11-08 10:10:50 -08:00
Sabrina Shanman
59861ea5b9
Merge pull request #16474 from sabrina-shanman/instancing_collision
...
Fix unused variables/implicit type conversions
2019-11-08 10:05:43 -08:00
sabrina-shanman
a42e09aef8
Fix unused variables/implicit type conversions
2019-11-08 10:04:34 -08:00
Thijs Wenker
1013497bcb
Fixes the hand controllers in the latest Oculus Quest version
2019-11-08 16:38:07 +01:00
Nex-Pro
fea65133b4
Update WindowScriptingInterface.h
...
replace "model" with "modal"
2019-11-08 12:51:00 +00:00
Sabrina Shanman
04f38a01f1
Merge pull request #16460 from sabrina-shanman/instancing_collision
...
(DEV-564) computeShapeInfo fixes, Extent calculation optimization
2019-11-07 17:23:16 -08:00
milad
bc03e519bc
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-07 16:35:40 -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
Sabrina Shanman
9180a639df
Merge pull request #16440 from ctrlaltdavid/DEV-2648
...
DEV-2648: Fix Cmd-click multi-select in entity list on Mac
2019-11-07 14:06:39 -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
Sabrina Shanman
deceb16a9b
Merge pull request #16451 from ctrlaltdavid/DEV-2650
...
DEV-2650: Remove "user" icon from Entities List
2019-11-07 13:59:28 -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
milad
dd1795e9b6
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-07 09:33:47 -08:00
Shannon Romano
4484ef095c
Merge pull request #16464 from DouglasWilcox/seated_fidgets_less_fidgety
...
Reduce fidgety motions in seated fidgets
2019-11-07 09:09:05 -08:00
milad
4b06e429d2
Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp
2019-11-06 17:43:38 -08:00
Zach Fox
c8464786e7
Steps closer...
2019-11-06 17:16:21 -08:00
milad
fa8d5e57d1
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-06 15:48:24 -08:00
