Commit graph

30614 commits

Author SHA1 Message Date
Brad Hefta-Gaub
2d56d7c026
Merge pull request #16551 from ctrlaltdavid/DEV-1943
DEV-1943: Make MyAvatar.getAvatarEntityData() return all properties
2019-12-13 10:53:24 -08:00
Brad Hefta-Gaub
80572e7d02
Merge pull request #16570 from ctrlaltdavid/DOC-241
DOC-241: ContextOverlay JSDoc
2019-12-13 10:49:14 -08:00
Brad Hefta-Gaub
3eb533538d
Merge pull request #16573 from ctrlaltdavid/DOC-244
DOC-244: OverlayWindow and OverlayWebWindow JSDoc
2019-12-13 10:43:31 -08:00
Brad Hefta-Gaub
42b69332f7
Merge pull request #16564 from ctrlaltdavid/DOC-239
DOC-239: Rates JSDoc
2019-12-13 10:36:39 -08:00
David Rowe
57016ded11 Fix up some corresponding InteractiveWindow JSDoc 2019-12-13 10:13:22 +13:00
David Rowe
92349706a9 Update WalletScriptingInteface JSDoc with links to ContextOverlay 2019-12-11 15:05:34 +13:00
David Rowe
febbd3a802 ContextOverlay JSDoc 2019-12-11 15:05:20 +13:00
David Rowe
4c1f7466d4 Typo 2019-12-11 09:31:29 +13:00
Seth Alves
f97c3217a5 allow Linux interface to connect to domain when DISABLE_QML is true 2019-12-10 09:52:12 -08:00
David Rowe
73ad5d1d31 Fix some JSDoc typos noticed in passing 2019-12-10 13:34:32 +13:00
David Rowe
6750d02228 Rates JSDoc 2019-12-10 13:33:40 +13:00
jennaingersoll
6f44373141
Merge pull request #16556 from ctrlaltdavid/DOC-235
DOC-235: DriveKeys JSDoc
2019-12-09 15:58:31 -08:00
jennaingersoll
af120b9511
Merge pull request #16560 from ctrlaltdavid/DOC-237
DOC-237: DialogsManager JSDoc
2019-12-09 15:52:29 -08:00
jennaingersoll
369cacd068
Merge pull request #16558 from ctrlaltdavid/DOC-236
DOC-236: Account and GlobalServices JSDoc
2019-12-09 15:51:17 -08:00
David Rowe
31bae651c6 DialogsManager JSDoc 2019-12-08 15:51:08 +13:00
David Rowe
fbc62df5d8 Account and GlobalServices JSDoc 2019-12-07 19:37:43 +13:00
Zach Fox
2b7d66c710 Slight optimization; comments 2019-12-06 10:32:45 -08:00
David Rowe
afdbbb95b1 DriveKey type and update MyAvatar JSDoc 2019-12-06 21:27:34 +13:00
David Rowe
3eadec3eaa DriveKeys JSDoc 2019-12-06 21:26:59 +13:00
Zach Fox
04fe2988f5 Working 2019-12-05 18:50:31 -08:00
Zach Fox
c96c684400 Initial path to fixing screenshare auth race condition 2019-12-05 15:47:43 -08:00
Shannon Romano
f01a39adf5
Merge pull request #16553 from MiladNazeri/macScreenshareFix
Dev-2812: Broadcasting from MacOs won't work
2019-12-04 16:42:50 -08:00
milad
63e6875e27 added flag for windows and apple only on dependency 2019-12-04 11:28:32 -08:00
milad
f71cf1fb74 fixed type 2019-12-04 10:06:57 -08:00
milad
83285aa414 fixed mac resource path location 2019-12-04 09:56:54 -08:00
milad
f350701eac fixed resouce path and removed unused include 2019-12-04 08:44:56 -08:00
milad
8b45710aea Got the F out of there 2019-12-03 14:36:13 -08:00
milad
fee4c826cc Merging Dantes fix 2019-12-03 14:19:33 -08:00
dante ruiz
aeab06de53 fixing screenshare cmake issue for mac 2019-12-03 14:03:52 -08:00
miladi
60d074932c experimenting with mac .app cmake build 2019-12-03 11:01:06 -08:00
jennaingersoll
cc0c829ff7
Merge pull request #16539 from ctrlaltdavid/DOC-227
DOC-227: Stats JSDoc
2019-12-02 12:19:42 -08:00
milad
2da99625fa trying to add to resources 2019-12-02 11:43:25 -08:00
David Rowe
91581ef3c5 Update JSDoc 2019-12-01 21:59:47 +13:00
David Rowe
200ff2499e Include localVelocity etc. to match Entity.getEntityProperties() 2019-12-01 21:24:40 +13:00
David Rowe
c7f82a8264 Add new MyAvatar.getAvatarEntityData() implementation for API 2019-11-28 17:10:19 +13:00
David Rowe
9144e78cb9 Rename current getAvatarEntityData() method and use internally 2019-11-28 16:30:26 +13:00
David Rowe
3ebceff428 Doc review 2019-11-28 12:42:35 +13: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
Zach
7b49542a4d Fix screenshare on MacOS DEBUG builds; fix z-fighting on smartboard in screenshare mode 2019-11-26 14:16:09 -05:00
David Rowe
46c389f064 Tidying 2019-11-26 15:19:54 +13:00
David Rowe
d797e33123 Stats JSDoc 2019-11-26 13:39:00 +13:00
milad
8b6df032e4 forgot a slash 2019-11-25 14:40:38 -08:00
milad
a38e0007f8 trying to go back several directories for the mac build 2019-11-25 13:32:48 -08:00
Zach Fox
5787b2f737 Merge branch 'master' of github.com:highfidelity/hifi into moreScreenshareBugs 2019-11-25 13:16:17 -05: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
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
Anthony J. Thibault
98c951702d Added DEFAULT_GAZE_DISTANCE constant 2019-11-22 09:29:21 -08:00
Anthony J. Thibault
404d1a3c93 Fix several bugs for eye tracking from input plugins to function 2019-11-21 17:57:44 -08:00
Zach
e7091245b3 Fix screenshare on MacOS DEBUG builds; fix z-fighting on smartboard in screenshare mode 2019-11-21 15:38:28 -08:00