Commit graph

81667 commits

Author SHA1 Message Date
milad
05f5863f85 Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp 2019-11-12 11:37:10 -08:00
milad
0f605ffc43 clean up code 2019-11-12 11:37:07 -08:00
RebeccaStankus
5be08ff638
Merge pull request #5 from RebeccaStankus/MiladNazeri-screenshareElectronApp
Milad nazeri screenshare electron app
2019-11-12 11:36:22 -08:00
Rebecca Stankus
568e96b6c5 Fixed merge conflict 2019-11-12 11:22:46 -08:00
milad
7cce153b6d working flow. Needs clean up and final ui tweaks 2019-11-11 20:13:23 -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
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
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
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
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
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
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
Zach Fox
a41ae3daa9 Move the local web entity logic to c++ - might not be working 2019-11-06 15:45:48 -08:00
Shannon Romano
10a1ee24e8
Merge pull request #16462 from zfox23/removeHomeIcon
DEV-2701: Remove the home icon from the profile app
2019-11-06 15:34:18 -08:00
Zach Fox
40814f9086 Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp 2019-11-06 14:46:14 -08:00
milad
894b4127b4 modifying screenshare API for viewer 2019-11-06 14:35:20 -08:00
Rebecca Stankus
4173cc46e2 Made web entities not grabbable by default 2019-11-06 14:11:17 -08:00
Zach Fox
d29fdbd9f2
Merge pull request #16463 from zfox23/newHazeMinMax
DEV-2695: Update Zone Haze floor and ceiling mins and maxes in the UI
2019-11-06 13:33:35 -08:00
Shannon Romano
06a4267963
Merge pull request #16456 from hyperlogic/bug-fix/avatar-recording-bug
Fix for avatar recordings not playing back blendshapes
2019-11-06 13:33:22 -08:00
dooglifeSF
15b935b491 remove jitter and bounce from several seated idles and fidgets, also reduce look-around cone 2019-11-06 13:08:42 -08:00
Anthony Thibault
8f0ca7b6db
Merge pull request #16447 from luiscuenca/hideNeckSecondPass
DEV-2461: Head woes in 1st person part 2
2019-11-06 12:11:59 -08:00
Clément Brisset
96f53dbbf3
Merge pull request #16448 from matt-hifi/deep-codesign
"deep" codesign Interface on macOS
2019-11-06 12:08:29 -08:00
Zach Fox
a2f784d225 DEV-2695: Update Zone Haze floor and ceiling mins and maxes in the UI 2019-11-06 11:26:10 -08:00
Zach Fox
ca8a61f085 DEV-2701: Remove the home icon from the profile app 2019-11-06 11:11:57 -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