Zach Fox
e769d2fbc3
Don't refresh Inventory or Recent Activity if data hasn't changed
2017-11-28 15:44:42 -08: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
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
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
luiscuenca
5bf8367126
add resources
2017-11-22 18:17:50 -07: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
Zach Fox
d2ebfbf064
New Help questions/answers/link
2017-11-21 18:55:48 -05:00
samcake
84ff40c717
Merging with master
2017-11-21 14:12:47 -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
Howard Stearns
4018b99118
Merge pull request #11848 from zfox23/commerce_flipTheSwitch
...
Turn Commerce on by default!
2017-11-20 16:18:53 -08:00
Dante Ruiz
76935c1457
fixing merge conflict
2017-11-20 09:51:10 -08:00
Brad Hefta-Gaub
e070033ce4
Merge pull request #11793 from ElderOrb/FB9032
...
9032 - Current display mode can be deselected in the toolbar/tablet menu
2017-11-19 11:25:35 -08:00
Brad Hefta-Gaub
ff8ca6da4c
Merge pull request #11303 from vladest/webbrowser_updates
...
Webbrowser updates
2017-11-19 11:11:09 -08:00
Brad Hefta-Gaub
1de6ecec30
Merge pull request #11830 from ElderOrb/FB8244
...
8244 Rename captionColorOverride to captionColor
2017-11-18 14:28:32 -08:00
Brad Hefta-Gaub
28b75abcee
Merge pull request #11816 from druiz17/fix-bringing-up-logs
...
Fix issue of User is unable to bring up the High Fidelity Interface log.
2017-11-17 17:02:50 -08:00
Brad Hefta-Gaub
0678a7c9df
Merge pull request #11718 from kencooke/audio-louder-mastergain
...
Adjustable master avatar volume
2017-11-17 16:58:27 -08:00
SamGondelman
033f658fff
Merge remote-tracking branch 'upstream/master' into pointers
2017-11-17 16:10:20 -08:00
Zach Fox
d31578abae
FIXME LATER! Remove mouseareas from passphrase screens
2017-11-17 15:47:02 -08:00
Zach Fox
7d34b3fe67
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-11-17 15:45:03 -08:00
Zach Fox
ec16f16757
Remove debug buttons from wallet
2017-11-17 15:21:18 -08:00
Zach Fox
4cc8db8aff
Merge pull request #11843 from zfox23/commerce_fixMyItems
...
Fix 'My Items' display
2017-11-17 12:59:51 -08:00
Dante Ruiz
4de0fdf7d1
Merge pull request #11768 from ctrlaltdavid/21596
...
Add instructions and cursor to GOTO dialog input
2017-11-17 11:45:40 -08:00
Zach Fox
f570e3c874
Fix 'My Items' display
2017-11-17 11:27:00 -08:00
Zach Fox
7f64ede940
Fix skipping wallet setup step in certain cases
2017-11-16 11:44:52 -08:00
SamGondelman
e3aa79990b
merge with master
2017-11-16 09:45:32 -08:00
Alexander Ivash
c5d2f598d7
8244 Rename captionColorOverride to captionColor
2017-11-16 15:46:49 +03:00
SamGondelman
7eb22b372f
merge with master
2017-11-15 14:35:30 -08:00
Zach Fox
9f80a5f081
Merge pull request #11817 from zfox23/commerce_rezFix
...
Fix rezzing non-JSON marketplace items
2017-11-15 14:17:05 -08:00
Brad Davis
bb2e061d77
Fixing global declarations in JS
2017-11-15 12:00:52 -08:00
Brad Davis
26a745be6f
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-15 11:59:06 -08:00
Brad Davis
1167be4102
Reverting tablet API rename, cleaning up duplicated code
2017-11-15 11:52:55 -08:00
Zach Fox
e8c4878c8f
Fix rezzing non-JSON marketplace items
2017-11-15 11:25:18 -08:00
Dante Ruiz
d83f3152dd
Merge pull request #11809 from ElderOrb/FB8984
...
8984 Opening tablet with "Enter" key displays the audio menu
2017-11-15 11:16:49 -08:00
Dante Ruiz
b633968865
fix-bringing-up-logs
2017-11-15 10:47:06 -08:00
Howard Stearns
1c293c4c48
Merge pull request #11813 from zfox23/commerce_removeEditJSDependency
...
Remove Marketplace's dependency on Edit.js for REZ/WEAR
2017-11-14 16:33:35 -08:00
Zach Fox
f5994375cf
Remove Marketplace's dependency on Edit.js for rez
2017-11-14 14:29:49 -08:00
Zach Fox
c42003a374
Merge pull request #11794 from ElderOrb/FB4684_3
...
4684 Add collapse button on the virtual keyboard
2017-11-14 12:22:42 -08:00
Alexander Ivash
e201e203b8
8984 Opening tablet with "Enter" key displays the audio menu
2017-11-14 22:18:48 +03:00
Zach Fox
5290ee3b4e
Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist
2017-11-14 10:07:44 -08:00
Brad Davis
d71fd151c5
Fixing button model exposure
2017-11-13 16:45:27 -08:00
Zach Fox
a3332e15b7
Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist
2017-11-13 15:01:26 -08:00
SamGondelman
2fb1981c4a
merge with master
2017-11-13 14:34:39 -08:00
Brad Davis
69029b49f3
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-13 14:29:49 -08:00
Brad Davis
8f85c7650b
Make sure loaded components get the right parent context
2017-11-13 14:16:04 -08:00
Zach Fox
641c4656c4
Fix bug with disappearing certificate info
2017-11-13 10:53:16 -08:00
Brad Davis
5cf9c1bb33
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-13 10:48:21 -08:00
Ryan Downe Karpf
f8b1c7978c
Merge pull request #11772 from 1P-Cusack/FogBugz/Case_6569
...
[Case 6569]: Silent failure is possible during Model Creation
2017-11-12 08:36:10 -08:00
vladest
50ea08f3d5
VR stylus and laser need longer timeout than mouse
2017-11-11 16:10:00 +01:00
vladest
9dbcff040d
Tune press delay to be able to swipe tablet pages easier
2017-11-11 09:43:34 +01:00
Brad Davis
7bf1b176d7
Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem
2017-11-10 14:21:24 -08:00
vladest
637a4ff357
Merge branch 'master' into tablet_home_paginate
2017-11-10 21:12:34 +01:00
Brad Davis
92a3c209aa
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-10 11:44:29 -08:00
beholder
d1969d649a
fix not collapsing keyboard
2017-11-10 21:20:00 +03:00
beholder
0bc95998c4
a few more adjustments based on discussion with Mukul
2017-11-10 21:20:00 +03:00
beholder
4d11f9a434
increase font pixel size for 'collapse keyboard' to 34px
2017-11-10 21:20:00 +03:00
beholder
db3ed81513
adjust to changed requirements:
...
1. The keyboard collapse button is moved to the lower right, replacing the keys there
2. The button next to m is a hyphen instead of a underscore, it turns to a underscore when the user clicks on shift
3. The input text at the top occupies the full width and is center aligned, when you start typing the text moves in both directions the left and the right
2017-11-10 21:20:00 +03:00
beholder
eb4214fb4c
add API for unfocusing input fields in HTML, unfocus WebEngine-based QML items on lowering keyboard
2017-11-10 21:20:00 +03:00
beholder
fb14e4dc4d
Fixed programmatical lowering of 'TabletAddressDialog'
2017-11-10 21:20:00 +03:00
beholder
a9fe3596cf
4684 Add collapse button on the virtual keyboard
2017-11-10 21:20:00 +03:00
beholder
87519cd26f
use conditional bindings to avoid intermediate binding states
2017-11-10 19:53:54 +03:00
beholder
908faa1334
refactoring: simplify code & fix the issue with menu-es sometimes losing checked state
2017-11-10 19:53:54 +03:00
LaShonda Hopper
0e90c92cf5
[Case 6569] Minor: Break up line to pass column count guidelines.
...
Changes Committed:
modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml
2017-11-08 18:35:12 -05:00
LaShonda Hopper
a057cb914f
[Case 6569] Fixes clipping of cancel button by window edge.
...
Changes Committed:
modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml
2017-11-08 18:27:25 -05:00
LaShonda Hopper
dac2ae19a4
[Case 6569] Add protection for dynamic vs static collision type (details below).
...
When creating a model, it was possible to elect Exact collision with the dynamic
property even though this combination is prohibited. This combination would silently
fail rather than notifying the user of the error.
This commit implements safeguards against the invalid combination:
* If the user elects the Exact collision type and the dynamic field is unchecked, then dynamic field is disabled.
* If the user elects a different collision type and the dynamic filed is unchecked, then the dynamic field is enabled.
* If the user has checked the dynamic field and subsequently elects the Exact collision type, then the selection is
void and the previous collision selection is retained; however, an error dialog is presented informing the user of the error.
Changes Committed:
modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml
2017-11-08 18:27:24 -05:00
Brad Davis
25df649b44
Fix desktop mode script URL injection
2017-11-08 14:55:34 -08:00
David Rowe
c5c1ead400
Fix GOTO dialog's connection status and location not always updating
2017-11-09 10:51:21 +13:00
Zach Fox
a5dff0160b
Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist
2017-11-08 13:30:55 -08:00
Zach Fox
38fde43009
...simplify your life
2017-11-08 13:19:47 -08:00
Zach Fox
3190fe1f32
Use keyfilepath instead of cached public keys
2017-11-08 12:30:48 -08:00
Brad Davis
1a58aee385
Fix scripting URL injection, I hope
2017-11-08 12:00:29 -08:00
Zach Fox
72fa0823ba
Logic changes
2017-11-08 11:01:54 -08:00
Zach Fox
b7163bb8fc
Frontend changes
2017-11-08 10:25:11 -08:00
Zach Fox
845ff64c1e
Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist
2017-11-08 09:32:09 -08:00
Zach Fox
085355222f
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-11-08 09:31:09 -08:00
Ken Cooke
addcb51ed9
Change slider label from "master gain" to "master volume"
2017-11-08 07:50:35 -08:00
David Rowe
0d21e0be11
Delete old, no longer used file
2017-11-08 17:14:17 +13:00
David Rowe
055470296d
Move current location in GOTO dialog and add placeholder text to input
2017-11-08 17:13:40 +13:00
Brad Davis
b7f31eb5b9
Fixing desktop QML loading, tablet clickthrough bugs
2017-11-07 12:42:26 -08:00
Zach Fox
f248eb5518
Change wallet home when 0 transactions
2017-11-07 11:30:09 -08:00
SamGondelman
f970eb2302
merge with pointers branch
2017-11-06 14:49:50 -08:00
SamGondelman
7d420f5242
isLeftHand, isRightHand, isMouse
2017-11-06 12:29:21 -08:00
Zach Fox
b54627594b
Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist
2017-11-06 09:29:26 -08:00
Zach Fox
149c8fbeb2
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-11-06 09:25:30 -08:00
David Rowe
9db0dd6fea
Fix Asset Browser's "Copy URL" context menu
2017-11-05 20:38:37 +13:00
Menithal
ac1df7b815
21539: Allow HMD to turned off in Desktop Mode
2017-11-05 01:02:08 +02:00
Brad Davis
d162e1cff6
Whitelist functionality for tablet apps
2017-11-04 15:14:06 -07:00
Brad Hefta-Gaub
c1dfa24c12
Merge pull request #11743 from kencooke/audio-peakmeters-bugfix
...
Fix the audio input device peak meters
2017-11-04 13:55:08 -07:00
Melissa Brown
a14e98053e
Merge pull request #11138 from Nex-Pro/21466
...
Fix Avatar Rotation upon Teleporting Using PAL
2017-11-03 11:58:15 -07:00
Nex-Pro
3171418173
Update NameCard.qml
2017-11-03 17:21:35 +00:00
vladest
6659565c39
Merge branch 'master' into tablet_home_paginate
2017-11-03 14:41:54 +01:00
vladest
659afcc43b
Make page indicators non clickable. Attempt to enable swipe even over buttons
2017-11-03 14:38:46 +01:00
Ken Cooke
babaef8399
Fix the audio input device peak meters
2017-11-03 05:59:59 -07:00
Zach Fox
6f3c61c4e0
Slightly modify invalid cert language
2017-11-02 17:59:36 -07:00
Zach Fox
19945c5991
Update cert UI
2017-11-02 10:22:00 -07:00
Zach Fox
56cb98d96f
Make inspection cert work
2017-11-01 12:02:57 -07:00
Zach Fox
b335ba9a75
Timeout timer
2017-11-01 11:34:29 -07:00
vladest
215e64d702
Merge branch 'master' into tablet_home_paginate
2017-11-01 18:51:01 +01:00
Ken Cooke
82d9827571
Merge branch 'master' into audio-louder-mastergain
2017-11-01 08:10:55 -07:00
Ken Cooke
3a2780bdf6
Enable gain slider in PAL menu to control Avatar MASTER Gain
2017-10-30 10:42:26 -07:00
vladest
d3c62db65d
Merge branch 'master' into webbrowser_updates
2017-10-30 18:17:19 +01:00
vladest
586dde7dd7
Removed GPL code. Added own implementation of suggestions engine. Fixed Google maps different issues
2017-10-30 18:15:42 +01:00
Ryan Downe Karpf
28a99fe685
Merge pull request #11655 from dback2/tabletcontextualmode
...
add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place
2017-10-30 08:56:26 -07:00
vladest
950ac3540a
Fix mute unmute. Scrolling thru suggestions popup now set popup's contains into url. Fixed reload timer
2017-10-29 14:05:47 +01:00
vladest
865c241a13
Merge branch 'master' into webbrowser_updates
2017-10-28 12:31:26 +02:00
vladest
b1601dcd4c
fix typo in tablet avatar browser
2017-10-28 12:07:29 +02:00
vladest
567a219e9c
Cleanup. Remove unused functionality
2017-10-28 12:01:37 +02:00
vladest
6fb1a9954e
Merge branch 'master' into fix_google_vr_height
2017-10-28 10:35:29 +02:00
Brad Hefta-Gaub
8322631a6d
Merge pull request #11695 from luiscuenca/case6719
...
6719 Avatar attachment window will update when attachments are modified
2017-10-27 17:01:05 -07:00
Brad Hefta-Gaub
d61ede2a4e
Merge pull request #11697 from ElderOrb/FB8211
...
8211 Add very short haptic feedback when highlighting letters on keyboard
2017-10-27 13:26:41 -07:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster
...
Commerce: Owner Verification for Certified Entities
2017-10-27 12:28:04 -07:00
luiscuenca
70b37f2e8a
Cleaning some old tabs
2017-10-27 11:32:44 -07:00
luiscuenca
f32282afdd
Clean update bug 8027
2017-10-27 11:03:02 -07:00
Zach Fox
9481824d0a
Fix enabled status of wear button
2017-10-26 17:02:09 -07:00
beholder
6093cef6f0
add comments to explain '-1'
2017-10-27 01:25:26 +03:00
beholder
f6fa85fed2
adjust to coding standards
2017-10-27 01:25:25 +03:00
Zach Fox
c62eb2bf3c
Merge branch 'feature/qml_whitelist_2' of https://github.com/jherico/hifi into commerce_QmlWhitelist
2017-10-26 14:58:43 -07:00
Brad Davis
ffc51d5387
Working on QML whitelist functionality
2017-10-26 14:20:13 -07:00
Zach Fox
3e95484c4c
Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting
2017-10-26 13:58:50 -07:00
beholder
5969e0b118
8211 Add very short haptic feedback when highlighting letters on keyboard
2017-10-26 23:03:06 +03:00
vladest
794355dc35
Merge branch 'master' into webbrowser_updates
2017-10-26 21:18:00 +02:00
vladest
320ab2e682
Rework using StackView. Now backward takes in account popups as well
2017-10-26 21:14:44 +02:00
Zach Fox
c1e990e7be
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-10-26 10:37:31 -07:00
luiscuenca
f0eab58ebd
Bug 6719 fixed
2017-10-26 09:41:24 -07:00
Ken Cooke
4eb8b826c2
Merge pull request #11681 from luiscuenca/case6443
...
6443 Audio Menu Sample Sound won't play while domain is loading
2017-10-26 08:40:30 -07:00
luiscuenca
3d3077978e
Simplyfied and fixed null pointer
2017-10-25 18:47:10 -07:00
Zach Fox
5898f0bd0c
Gotta do some fancy stuff with anchors for this to work
2017-10-25 15:04:47 -07:00
Zach Fox
dafa830c0d
First steps
2017-10-25 14:44:59 -07:00
luiscuenca
a1c9285c90
Fixed bug on case 6443
2017-10-25 13:13:50 -07:00
Zach Fox
14150c09ac
Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting
2017-10-25 12:59:36 -07:00
vladest
9f32b6c634
Merge branch 'master' into webbrowser_updates
2017-10-25 21:46:39 +02:00
vladest
505c281cd3
Merge branch 'master' into tablet_home_paginate
2017-10-25 21:19:16 +02:00
Brad Hefta-Gaub
18a74cea91
Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023
...
2017-10-23: Merge RC57 into Master
2017-10-24 21:19:01 -07:00
Zach Fox
7998984d8e
Missed tons of spots!
2017-10-24 14:30:47 -07:00
Dante Ruiz
f29937fb88
Merge branch 'master' of github.com:highfidelity/hifi into crash-keyboard
2017-10-24 13:54:21 -07:00
Dante Ruiz
92f765fe52
property set echomode for keyboard for wallet and webviews
2017-10-24 13:53:50 -07:00
Zach Fox
48c8d52c09
Cleanup
2017-10-24 13:30:27 -07:00
vladest
874b9149e7
Popupd support reworked
2017-10-24 22:04:25 +02:00
Zach Fox
c64c2e17c8
First pass at consolidation
2017-10-24 12:01:05 -07:00
Zach Fox
1f6d989044
Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023
2017-10-23 17:37:43 -07:00
Dante Ruiz
0242e8e4ba
fixed crash and login password
2017-10-23 16:33:49 -07:00
David Back
b5f1793863
add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place
2017-10-23 14:21:18 -07:00
vladest
a33b2986cd
Merge branch 'master' into webbrowser_updates
2017-10-23 22:34:31 +02:00
