Commit graph

79173 commits

Author SHA1 Message Date
sabrina-shanman
971d563f49 Add debug icons for transitions 2019-06-06 13:25:06 -07:00
sabrina-shanman
faf5db5476 Change semantic for removing transitions 2019-06-06 13:25:06 -07:00
sabrina-shanman
833946ceb3 Clean up transition naming 2019-06-06 13:25:06 -07:00
sabrina-shanman
5587193640 Add more transition icon debugging 2019-06-06 13:25:00 -07:00
Sam Gateau
56efba1873 Merge branch 'nut' of github.com:samcake/hifi into nut 2019-06-06 12:30:11 -07:00
Sam Gateau
ae4edebcbc Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-06-06 12:29:33 -07:00
Sam Gateau
55ff39edaf Fixing an unecessary logging that was added during debug 2019-06-06 12:29:22 -07:00
Zach Fox
fa2217c188 DEV-113: Remove headphones icon from status indicator in top bar 2019-06-06 12:20:43 -07:00
dante ruiz
f7333e90d8 fixing bugs 2019-06-06 11:58:39 -07:00
Simon Walton
a5c2ce472e unsourced additions from Howard 2019-06-06 11:08:16 -07:00
Roxanne Skelly
a55c723842 remove spammy logging 2019-06-06 11:03:50 -07:00
Shannon Romano
9835f16821
Merge pull request #15681 from jherico/light-launcher
DEV-77: Enable mac launcher builds
2019-06-06 10:46:54 -07:00
Bradley Austin Davis
a96d57e8d2
Update launchers/darwin/CMakeLists.txt 2019-06-06 09:23:14 -07:00
Preston Bezos
2592784814 Changed InputDeviceButton to unmute on push and hold while in push to talk mode 2019-06-06 09:19:32 -07:00
Sam Gateau
49c006e5af Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-06-05 20:15:27 -07:00
Simon Walton
ecbce8201b Dissectors: Limit message number & position values 2019-06-05 18:17:24 -07:00
Sam Gateau
afdc323622 Merge branch 'nut' of github.com:samcake/hifi into nut 2019-06-05 17:56:34 -07:00
Sam Gateau
9bc6c3bfcd INtroduce range check for int value against the several enums we exposed through the js api for REnder and PErformance settings 2019-06-05 17:56:14 -07:00
jennaingersoll
677b54e240
Merge pull request #15684 from ctrlaltdavid/DOC-78
DOC-78: Polish Vec3 JSDoc
2019-06-05 16:26:32 -07:00
David Rowe
caf29dc45a Doc review 2019-06-06 11:24:10 +12:00
Bradley Austin Davis
8e1f4b5227 Testing build 2019-06-05 16:18:03 -07:00
Roxanne Skelly
b8d6c57483
Merge pull request #15677 from roxanneskelly/bugz516
Log socket error string when socket error happens
2019-06-05 15:50:15 -07:00
David Rowe
42cb3d9828 Polish Vec3 API JSDoc 2019-06-06 10:26:43 +12:00
Bradley Austin Davis
0876a781f0 Fix secret defines 2019-06-05 15:22:44 -07:00
Shannon Romano
7e572cbfbc
Merge pull request #15682 from zfox23/NUI/systemSoundsLabel
BUGZ-530: Rename 'System Sounds' to 'UI FX'
2019-06-05 15:16:42 -07:00
Brad Davis
0bc0c73ef2 Enable mac launcher builds 2019-06-05 15:16:01 -07:00
Shannon Romano
f3c17e1598
Merge pull request #15683 from danteruiz/mac-launcher
Remove mac warnings from HQ Launcher.
2019-06-05 15:12:54 -07:00
dante ruiz
f852364b3d enable logs 2019-06-05 14:26:35 -07:00
dante ruiz
581c5fe554 removing warnings 2019-06-05 14:23:47 -07:00
Shannon Romano
a3d3190813
Merge pull request #15678 from ctrlaltdavid/DOC-75
DOC-75: Polish Users JSDoc
2019-06-05 14:20:19 -07:00
Roxanne Skelly
2f2e967a92 log windows socket error code on socket error 2019-06-05 14:08:26 -07:00
Zach Fox
326d1615e0 Change old UI too 2019-06-05 14:07:10 -07:00
Zach Fox
0ba849d65b BUGZ-530: Rename 'System Sounds' to 'UI FX' 2019-06-05 13:25:28 -07:00
David Rowe
eac7d298dc Change "privacy bubble" to "privacy shield" 2019-06-06 08:21:22 +12:00
Bradley Austin Davis
b5dd099093
Merge pull request #15665 from jherico/light-launcher
DEV-77: Add light launcher source to hifi repository
2019-06-05 12:50:01 -07:00
Roxanne Skelly
04f879be3e Add additional logging on socket send error 2019-06-05 12:41:08 -07:00
Brad Davis
3cb5b7716e Light Launchers 2019-06-05 11:18:16 -07:00
Roxanne Skelly
9fb43b4930 Merge branch 'master' of https://github.com/highfidelity/hifi into bugz516 2019-06-05 11:08:26 -07:00
Roxanne Skelly
06ed751f56 checkpoint to deal with merge 2019-06-05 11:08:12 -07:00
Sam Gateau
c19b265075 Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-06-05 10:37:36 -07:00
jennaingersoll
dc16b678d8
Merge pull request #15679 from ctrlaltdavid/DOC-76
DOC-76: Polish Uuid JSDoc
2019-06-05 10:17:32 -07:00
Anthony Thibault
e968a7ab00
Merge pull request #15680 from kencooke/audio-bluetooth-fixes
BUGZ-471: Support AirPods on MacOS
2019-06-05 10:15:14 -07:00
Ken Cooke
a132dad486 On platforms where nativeFormatForAudioDevice() is reliable, do not enumerate formats 2019-06-05 07:03:18 -07:00
Sam Gateau
34bae25d0e fixing the broken binding dependency for the propitems 2019-06-05 00:33:44 -07:00
David Rowe
42c0362303 Fix link 2019-06-05 15:14:05 +12:00
David Rowe
ef56cba71b Polish Uuid API JSDoc 2019-06-05 14:39:27 +12:00
David Rowe
6299d38673 Distinguish between Uuid API and Uuid type in JSDoc 2019-06-05 14:39:05 +12:00
Sam Gateau
ba30892c0e Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-06-04 18:38:25 -07:00
Shannon Romano
c48ecb5f67
Merge pull request #15674 from sethalves/quiet-some-warnings
Quiet some warnings
2019-06-04 17:00:54 -07:00
David Rowe
0bdca38644 Polish Users JSDoc 2019-06-05 11:46:14 +12:00