Commit graph

22851 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Zach Fox
b0dda3de33 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sameInfoDontRefresh 2017-11-30 10:49:20 -08:00