Commit graph

22977 commits

Author SHA1 Message Date
Zach Fox
ed5082e5d4
Merge pull request #11974 from birarda/feat/staging-env-or-cl
allow custom metaverse URL to be used with env var
2017-12-13 17:29:45 -08:00
Zach Fox
f0507e1608
Merge pull request #11972 from zfox23/commerce_fixWalletStatus1
Set Wallet Status to 'Ready' after correctly authenticating wallet
2017-12-13 13:19:54 -08:00
Zach Fox
efd5c0ccb7 Add comment as per CR 2017-12-13 11:53:26 -08:00
Sam Gateau
4e68663cfc
Merge pull request #11970 from SamGondelman/circleFix
Fix Circle3DOverlays uninitialized member variables, cloning, getProperty
2017-12-14 00:30:18 +07:00
Seth Alves
d3e24d3629
Merge pull request #11960 from ElderOrb/FB10334
10334 Unable to type in Go To app search bar after UI reappears from …
2017-12-13 09:06:53 -08:00
MiladNazeri
8a28d04322
Merge pull request #11885 from ctrlaltdavid/21624
Overlays JSDoc
2017-12-12 17:04:46 -08:00
Seth Alves
4956978c76
Merge pull request #11973 from luiscuenca/webPrivacyFix
Fix web entities accessing the webcam
2017-12-12 17:01:38 -08:00
Stephen Birarda
139976d8bb allow staging METAVERSE_SERVER_URL to be toggled by env 2017-12-12 16:22:08 -08:00
luiscuenca
2d21f4d364 Fix web entities accessing the webcam 2017-12-12 16:00:17 -07:00
David Rowe
92be33da31 Web3d overlay's "resolution" property has been removed 2017-12-13 11:40:44 +13:00
David Rowe
650e7e1922 Document that getProperty() only works for 3D overlays 2017-12-13 10:34:33 +13:00
SamGondelman
16f545a9e8 fix circle3d overlays 2017-12-12 13:25:47 -08:00
Zach Fox
623e6395be Set Wallet Status to 'Ready' after correctly authenticating wallet 2017-12-12 13:01:14 -08:00
David Rowe
578c42b4ea Merge branch 'master' into 21624 2017-12-13 09:41:09 +13:00
MiladNazeri
16e16501cd
Merge pull request #11791 from ctrlaltdavid/21602
JSDoc updates
2017-12-12 12:18:02 -08:00
Howard Stearns
8e36228c12
Merge pull request #11948 from MandatoryMania/noFundsSymbol
Provides a nice alert in case of insufficient funds to make a purchase
2017-12-11 11:45:27 -08:00
Sam Gateau
0ff91e5926
Merge pull request #11952 from samcake/light
Exposing multi highlight and selection feature to js api
2017-12-12 01:09:15 +07:00
Zach Fox
006ea3342c
Merge pull request #11959 from zfox23/commerce_removeBuyEndpoint
Remove useless Wallet.buy() scripting endpoint
2017-12-11 09:33:18 -08:00
Sam Gateau
d1cd9f5c6b adding correct support for the meta item fetch subItems for Overlays and specifically for ModelOverlay which fixes the highlight on Overlays 2017-12-11 02:21:09 -08:00
Sam Gateau
cc4b266647 Add names to objects of the selection, remove comments in shader and fix one more warning on linux 2017-12-11 00:31:54 -08:00
Sam Gateau
bb888f2d4c Replace the name opacity for alpha 2017-12-10 23:07:06 -08:00
Sam Gateau
eec4e966a7 Fix the linux build and correct the name of the property Intensity to Opacity 2017-12-10 10:13:49 -08:00
Sam Gateau
429d54d65d Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-10 09:53:22 -08:00
Alexander Ivash
cb471582e5 10334 Unable to type in Go To app search bar after UI reappears from moving Avatar 2017-12-10 01:34:03 +03:00
Zach Fox
8485503063
Merge pull request #11958 from humbletim/fix-pal-connections
Fix for Connections UI lockup
2017-12-08 18:34:25 -08:00
Zach Fox
6f5028080b Remove useless Wallet.buy() scripting endpoint 2017-12-08 18:23:23 -08:00
Clément Brisset
18b9118518
Merge pull request #11935 from birarda/bug/atp-drop-actual-files-only
only attempt default asset upload for local files
2017-12-08 17:18:49 -08:00
humbletim
abba85ac54 add missing colonsemi 2017-12-08 18:14:30 -05:00
Stephen Birarda
3265eb42f1 only attempt default asset upload for local files 2017-12-08 14:45:27 -08:00
humbletim
34243f4239 disable connections console.log to prevent UI lag 2017-12-08 17:10:57 -05:00
Sam Gondelman
352c11d7c4
Merge pull request #11358 from vladest/fix_google_vr_height
Momentum aka flickable for WebView
2017-12-08 10:46:52 -08:00
samcake
9a4f667059 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-08 08:50:33 -08:00
Seth Alves
a7a6dee8e0
Merge pull request #11950 from hyperlogic/bug-fix/hand-scaling
Fix for hand controller avatar scaling.
2017-12-08 07:17:59 -08:00
Seth Alves
91b2d8df8a
Merge pull request #11874 from luiscuenca/audioscope
Improve Audio Scope
2017-12-08 07:15:28 -08:00
Seth Alves
eda63e5758
Merge pull request #11919 from ElderOrb/FB9706
9706 Editing Attachments Results In Attachments Window Scrolling To Top
2017-12-08 07:01:00 -08:00
Sam Gateau
d07cde3ecb Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-07 19:20:25 -08:00
samcake
7a9d77fed4 return a legit selectedItemsList js object as long as the list exist, only void if the list name is unknown 2017-12-07 17:53:30 -08:00
samcake
ace8e153c2 making sure the ID of an object in the Selection list is unique and more refined debugging 2017-12-07 17:45:40 -08:00
Anthony J. Thibault
542af47e9e Fix for hand controller avatar scaling.
* Added getDomainMaxScale() and getDomainMinScale() to JS api.
* Updated scaleAvatar controller module to use this to prevent scaling past the limits.
* Made sure that getDomainMaxScale() getDomainMinScale() and getUnscaledEyeHeight are thread safe,
  so that they can be invoked on the script thread.
* Added signals to Model class that can be used to let observers know when the Rig has finished initializing it's skeleton.
  and also when the skeleton is no longer valid.  These hooks are used to cache the unscaled eye height of the avatar.
2017-12-07 17:08:13 -08:00
Andrew Meadows
ed231fa4a1
Merge pull request #11894 from hyperlogic/bug-fix/flying
Improvements to HMD flying
2017-12-07 16:31:33 -08:00
Andrew Meadows
4691a98509
Merge pull request #11865 from hyperlogic/feature/domain-limited-height
domain uses min/max avatar height instead of min/max scale
2017-12-07 16:29:15 -08:00
samcake
6148458aeb Workable state, need final clean up and testing 2017-12-07 16:04:08 -08:00
H Q
4ce784291c Provides a nice alert in case of insufficient funds to make a purchase 2017-12-07 15:13:01 -08:00
Sam Gondelman
e7d7e9abb8
Merge pull request #11947 from ctrlaltdavid/21634
Move mouse and hover slots out of Overlays API
2017-12-07 14:47:01 -08:00
Zach Fox
4b3c61178c
Merge pull request #11944 from zfox23/commerce_dontSendEmptyPublicKeys
Don't send commerce requests to backend if cached public keys is empty
2017-12-07 14:31:09 -08:00
Sam Gondelman
b05e1f8a32
Merge pull request #11847 from SamGondelman/overlayFlash
Cleanup Web3DOverlay and tablet home button
2017-12-07 14:06:56 -08:00
David Rowe
fd38b89f35 Move mouse and hover slots out of Overlays API 2017-12-08 10:58:52 +13:00
Anthony J. Thibault
47b52238d9 code review feedback 2017-12-07 10:49:23 -08:00
Anthony J. Thibault
68ad27a38d Merge branch 'master' into bug-fix/flying 2017-12-07 10:28:13 -08:00
Anthony J. Thibault
fbcecbfc89 Merge branch 'master' into feature/domain-limited-height 2017-12-07 10:01:33 -08:00