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
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
Andrew Meadows
d65101c4e9
sort and throttle avatar updates in interface
2017-11-28 09:07:17 -08:00
MiladNazeri
83d13717fe
Merge pull request #11752 from Menithal/21539
...
21539: Add "None" option in Head Tracking section when "Use Vive in Desktop Mode" is selected
2017-11-27 16:02:01 -08:00
SamGondelman
52039e022b
merge from master, get rid of resolution in RayPick
2017-11-27 13:11:35 -08:00
Alexander Ivash
02684e3fed
remove not used files
2017-11-27 22:49:11 +03:00
Alexander Ivash
da06b2656f
7991 Change Instances of Edit Mode to Create Mode
2017-11-27 22:47:42 +03:00
howard-stearns
1575119327
PR feedback
2017-11-27 10:46:57 -08:00
howard-stearns
2e919682a0
Merge branch 'master' of https://github.com/highfidelity/hifi into MandatoryMania-ECWallet
2017-11-27 10:02:53 -08:00
luiscuenca
ad02118588
fixed menu error
2017-11-26 23:43:13 -07:00
Menithal
693da50a68
21539: Fixed None Checkmark being on Desktop mode
2017-11-27 07:59:04 +02:00
Menithal
5d52b9936b
21539: Updated Logic to match request
2017-11-27 07:42:18 +02:00
luiscuenca
027d2d323c
Measure tool and corrections
2017-11-26 22:28:34 -07:00
Menithal
ba1cd74ffe
21539: Moved Desktop HMD to None
2017-11-26 21:58:16 +02:00
vladest
6136a4cea6
Rounded background
2017-11-25 10:03:56 +01:00
vladest
73a557a8a4
Added Scroll Bar for Trees. Fixed some anchoring issues. Fixed headerless views
2017-11-24 15:58:27 +01:00
vladest
b69b580a68
Use ScrollBar from QQC2 which is supports both mouse and touch events
2017-11-23 23:08:43 +01:00
vladest
22d57f1103
Fix click events from mouse
2017-11-23 14:56:15 +01:00
luiscuenca
69299bdd68
try to fix errors
2017-11-22 19:25:24 -07:00
luiscuenca
5bf8367126
add resources
2017-11-22 18:17:50 -07:00
luiscuenca
b481a6060e
improve audio scope
2017-11-22 18:15:42 -07:00
howard-stearns
899999a4c6
fix up dynamic ownership challenge
2017-11-22 15:58:30 -08:00
Anthony J. Thibault
b3896f664d
Made increaseScale and decreaseScale more responsive at limits
2017-11-22 14:45:52 -08:00
vladest
094cc0e251
Merge conflict
2017-11-22 20:50:15 +01:00
Zach Fox
fada02a76c
Merge pull request #11864 from zfox23/commerce_newHelpText
...
New Help questions/answers/link
2017-11-22 12:53:16 -05:00
David Rowe
3535071178
Add "size" as synonym for "dimensions" in model overlay property setter
2017-11-22 21:04:04 +13:00
samcake
1514cdfb2f
extend the set of interface for multi highlight
2017-11-21 17:59:45 -08:00
howard-stearns
16d6d8a361
Merge branch 'master' of https://github.com/highfidelity/hifi into MandatoryMania-ECWallet
2017-11-21 16:28:29 -08:00
howard-stearns
ca80c9b764
Merge branch 'ECWallet' of https://github.com/MandatoryMania/hifi into MandatoryMania-ECWallet
2017-11-21 16:28:08 -08:00
Sam Gateau
8389137caa
Merge pull request #11834 from highfidelity/pointers
...
UI Pointer Optimization
2017-11-21 16:01:52 -08:00
Zach Fox
d2ebfbf064
New Help questions/answers/link
2017-11-21 18:55:48 -05:00
samcake
a0e40efdc8
Fixing all the changes of interface name coming from upstream
2017-11-21 14:55:58 -08:00
Dante Ruiz
767b0fa4af
remove unused variable warning
2017-11-21 14:45:55 -08:00
samcake
ebd701a1ab
Merging with master
2017-11-21 14:40:37 -08:00
samcake
84ff40c717
Merging with master
2017-11-21 14:12:47 -08:00
Dante Ruiz
c9ad7b1db5
Merge branch 'master' of github.com:highfidelity/hifi into fix-modal
2017-11-21 13:56:22 -08:00
Dante Ruiz
88c3adbff1
change askToReplaceDomainContent to use async question and warning
2017-11-21 13:56:11 -08:00
Anthony J. Thibault
9f54ce55f3
Change domain setting from min/max avatar scale to min/max avatar height
...
* Domain settings version has been bumped from version 2.0 to 2.1
* Old domain settings for avatar scale will be auto-converted to avatar height
* Avatar code has been changed so that limitDomainScale() works with the new height limits
* Avatar getUnscaledEyeHeight() was added to C++.
* MyAvatar.getHeight() was added to JS.
2017-11-21 13:25:47 -08:00
vladest
a56e4e10c3
Remove unused variables
2017-11-21 21:44:04 +01:00
Brad Hefta-Gaub
817afcd083
Merge pull request #11741 from ZappoMan/entityItemCleanup
...
Entity item cleanup
2017-11-21 12:24:46 -08:00
Brad Hefta-Gaub
5914f27027
Merge pull request #11706 from luiscuenca/webAudioDev_fresh
...
QML & Web generated audio now follow the client audio device selection
2017-11-21 11:29:48 -08:00
