Commit graph

4313 commits

Author SHA1 Message Date
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
Ken Cooke
2a7e8c6f89 Default audio meter overlay to "on" 2018-05-03 07:15:18 -07:00
MiladNazeri
8e214d8ee8
Merge pull request #13049 from ctrlaltdavid/21856-d
List which contexts each namespace and class is available in
2018-05-03 01:29:14 -07:00
Stephen Birarda
f5441c05b3 Merge branch 'master' of github.com:highfidelity/hifi into 67-to-master 2018-05-01 14:18:24 -07:00
Stephen Birarda
cad63ad107 Revert "Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently""
This reverts commit acb21cc96a.
2018-05-01 14:15:12 -07:00
Stephen Birarda
24dc1c930e Merge branch 'RC66.2' of github.com:highfidelity/hifi into 66-2-to-67 2018-05-01 10:54:35 -07:00
David Rowe
2cc3ed6287 List which contexts each namespace and object is available in 2018-04-28 20:00:28 +12:00
John Conklin II
dd32ca33a5
Merge pull request #12957 from sethalves/quiet-logging
Quiet logging
2018-04-27 14:59:38 -07:00
Bradley Austin Davis
acb21cc96a Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently" 2018-04-27 10:50:47 -07:00
Stephen Birarda
d87adcec92 make home go to DEFAULT_HIFI_ADDRESS by default 2018-04-26 17:47:12 -07:00
David Rowe
08dc9b133f Docs to JSDoc review 2018-04-26 21:10:28 +12:00
MiladNazeri
0f87e53902
Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate
Docs/docs to js docs update
2018-04-25 12:26:19 -07:00
samcake
f2c76abafa Apply the noAA /popJittering on the WebOverlay 2018-04-24 14:18:44 -07:00
milad nazeri
23d07fa292 fixed spacing issue 2018-04-24 13:14:55 -07:00
milad nazeri
1121fe8da0 fix tabs 2018-04-23 21:47:53 -07:00
Brad Davis
861200db27 Attempt to shutdown web surfaces more consistently 2018-04-23 14:32:38 -07:00
milad nazeri
4ac06fe99f Updating previous jsdocs 2018-04-22 22:22:33 -07:00
milad nazeri
e9b9c05b5d removed cruft 2018-04-22 08:51:47 -07:00
Seth Alves
bec39369f7 remove some uncatagorized logging, suppress some categories by default 2018-04-20 16:08:57 -07:00
Andrew Meadows
a80cf49eb3 split 'ETRupdate' out of 'postPhysics' stat context 2018-04-16 13:31:36 -07:00
Andrew Meadows
ace32193b4 more correct stat names 2018-04-16 13:31:36 -07:00
John Conklin II
fc487ea322
Merge pull request #12831 from ctrlaltdavid/21829
Model overlay fixes
2018-04-12 17:04:55 -07:00
John Conklin II
854d3d7804
Merge pull request #12765 from ctrlaltdavid/21822
Fix text sizing per text3d overlay lineHeight property
2018-04-11 12:16:51 -07:00
David Rowe
f3a745b6cb Fix initialization order 2018-04-07 18:53:27 +12:00
David Rowe
8093e3e5ae Fix some miscellaneous JSDoc typos 2018-04-07 16:48:05 +12:00
David Rowe
96178404c7 Document that jointTranslations and jointRotations are not cloned 2018-04-07 16:47:38 +12:00
David Rowe
ba020854b6 Add missing "animationSettings.currentFrame" property JSDoc 2018-04-07 16:46:44 +12:00
David Rowe
38d7b81a4f Add missing "get" and JSDoc for "loadPriority" property 2018-04-07 16:46:02 +12:00
David Rowe
6d9b69cd2e Fix cloning a model overlay not cloning animation settings 2018-04-07 16:44:58 +12:00
Stephen Birarda
1d76dea9f6
Merge pull request #12818 from highfidelity/RC66
Merge back RC66 to master
2018-04-06 10:43:01 -07:00
Seth Alves
8de545acdf add new address accessor for 'public' addresses, use it for snapshot and stream 2018-04-05 13:39:51 -07:00
Zach Fox
ac2721fe6a Logging improvements 2018-04-05 13:04:09 -07:00
Zach Fox
8e46ebf83b Prevent Interface from crashing when a Snapshot upload fails 2018-04-05 11:27:26 -07:00
David Rowe
ab55f20976 Fix text sizing per text3d overlay lineHeight property
Makes text size correct for multiple lines of text.
2018-04-03 16:54:07 +12:00
Zach Fox
1f3063193a Tweak right-click to inspect 2018-04-02 14:24:51 -07:00
John Conklin II
97d9c1b735
Merge pull request #12726 from jherico/fix/rc66_crashes
Attempt to resolve potential overlay crashes at shutdown
2018-03-29 09:37:23 -07:00
John Conklin II
790162c88b
Merge pull request #12689 from ctrlaltdavid/21808
Reinstate Overlays.getOverlayObject API function
2018-03-28 14:00:28 -07:00
Brad Davis
29106fbbbe Prevent potential double delete of QML overlays 2018-03-27 14:18:19 -07:00
Brad Davis
eb20181b60 Shut down the overlay interface on exit 2018-03-27 14:18:01 -07:00
Seth Alves
4033af9b11 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-21 11:11:43 -07:00
David Rowe
8df6cd58c6 Document Overlays.getOverlayObject's use for web3d event bridge 2018-03-21 15:50:22 +13:00
David Rowe
05efc5a231 Revert "Remove Overlays.getOverlayObject() from JavaScript API"
This reverts commit 8e2a3e8c99.
2018-03-21 15:36:39 +13:00
Sam Gateau
5cc0e24921
Merge pull request #12666 from jherico/fix/web_overlay_crash
Fix invalid QML surface cache interaction
2018-03-20 14:26:39 -07:00
Seth Alves
f61504b814 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-19 14:59:18 -07:00
John Conklin II
47437c9564
Merge pull request #12651 from ctrlaltdavid/21799
Fix "text" overlay not clipping to right and bottom margins
2018-03-19 14:12:20 -07:00
Brad Davis
2f59283053 Fix initialization of QML overlay surfaces 2018-03-16 14:48:08 -07:00
Seth Alves
50b9716a17 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-16 14:45:49 -04:00
Brad Davis
1dfde86680 Fix typo 2018-03-16 11:11:08 -07:00
Brad Davis
ca38b9fe34 Fix invalid QML surface cache interaction 2018-03-16 10:53:59 -07:00
Brad Hefta-Gaub
634e642db3
Merge pull request #12634 from sethalves/overlay-visible-in-2nd-cam
Overlays visible in 2nd cam
2018-03-16 10:07:26 -07:00