Commit graph

81695 commits

Author SHA1 Message Date
milad
90b58ebeba icon for screenshare app 2019-11-14 09:13:31 -08:00
Zach Fox
b4135e2655 We are so close... 2019-11-13 17:35:57 -08:00
Zach Fox
8255210c6a Add new screenshare error signals 2019-11-13 15:43:41 -08:00
Zach Fox
50a1ebaa4d Call stopScreenshare when screenshare app closed 2019-11-13 14:24:01 -08:00
milad
9ebe7067c5 fixed the ordering of selects 2019-11-13 13:08:34 -08:00
milad
c6c9059a29 Merge branch 'screenshareElectronApp' of github.com:MiladNazeri/hifi into screenshareElectronApp 2019-11-13 13:06:12 -08:00
Zach Fox
61f0896e30 Fix small bugs with the HTTP request to screenshare endpoint 2019-11-13 12:35:01 -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
Brad Hefta-Gaub
0dd764cd29
Merge pull request #16487 from amerhifi/resetAudio
case DEV-2709: reset QAudioDevInfo on switch
2019-11-13 09:48:33 -08:00
amerhifi
3939c7e6fd adding qaudio reset on switch. 2019-11-12 17:07:43 -08:00
Zach Fox
b0c578aa7f Improved HTTP request to proper endpoint - won't work until PR16459 is merged 2019-11-12 17:06:35 -08:00
amerhifi
d7fbd1e2d4 Merge branch 'master' of https://github.com/highfidelity/hifi 2019-11-12 16:57:47 -08:00
milad
ea8e285793 Zach's ss cpp cleanup changes 2019-11-12 16:02:52 -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
milad
239ca45754 cleaned up logs and old code 2019-11-12 15:10:47 -08:00
milad
4962e26664 update ss css 2019-11-12 14:40:23 -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
Shannon Romano
d0dceb15c2
Merge pull request #16481 from amerhifi/master
case dev-2663: Adding safeguard in case device list is empty
2019-11-12 13:28:53 -08:00
milad
49f972714c more cleanup 2019-11-12 13:12:10 -08:00
milad
5b9b30bf35 updated platform specific dimensions 2019-11-12 12:59:52 -08:00
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
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
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
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
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
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