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 |
|
Dante Ruiz
|
bbc022da2d
|
fix-far-to-equip
|
2017-12-05 14:09:46 -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 |
|
Dante Ruiz
|
c58286d371
|
dont do work if not needed
|
2017-12-05 09:31:35 -08:00 |
|
Nissim Hadar
|
3de34834e1
|
Changed autoTester threshold to 0.9995
Added a readme explaining how to deploy autoTester.
|
2017-12-05 11:19:00 -06: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 |
|
Sam Gateau
|
1c5548b77b
|
Color picker in qml
|
2017-12-05 01:25:30 -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 |
|
Dante Ruiz
|
486cdf14d2
|
make sure that NO_BOOTSTRAPPING is disbaled correctly if parent is changed
|
2017-12-04 15:34:53 -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 |
|
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 |
|
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 |
|
Nissim Hadar
|
29b2eaacde
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2017-12-04 13:53:44 -06:00 |
|
Dante Ruiz
|
a1bf54ff00
|
fix issue of no_bootstrapping not being set correctly
|
2017-12-04 11:16:41 -08:00 |
|
Zach Fox
|
5261434b6a
|
Further remove dependencies of marketplaces.js on edit.js
|
2017-12-04 09:45:36 -08:00 |
|
Dante Ruiz
|
03934549cc
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-collision-mask-for-children
|
2017-12-04 09:08:11 -08: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
|
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 |
|
Nissim Hadar
|
c35310c2fb
|
Deal with user canceling folder selection.
|
2017-12-01 17:17:11 -08:00 |
|
Dante Ruiz
|
1e6b5c0c75
|
make requested changes
|
2017-12-01 17:09:00 -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 |
|
Dante Ruiz
|
a1d90b5dd9
|
added extra bit
|
2017-12-01 15:41:13 -08:00 |
|
Nissim Hadar
|
f9f731acc5
|
Merge branch 'master' into QtImageCompare
|
2017-12-01 15:27:34 -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 |
|
Nissim Hadar
|
6c2e701023
|
Improved CMakeLists.txt for QT deployment.
Changed threshold from 0.999 to 0.9998
|
2017-12-01 13:31:52 -08:00 |
|