Commit graph

23051 commits

Author SHA1 Message Date
Zach Fox
2acea75db3 Commerce: Checkout Layout Revisions 2017-12-21 16:09:46 -08:00
Andrew Meadows
c1906215ba add comments 2017-12-20 17:41:08 -08:00
Andrew Meadows
721e9d426a restore signals on LOD change 2017-12-20 17:41:08 -08:00
Andrew Meadows
5c11ae3469 bump desktop min FPS from 20 to 30 msec 2017-12-20 17:41:08 -08:00
Andrew Meadows
4fb9680f3b also consider GPU render time for LOD adjust 2017-12-20 17:41:08 -08:00
Andrew Meadows
9c4a0c8c70 tweak LOD adjustment logging 2017-12-20 17:41:08 -08:00
Andrew Meadows
8e0d367a2d use full 'present' time for FPS calculation
also, refactor LOD adjust logic
2017-12-20 17:41:08 -08:00
Andrew Meadows
7a9d566e02 remove unnecessary whitespace 2017-12-20 17:41:08 -08:00
Zach Fox
e02e6790fe Fix error state for Commerce passphrase TextInputs 2017-12-20 13:46:02 -08:00
Zach Fox
08edc52932
Merge pull request #12025 from zfox23/commerce_fixWalletSetupCancel
Commerce: Fix the behavior of the 'cancel' button in Wallet Setup
2017-12-20 09:18:10 -08:00
Zach Fox
a72ed27a25 CR feedback 2017-12-19 16:57:48 -08:00
Zach Fox
5da49d156e Commerce: Fix the behavior of the 'cancel' button in Wallet Setup 2017-12-19 16:26:58 -08:00
Zach Fox
18d5be147c Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-19 09:48:15 -08:00
Anthony Thibault
7ea1f3b911
Merge pull request #12013 from sethalves/delete-expired-av-ents
when an avatar-entity's lifetime expires, remove it from avatarEntityData
2017-12-18 17:35:42 -08:00
Zach Fox
6fc58b713e
Merge pull request #12009 from zfox23/commerce_dataTracking2
Commerce: Add Passphrase Auth Status data tracking
2017-12-18 16:26:59 -08:00
Zach Fox
a2fe2797ff
Merge pull request #11982 from zfox23/commerce_staticCertVersioning
Commerce: staticCertificateVersion; Seal serverScripts JSON property; getStaticCertificateJSON()
2017-12-18 15:20:23 -08:00
Seth Alves
ddbb7a4416 when an avatar-entity's lifetime expires, remove it from avatarEntityData 2017-12-18 14:26:25 -08:00
Zach Fox
afd3cf7045 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-18 14:08:09 -08:00
Zach Fox
affd67d7d4
Merge pull request #12007 from zfox23/commerce_moreSecurityImages
Commerce: More security images!
2017-12-18 12:06:43 -08:00
Zach Fox
e075cd79fb Add Passphrase Auth Status data tracking 2017-12-18 11:51:12 -08:00
Brad Davis
9f7b6f543d Merge remote-tracking branch 'upstream/master' into HEAD 2017-12-18 11:17:07 -08:00
Andrew Meadows
cfd2097f36
Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js
Cleanup names of debug stats and trace contexts.
2017-12-18 10:02:42 -08:00
Zach Fox
89795272c7 More security images! 2017-12-15 16:26:13 -08:00
Anthony Thibault
f3fcac8e58
Merge pull request #11903 from Delanir/IPD8258
8258 IPD Tertiary Task List: Changing to Smaller Avatar Does not Resize Tablet
2017-12-15 15:37:27 -08:00
Brad Hefta-Gaub
c68bec175a
Merge pull request #11978 from hyperlogic/bug-fix/no-hip-glitches
More stable hips IK
2017-12-15 15:32:24 -08:00
Brad Hefta-Gaub
45df668679
Merge pull request #11966 from SamGondelman/hysteresis
Update stylus touch hysteresis values
2017-12-15 15:22:41 -08:00
Alexander Ivash
32acc8ad47 8992 Login window is small in tablet 2017-12-14 23:53:33 +00:00
Zach Fox
af346f2ced Protocol change 2017-12-14 10:09:10 -08:00
SamGondelman
4fbf5db697 Merge remote-tracking branch 'upstream/master' into hysteresis 2017-12-14 09:55:46 -08:00
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
3764445272 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-13 14:12:08 -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
Anthony J. Thibault
c4a7f4843a Much more stable hips IK target.
Target is now estimated in sensor space from the head, which is very deterministic and not prone to feedback from the IK system.
Previous the hip was estimated from accumulated IK error deltas, which was not stable, as the error would tend to accumulate if the IK targets could not be reached.
2017-12-13 11:12:32 -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
Andrew Meadows
87fa919ac8 save files to Documents by default 2017-12-12 14:11:25 -08: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
SamGondelman
ce96fa7078 change hysteresis values based on testing 2017-12-11 17:32:58 -08:00
Zach Fox
2225352b1e Fix wallet setup 2017-12-11 17:15:15 -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