Zach Fox
|
b2bafed2bb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
|
2017-12-07 11:21:24 -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 |
|
Brad Hefta-Gaub
|
b91909011a
|
Merge pull request #11914 from 1P-Cusack/FogBugz/Case_7049
[Case 7049]: Remove unused fields and checkboxes from Edit.js
|
2017-12-07 09:18:26 -08:00 |
|
Brad Hefta-Gaub
|
ac3bd5042f
|
Merge pull request #11890 from dback2/mirrorissues3
Secondary camera frame buffer / texture fixes
|
2017-12-07 09:17:27 -08:00 |
|
Bradley Austin Davis
|
2bd24ee7a2
|
Merge pull request #11940 from birarda/bug/grab-latest-vcredist
grab latest VC redistributables from MS during INSTALL
|
2017-12-06 17:32:10 -08:00 |
|
Bradley Austin Davis
|
3e6bea14e6
|
Merge pull request #11922 from jherico/opt/scene
Scene threading optimizations
|
2017-12-06 17:23:58 -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
|
d61f0584c3
|
Fix diectory.js script's icon URL
|
2017-12-07 12:26:29 +13:00 |
|
David Rowe
|
efd72be96f
|
Fix image overlay's subImage property's width and height support
|
2017-12-07 12:05:46 +13:00 |
|
Bradley Austin Davis
|
2a91e98813
|
Fix iterator names
|
2017-12-06 14:26:07 -08:00 |
|
Brad Davis
|
e626ca3ccd
|
Working on scene threading optimizations
|
2017-12-06 14:26:07 -08:00 |
|
Zach Fox
|
f88a72894d
|
Merge pull request #11937 from zfox23/commerce_dataTracking1
Commerce Data Tracking: Iteration One
|
2017-12-06 14:07:04 -08:00 |
|
Zach Fox
|
5f3b148baa
|
Fix marketplace icon incorrectly appearing active
|
2017-12-06 13:01:23 -08:00 |
|
Stephen Birarda
|
99b5b8942a
|
add file download command to install step
|
2017-12-06 12:15:42 -08:00 |
|
Stephen Birarda
|
008b4285f5
|
don't use cmake sys library install, grab vcredist as external
|
2017-12-06 11:35:14 -08:00 |
|
Stephen Birarda
|
c329a58c14
|
ignore vcredist when performing fixup_bundle
|
2017-12-06 11:26:34 -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 |
|
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 |
|
Ryan Downe Karpf
|
f2c49b3231
|
Merge pull request #11887 from highfidelity/RC60
Beta Release 60 - Includes up to Developer Release 7493
|
2017-12-05 11:37:52 -05:00 |
|
LaShonda Hopper
|
eb8438a9e8
|
[Case 7049] Addresses code review feedback.
Changes Committed:
modified: scripts/system/html/js/entityProperties.js
|
2017-12-04 18:25:51 -05: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 |
|
Brad Hefta-Gaub
|
218b4635b2
|
Merge pull request #11904 from druiz17/fix-equipping
Fix adjusting equipped entities
|
2017-12-02 18:31:00 -08: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
|
ce68b720c2
|
Merge pull request #11886 from druiz17/fix-vive-head-pose
Register the Vive inputDevice if no controllers are available
|
2017-12-02 12:52:31 -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 |
|
Brad Hefta-Gaub
|
b2c5154cb6
|
Merge pull request #11909 from ZappoMan/rc60FixModelImportSizing
fix issues in model import sizing caused by recent refactor
|
2017-12-02 09:30:57 -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 |
|
luiscuenca
|
fefedc11c8
|
mac fix
|
2017-12-01 15:17:23 -07: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 |
|
luiscuenca
|
d271f61987
|
Proper fix
|
2017-12-01 14:37:59 -07:00 |
|