Commit graph

22999 commits

Author SHA1 Message Date
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
Zach Fox
21077da41a Don't send requests to backend if cached public keys is empty 2017-12-07 09:48:06 -08:00
Sam Gondelman
99c52f8602
coding standards 2017-12-07 09:38:14 -08:00
Brad Hefta-Gaub
4f8a2ea4be
Merge pull request #11934 from ctrlaltdavid/21630
Fix cloned 3D overlays' dimensions
2017-12-07 09:24:01 -08:00
Brad Hefta-Gaub
a0457d2b5e
Merge pull request #11856 from AndrewMeadows/sort-and-throttle-avatars
Use PrioritySortUtil for avatar updates from avatar-mixer
2017-12-07 09:22:52 -08:00
Brad Hefta-Gaub
88ed15aaaa
Merge pull request #11942 from ctrlaltdavid/21633
Fix image overlay's subImage property's width and height support
2017-12-07 09:19:43 -08:00
samcake
5f85e8e2cb Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-07 08:48:12 -08:00
Sam Gateau
0245a7005d Adding the query of a particular selection content 2017-12-06 22:44:58 -08:00
samcake
5500a6d11c More to come 2017-12-06 18:02:30 -08:00
John Conklin II
fffcf56904
Merge pull request #11892 from SamGondelman/snapshot
Expose Window.getDeviceSize()
2017-12-06 16:44:08 -08:00
David Rowe
efd72be96f Fix image overlay's subImage property's width and height support 2017-12-07 12:05:46 +13:00
David Rowe
0146eca315 JSDoc review 2017-12-07 10:09:05 +13:00
samcake
1efddb8260 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-06 10:21:45 -08:00
samcake
1483195285 almost complete setup working, yeah 2017-12-05 18:27:53 -08:00
luiscuenca
8abe8b9879 move save logic to audioclient 2017-12-05 18:22:14 -08:00
Zach Fox
3183a1a8b9 Add setupAttemptID to every step (thanks Dave) 2017-12-05 16:48:30 -08:00
David Rowe
cafebf6a7e Fix Unix build warnings and tidy initializers 2017-12-06 13:38:42 +13:00
luiscuenca
20d6615417 emit only when recording 2017-12-05 16:13:44 -08:00
David Rowe
e074bd85f9 Fix shape of cloned shape overlay 2017-12-06 12:29:09 +13:00
David Rowe
2752dc7cac Fix dimensions of cloned cube, sphere, shape, and model overlays 2017-12-06 12:28:55 +13:00
Zach Fox
902064ed37 Cleanup debug stuff 2017-12-05 15:26:55 -08:00
Zach Fox
c807fc80e3 Add marketplace cta referrer 2017-12-05 15:25:05 -08:00
Zach Fox
7521e4870e Bugfixes 2017-12-05 14:56:47 -08:00
Zach Fox
668f6d50b5 Add data tracking for wallet setup 2017-12-05 14:13:48 -08:00
Zach Fox
4334bf8222 Add data tracking for purchase and rez 2017-12-05 13:09:09 -08:00
Clément Brisset
a5e671e0fd
Merge pull request #11931 from highfidelity/stable
stable -> master
2017-12-05 11:58:23 -08:00
Zach Fox
c80039ea87
Merge pull request #11929 from zfox23/commerce_fixGraySecurityImage1
Fix gray/incorrect security image after relog
2017-12-05 11:21:06 -08:00
Zach Fox
1507620fd5
Merge pull request #11921 from ElderOrb/FB10024
10024 Wallet: TextField Focus Problems
2017-12-05 10:52:08 -08:00
Zach Fox
d59c9bd73a Fix gray/incorrect security image after relog 2017-12-05 10:27:40 -08:00
Sam Gateau
987246afb8 Merge branch 'master' of https://github.com/highfidelity/hifi into light 2017-12-04 19:11:42 -08:00
samcake
de410b6833 I need a color editor 2017-12-04 17:29:01 -08:00
luiscuenca
d70a3685b8 Clean up 2017-12-04 15:29:13 -08:00
luiscuenca
390c59b45c Change menu and minor fixes 2017-12-04 15:29:01 -08:00
NissimHadar
ec1c4c37fa
Merge pull request #11912 from ElderOrb/FB9461
9461 Keyboard for create appear then disappears immediately (HMD)
2017-12-04 16:49:25 -06:00
samcake
9fceaad38b Merging with master 2017-12-04 14:20:10 -08:00
Alexander Ivash
f7328f05fb remove keyboard-hiding logic as keyboard hides should be handled by focus change listener in 'onFocusObjectChanged' in the OffscreenQmlSurface 2017-12-05 00:51:42 +03:00
Zach Fox
4c96fc2d9d
Merge pull request #11905 from zfox23/commerce_resetWalletBeforeCreation
Call reset() on Wallet before creating new wallet
2017-12-04 13:05:36 -08:00
Alexander Ivash
8a5904373b remove 'collapse keyboard' hack as now there is dedicated 'collapse keyboard' button 2017-12-05 00:04:46 +03:00
Alexander Ivash
c67ff3b5d8 10024 Wallet: TextField Focus Problems
note: removed excessive MouseArea-s
2017-12-05 00:03:48 +03:00
Brad Hefta-Gaub
33adb0d76d
Merge pull request #11868 from ctrlaltdavid/21615
Add "size" as synonym for "dimensions" in model overlay property setter
2017-12-03 18:10:30 -08:00
Brad Hefta-Gaub
06cf194ec7
Merge pull request #11910 from ctrlaltdavid/21626
Fix erroneous 2D overlay unhandled property messages for bounds property
2017-12-03 18:09:17 -08:00
Alexander Ivash
d60f082796 9706 Editing Attachments Results In Attachments Window Scrolling To Top 2017-12-03 23:24:34 +03:00
luiscuenca
4030688e7a added record wav files 2017-12-03 11:54:37 -07:00
Brad Hefta-Gaub
314265fa86
Merge pull request #11891 from ctrlaltdavid/21625
Add missing line3d overlay property getters and setters
2017-12-02 12:52:44 -08:00
Brad Hefta-Gaub
3f705a7baf
Merge pull request #11858 from vladest/fix_tablet_scrollbars
Use ScrollBars from QQC2, which supports mouse and touch events
2017-12-02 12:51:14 -08:00
Brad Hefta-Gaub
ec33aa9c4b
Merge pull request #11880 from ElderOrb/FB7991
7991 Change Instances of Edit Mode to Create Mode
2017-12-02 12:50:48 -08:00
Anthony Thibault
fe16cc3fab
Merge pull request #11902 from luiscuenca/onloadFix
Fixes create list and web and QML audio sync
2017-12-01 16:05:07 -08:00
Howard Stearns
e2efe062fe
Merge pull request #11893 from zfox23/commerce_sameInfoDontRefresh
Don't refresh Inventory or Recent Activity if data hasn't changed
2017-12-01 13:57:34 -08:00
Zach Fox
b8f7ba9aa6 Fix month display in commerce... 2017-12-01 10:45:36 -08:00
Alexander Ivash
48b50e33dd 9461 Keyboard for create appear then disappears immediately (HMD) 2017-12-01 20:29:35 +03:00
Zach Fox
ebb2e50d01 Fix month display in commerce... 2017-12-01 09:29:19 -08:00
David Rowe
fd76c7a88b Fix erroneous 2D overlay unhandled property messages for bounds property 2017-12-01 17:40:34 +13:00
Zach Fox
24e5994f20 The nuclear option is a bad option. 2017-11-30 15:55:09 -08:00
Zach Fox
009d3a18a3 Call reset() on Ledger and Wallet before creating new wallet 2017-11-30 15:40:20 -08:00
Daniela Fontes
9bc165d8b4 Changing to Smaller Avatar Resizes Tablet 2017-11-30 18:49:53 +00:00
Zach Fox
b0dda3de33 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sameInfoDontRefresh 2017-11-30 10:49:20 -08:00
vladest
74c002d1f5 Merge conflicts. Return back web console messages. For flickable in web engine core its enougth to add timestamp to touch events 2017-11-30 12:52:26 +01:00
vladest
a3d406d8d1 Merge branch 'master' into fix_tablet_scrollbars 2017-11-30 11:40:50 +01:00
vladest
dfeefe53b8 Make scroll bar handle centered on shaft. Width chaned on par with entities list html view 2017-11-30 11:40:02 +01:00
luiscuenca
b890a29b3a Clean console log 2017-11-29 19:05:01 -07:00
luiscuenca
b817143e2e Fixes on web and QML audio sync 2017-11-29 18:16:21 -07:00
Zach Fox
39afb4ab6a Merge pull request #11882 from howard-stearns/the-lost-ECDSA
The lost ecdsa
2017-11-29 15:53:52 -08:00
howard-stearns
55589312f1 new padding/initialization that matters on linux server 2017-11-29 09:53:48 -08:00
Anthony J. Thibault
a4d70e89df hmd turn roll tuning
* Tighten action motor timescale while flying. This should cause less drift as the user
  changes direction and should lead to more comfort and control.
* Hmd head roll is only enabled if you are forward or backward faster then 2 meters per
  second. This should prevent un-intentional turning/rolling when hovering or moving at
  slow speeds.
* Documented hmdRoll tuning parameters accessible from JavaScript.
* Removed roll feathering code, because it is non-linear and can perhaps induce nausea.
* Tuned default dead spot and turning speeds to match Eagle Flight's defaults.
2017-11-28 17:20:26 -08:00
Anthony J. Thibault
dff49cafaa Embiggen the stick deadspots for oculus touch controllers
This effectively splits the controller into directional zones.
This should make driving/flying navigation more predictable and less prone
to drifting in unintentional directions, which could induce nausea.
2017-11-28 17:11:44 -08:00
Zach Fox
3c892920e3 Prevent seeding text from flashing 2017-11-28 17:00:15 -08:00
howard-stearns
281b4cfd88 Merge branch 'master' of https://github.com/highfidelity/hifi into the-lost-ECDSA 2017-11-28 16:59:44 -08:00
SamGondelman
c5ebb8a279 expose Window.getDeviceSize() 2017-11-28 16:16:30 -08:00
Zach Fox
5dc8715879 Bugfix 2017-11-28 16:14:17 -08:00
Zach Fox
489d11d5fd Remove logging 2017-11-28 16:01:58 -08:00
Zach Fox
3e5a2addd2 Use same logic for Recent Activity 2017-11-28 16:00:46 -08:00
Zach Fox
e769d2fbc3 Don't refresh Inventory or Recent Activity if data hasn't changed 2017-11-28 15:44:42 -08:00
David Rowe
b9ad15b19e Add missing line3d overlay property getters 2017-11-29 11:03:16 +13:00
David Rowe
3956b3b953 Fix missing line3d overlay property setter overrides of base class 2017-11-29 10:41:51 +13:00
David Rowe
76c934f012 Add missing line3d overlay property setters 2017-11-29 10:41:21 +13:00
vladest
7283f0127b return back square background for scroll bars 2017-11-28 22:21:52 +01:00
vladest
94937374c5 Make selection not visible under rounded scrollbar 2017-11-28 21:33:13 +01:00
vladest
b2ec2aab15 Merge branch 'master' into fix_tablet_scrollbars 2017-11-28 20:41:07 +01:00
Anthony J. Thibault
7327b79ce3 WIP 2017-11-28 11:37:58 -08:00
Andrew Meadows
e212ac67c1 enable custom avatar sort tuning 2017-11-28 11:30:06 -08:00