Commit graph

82271 commits

Author SHA1 Message Date
Simon Walton
35fe7fe00c Build from updated base docker image; copy over supervisor hifi.conf 2019-11-27 12:25:18 -08:00
Zach Fox
d0a3aeb7cf
Merge pull request #16549 from zfox23/autoMinimizeScreenshare
DEV-2832, DEV-2816, DEV-2843: Auto-minimize Screen Share; enable switching between windows; prevent video dropout
2019-11-27 14:02:34 -05:00
Zach Fox
327508aa0d Prevent video dropout with audioFallbackEnabled set to false 2019-11-27 13:56:55 -05:00
Zach Fox
5eae6711e6 Resolve DEV-2816 while I'm at it - allow users to switch between screens 2019-11-27 13:01:41 -05:00
Zach Fox
d4b50523c2 DEV-2832: Automatically minimize Screen Share app when sharing window is confirmed 2019-11-27 12:55:44 -05:00
HifiExperiments
413bf10f79 stupid, shadows still broken 2019-11-26 22:28:06 -08:00
HifiExperiments
3dfd63d46b merge with master 2019-11-26 20:42:44 -08:00
Zach Fox
37efdfd3d4
Merge pull request #16547 from zfox23/smartboard_v1.4
DEV-2840: Fix z-fighting issues in Smartboard and enable quicker positional iteration in the future
2019-11-26 19:33:21 -05:00
Simon Walton
e3ae92ec84 Send notification whenever screen-share zone changes 2019-11-26 16:06:25 -08:00
Anthony Thibault
84c1fe2f39
Merge pull request #16545 from luiscuenca/addAutomaticLookToScripts
Add automaticLookAt.js to developer scripts
2019-11-26 15:30:56 -08:00
amer cerkic
168e85b26a addressing comment 2019-11-26 15:27:40 -08:00
Zach Fox
8be866ebbb DEV-2840: Fix z-fighting issues in Smartboard and enable quicker positional iteration in the future 2019-11-26 18:10:21 -05:00
Shannon Romano
7a0ef65278
Merge pull request #16544 from howard-stearns/ignore-anonymous-screenshare-zone-entry
ignore anonymous screenshare zone entry
GHA built so we're good on this.
2019-11-26 14:55:33 -08:00
HifiExperiments
69714a89ca material entities support cullFaceMode and support gltf doubleSided 2019-11-26 14:48:48 -08:00
Simon Walton
65fcf898be Use null zone id for leaving a screen zone 2019-11-26 13:40:37 -08:00
Simon Walton
8b2fc968f6 Fix logic in zone-checking code, other clean-up 2019-11-26 13:32:50 -08:00
luiscuenca
f17caf48ca
Add automaticLookAt.js to the developer scripts 2019-11-26 13:42:01 -07:00
Zach Fox
52205d27d3
Merge pull request #16534 from zfox23/moreScreenshareBugs
Fix a few Screenshare bugs (see description)
2019-11-26 15:38:12 -05:00
Shannon Romano
07da496fa7
Merge pull request #16532 from hyperlogic/feature/animedit
Added animedit avatar-animation.json graph editor tool
2019-11-26 12:20:15 -08:00
Howard Stearns
323007eb2c ignore anonymous screenshare zone entry 2019-11-26 12:11:38 -08:00
amer cerkic
0de812b7b5 waiting on local injector prep 2019-11-26 11:41:41 -08:00
Zach
7b49542a4d Fix screenshare on MacOS DEBUG builds; fix z-fighting on smartboard in screenshare mode 2019-11-26 14:16:09 -05:00
Anthony J. Thibault
764b6a9adf code review feedback 2019-11-26 10:52:21 -08:00
miladi
90605b5338 Merge branch 'master' of github.com:highfidelity/hifi into moreScreenshareBugs 2019-11-26 10:43:21 -08:00
David Rowe
c998148589 Revise recent changes to Entities.Material JSDoc 2019-11-26 17:43:41 +13:00
David Rowe
fafb3dd30b MaterialCache JSDoc 2019-11-26 17:43:23 +13:00
David Rowe
5eb6e9dadd Add recently added properties to caches' JSDoc 2019-11-26 17:00:13 +13:00
Simon Walton
6b371ec388 Changes to avatar mixer to use screenshare zones 2019-11-25 18:30:53 -08:00
David Rowe
46c389f064 Tidying 2019-11-26 15:19:54 +13:00
Anthony Thibault
0a12dc7446
Merge pull request #16531 from luiscuenca/fixWheelPitch
DEV-2825: Fix camera pitch by mouse wheel
2019-11-25 17:03:05 -08:00
David Rowe
d797e33123 Stats JSDoc 2019-11-26 13:39:00 +13:00
Zach Fox
18f410c6db
Merge pull request #16537 from danteruiz/document-qt-launcher
DEV-491: Create a README.md file to document the Qt Launcher
2019-11-25 18:28:12 -05:00
danteruiz
60140a3aca fix more typos 2019-11-25 15:26:57 -08:00
danteruiz
e0c5edfccd fix typos 2019-11-25 14:58:40 -08:00
danteruiz
c08a18c517 making requested changes 2019-11-25 14:52:53 -08:00
milad
8b6df032e4 forgot a slash 2019-11-25 14:40:38 -08:00
HifiExperiments
b4c9a3e73d Merge remote-tracking branch 'origin/alphaModes' into cullFace 2019-11-25 14:23:50 -08:00
luiscuenca
d301378210
Merge branch 'master' into fixWheelPitch 2019-11-25 14:48:13 -07:00
milad
a38e0007f8 trying to go back several directories for the mac build 2019-11-25 13:32:48 -08:00
Dante Ruiz
d8ba0564b5 Adding QT Launcher Documention 2019-11-25 13:24:51 -08:00
Simon Walton
6e23924ed9 Add screenshare zone-property - WIP 2019-11-25 13:22:35 -08:00
Bradley Austin Davis
30b7d70189
Merge pull request #16536 from jherico/ga/update_deps
Update prebuilt dependencies
2019-11-25 13:02:55 -08:00
Brad Davis
0240a6e3d9 Update prebuilt dependencies 2019-11-25 11:42:09 -08:00
Zach Fox
5787b2f737 Merge branch 'master' of github.com:highfidelity/hifi into moreScreenshareBugs 2019-11-25 13:16:17 -05:00
luiscuenca
69a063a700 Better mouse wheel detection and attenuated touchpad X axis 2019-11-25 10:19:54 -07:00
Shannon Romano
85cea1fcb6
Merge pull request #16533 from ctrlaltdavid/DEV-2800
DEV-2800: Fix crash in Stats.forceUpdateStats() at start-up
2019-11-25 09:04:30 -08:00
HifiExperiments
f55c4b8b12 put back stepping in translucent case 2019-11-24 12:44:42 -08:00
Anthony Thibault
edfad97b64
Merge pull request #16517 from hyperlogic/feature/facecap-osc-plugin
Input plugin for streaming blendshapes from an iPhone
2019-11-23 11:49:51 -08:00
David Rowe
b458a746b7 Fix crash in Stats.forceUpdateStats() at start-up 2019-11-23 15:23:57 +13:00
Simon Walton
30f3525932
Merge branch 'master' into linux-actions-builds 2019-11-22 18:02:48 -08:00