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
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
Menithal
ba1cd74ffe
21539: Moved Desktop HMD to None
2017-11-26 21:58:16 +02: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
Howard Stearns
4018b99118
Merge pull request #11848 from zfox23/commerce_flipTheSwitch
...
Turn Commerce on by default!
2017-11-20 16:18:53 -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
0678a7c9df
Merge pull request #11718 from kencooke/audio-louder-mastergain
...
Adjustable master avatar volume
2017-11-17 16:58:27 -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
Alexander Ivash
c5d2f598d7
8244 Rename captionColorOverride to captionColor
2017-11-16 15:46:49 +03: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
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
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
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
fb14e4dc4d
Fixed programmatical lowering of 'TabletAddressDialog'
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
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
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
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
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
Zach Fox
9481824d0a
Fix enabled status of wear button
2017-10-26 17:02:09 -07:00
Zach Fox
3e95484c4c
Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting
2017-10-26 13:58:50 -07: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
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
vladest
fd41299efc
Disable profile and custom user agent which broke nav bars
2017-10-23 22:34:22 +02:00
Zach Fox
03b46c5e62
Merge pull request #11652 from cain-kilgore/21508
...
WL 21508 - Improve upon Skybox Changer (Updated)
2017-10-23 12:22:21 -07:00
Zach Fox
30bffdea32
Quick bugfix
2017-10-23 11:45:51 -07:00
Cain Kilgore
b60b58ff35
zFox Changes
2017-10-23 19:40:43 +01:00
Cain Kilgore
3b4185fdb3
WL 21508 - Improve upon Skybox Changer
...
This involved a second PR, due to optimizing the way the Skyboxes are laid out. All of the Skyboxes will now appear at once, with the random button being removed. You are able to scroll up and down the list and choose which Skybox you'd like to pick.
2017-10-23 19:30:36 +01:00
Zach Fox
5c8451a626
Auto-refresh Wallet Home & Purchases on 4s timer
2017-10-23 10:36:23 -07:00
Melissa Brown
20787c9c7c
Merge pull request #11644 from cain-kilgore/21508
...
WL 21508 - Improve upon Skybox Changer
2017-10-23 10:30:55 -07:00
Cain Kilgore
b42afdaff0
WL 21508 - Cleanup from Code Review
2017-10-23 16:27:28 +01:00
vladest
b791dcba7f
Add sound cues to create app
2017-10-22 14:59:53 +02:00
vladest
cf7b050680
Sound cues for GoTo interface
2017-10-21 20:47:56 +02:00
Cain Kilgore
bc772a2f9a
WL 21508 - Improve upon Skybox Changer
2017-10-21 19:42:53 +01:00
vladest
d46578e572
Merge branch 'master' into webbrowser_updates
2017-10-21 19:12:23 +02:00
Brad Hefta-Gaub
f6af1d1ecf
Merge pull request #11387 from vladest/tablet_extended_sounds
...
Tablet extended sounds
2017-10-20 13:49:06 -07:00
Seth Alves
9d00606505
Merge pull request #11635 from druiz17/fix-hud-issues
...
actually fix toolbar from completely dispersing
2017-10-20 10:22:34 -07:00
vladest
fa349a694c
Code style fixes
2017-10-20 15:12:09 +02:00
vladest
ea6c2e1bb5
Merge branch 'master' into tablet_extended_sounds
2017-10-20 14:46:02 +02:00
vladest
83c14bba5c
Fix popups misbehavior, wrong links with double http etc
2017-10-20 11:55:41 +02:00
druiz17
f2ad61934b
fix toolbar from completely dispearing
2017-10-19 14:02:21 -07:00
Zach Fox
aa48215933
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_OctoberFixes2
2017-10-19 10:54:31 -07:00
Brad Hefta-Gaub
f951a23356
Merge pull request #11627 from druiz17/reload-script
...
fixed toolbar disapearing after reloading default scripts
2017-10-19 09:32:36 -07:00
vladest
92fc6daecc
Merge branch 'master' into webbrowser_updates
2017-10-19 14:56:31 +02:00
Zach Fox
dc1b3aef8f
Don't show purchases tutorial if user clicks what is rez
2017-10-18 16:25:06 -07:00
Zach Fox
322bac035c
Don't show 'no permission' text on wearables
2017-10-18 16:19:54 -07:00
druiz17
36912f1cd4
fixed toolbar disapearing after reloading default scripts
2017-10-18 16:03:32 -07:00
Zach Fox
1b7b35fe91
What does Rez mean?
2017-10-18 15:44:06 -07:00
Zach Fox
91ac2ab58c
LowerKeyboard button changes
2017-10-18 15:31:12 -07:00
Zach Fox
a993386613
Change color of 'Instructions Opened on Desktop' to disabled gray
2017-10-18 15:13:28 -07:00
Zach Fox
33508b6b2b
Update help text
2017-10-18 14:55:45 -07:00
Zach Fox
e829bd2919
Fix 'Recent Activity' indentation
2017-10-18 14:47:14 -07:00
Zach Fox
6f5fafb62f
Add 'showDebugButtons' switch on Help ta
2017-10-18 14:12:43 -07:00
Zach Fox
876001146a
Get categories from backend instead of site
2017-10-18 14:05:47 -07:00
Zach Fox
de50eef9c7
Fix rez certified...
2017-10-18 13:54:46 -07:00
Zach Fox
949da17046
Wear It button for items with category 'Wearables'
2017-10-18 13:51:58 -07:00
Zach Fox
6b7c997a4c
Minor text tweak
2017-10-13 13:37:11 -07:00
Zach Fox
051019a57a
Fix certificate username text eliding too early
2017-10-13 12:10:37 -07:00
Zach Fox
95a9675220
Final help QA - minus link to blockchain docs
2017-10-13 10:58:15 -07:00
vladest
f2847168a4
Use MouseArea for interacting instead of default one to be able interact in HMD mode
2017-10-13 19:12:42 +02:00
vladest
45f1f074df
Reduce combobox dropdown height taking keyboard in account
2017-10-12 20:52:40 +02:00
vladest
67ee4a7679
Merge branch 'master' into webbrowser_updates
2017-10-12 20:15:53 +02:00
vladest
2d010980b0
Removed special sound for Mute and replace it with hover and click sounds
2017-10-12 19:15:09 +02:00
vladest
b965049651
Do not produce sound and highlight on disabled items and menu separators
2017-10-12 18:39:26 +02:00
vladest
145149fedd
Merge branch 'master' into tablet_extended_sounds
2017-10-12 18:01:23 +02:00
vladest
85f2606582
Merge branch 'master' into tablet_home_paginate
2017-10-11 22:16:42 +02:00
vladest
726377db45
Refactor to SwipeView
2017-10-11 22:14:01 +02:00
Zach Fox
99109fe8e5
Merge pull request #11567 from zfox23/commerce_daveIntegration3
...
2017-10-10 Commerce Frontend Updates
2017-10-11 11:07:03 -07:00
Zach Fox
3f0ec73be6
Fix date displays
2017-10-11 10:55:14 -07:00
Zach Fox
5e383e2b1c
My Item certificates
2017-10-10 14:56:17 -07:00
Dante Ruiz
742cf0debe
Merge pull request #11383 from ElderOrb/case7384
...
7384 On Domains without Edit Access, Create Button Text still Highlights
2017-10-10 14:30:49 -07:00
Zach Fox
702528a8cc
Fully integrate cert properties
2017-10-10 13:27:17 -07:00
vladest
33f74103b8
Merge branch 'master' into tablet_home_paginate
2017-10-10 21:55:04 +02:00
Zach Fox
1c0a564155
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_daveIntegration3
2017-10-10 12:36:06 -07:00
Zach Fox
b105248dd7
Merge pull request #11555 from zfox23/commerce_daveIntegration2
...
2017-10-09 Commerce Frontend Updates
2017-10-10 12:34:30 -07:00
Zach Fox
be2b241629
Lots of progress; don't yet have some things
2017-10-10 12:20:48 -07:00
Zach Fox
8d0d9a159f
Bugfixes
2017-10-10 10:38:19 -07:00
Gerard Maguire
e5f65b5fb1
Merge branch 'master' of https://github.com/highfidelity/hifi into 21466
2017-10-10 17:44:27 +01:00
Gerard Maguire
afb03b3d2d
Avatar pitch and roll cleared
2017-10-10 16:19:31 +01:00
Zach Fox
b81a8a95ea
Final fixes
2017-10-09 15:23:22 -07:00
Zach Fox
38b95b5403
Instructions HTML file and flow
2017-10-09 15:07:14 -07:00
Zach Fox
733df8391f
Round 2
2017-10-09 12:27:56 -07:00
Zach Fox
acdd1e32e4
First round
2017-10-09 12:11:07 -07:00
druiz17
cd97ab0fdf
fixed looping sample sound bug
2017-10-09 11:39:57 -07:00
vladest
999e9aafa9
Merge branch 'master' into tablet_home_paginate
2017-10-08 16:12:07 +02:00
vladest
f2abb369c8
Tablet paginator initial
2017-10-08 16:09:01 +02:00
Thijs Wenker
77a36bf788
Merge pull request #10892 from ctrlaltdavid/vr-edit-a
...
VR edit app
2017-10-07 02:19:00 +02:00
Gerard Maguire
93caa7e259
Merge branch 'master' of https://github.com/highfidelity/hifi into 21466
2017-10-06 17:52:42 +01:00
Zach Fox
051b63503c
Merge pull request #11534 from zfox23/commerce_daveIntegration1
...
Commerce backend changes sync, October 5 2017
2017-10-06 09:45:45 -07:00
David Rowe
28c7ef2e97
Merge branch 'master' into vr-edit-a
2017-10-06 11:54:08 +13:00
Zach Fox
0b600a74c3
Fix passphrase input focus problem; fix getting inventory and balance after logging in on Checkout
2017-10-05 14:34:53 -07:00
Zach Fox
9290a51685
Fix confirmed text
2017-10-05 14:03:56 -07:00
Andrew Meadows
05f2dfbbc3
Merge pull request #11529 from vladest/fix_audiotab_name_alignment
...
Fix alignment of audio devices input header
2017-10-05 13:50:29 -07:00
Zach Fox
8e82095135
Number sold and limited run
2017-10-05 12:46:20 -07:00
Zach Fox
d605bd9ef4
Preprocess inventory endpoint result
2017-10-05 11:01:15 -07:00
Ryan Huffman
f0c9badbd6
Fix misspelling in lost-connection-to-atp error
2017-10-05 09:10:46 -07:00
vladest
193dc83b99
Fix alignment of audio devices input header
2017-10-05 13:59:42 +02:00
David Rowe
63e7521711
Merge branch 'master' into vr-edit-a
2017-10-05 11:29:49 +13:00
Zach Fox
fcafbef109
Fix buying free items using Commerce system
2017-10-04 09:34:32 -07:00
Zach Fox
ea3da6c9dd
Merge pull request #11495 from zfox23/pop_interfaceChanges2
...
Commerce: One step closer!
2017-10-03 11:56:00 -07:00
Zach Fox
e64b0861a1
Change passphrase working
2017-10-03 10:53:10 -07:00
David Rowe
f52df6667a
Merge branch 'master' into vr-edit-a
2017-10-03 21:50:49 +13:00
Zach Fox
11d0062104
Progress on buy endpoint
2017-10-02 16:57:41 -07:00
Zach Fox
1d1b846f39
Better 'view backup instructions' behavior
2017-10-02 12:44:51 -07:00
Zach Fox
15c0a21e0e
Varied commit - styling changes, beginnings of new Wallet endpoint, etc
2017-10-02 12:19:24 -07:00
Andrew Meadows
0fc6bf1e89
Merge pull request #11471 from Atlante45/feat/auto-bake
...
Asset Browser tweaks
2017-10-02 11:29:36 -07:00
Zach Fox
1ec0f5d9a0
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2
2017-10-02 09:26:59 -07:00
vladest
e360c1363e
Merge branch 'master' into tablet_extended_sounds
2017-10-02 18:03:49 +02:00
vladest
9a00468ea9
semicolons, yes
2017-10-01 19:21:30 +02:00
vladest
feafd441b1
Make sure keyboard will be rised after lowering on another click
2017-10-01 18:54:07 +02:00
David Rowe
0daa5012ca
Enable toolbar and tablet icons to load from local script directory
2017-09-30 15:00:15 +13:00
Zach Fox
e6ea76eefe
Tiny language fix - Thanks Cain!
2017-09-29 15:44:44 -07:00
Zach Fox
4668294389
Fix login flow regression
2017-09-29 15:25:24 -07:00
Zach Fox
bbbce96407
Fix gray securityimage
2017-09-29 14:30:02 -07:00
Zach Fox
63396a2fc3
WalletScriptingInterface; wallet status refactor
2017-09-29 13:42:04 -07:00
vladest
7f6773b1f4
Added semicolons
2017-09-29 21:12:21 +02:00
vladest
01a0b26b90
Remove mouse area for text fields. use activeFocusOnPress property instead
2017-09-29 17:14:35 +02:00
Atlante45
af69222fdb
Fix icon name change
2017-09-28 18:34:42 -07:00
Zach Fox
a1ae13489e
Slight changes to tutorial
2017-09-28 16:41:29 -07:00
Zach Fox
2cff5c1fa6
First time Purchases tutorial
2017-09-28 15:12:55 -07:00
Zach Fox
66be558a04
My Items Interface
2017-09-28 14:04:57 -07:00
Zach Fox
3a537cdcc3
Make usernameDropdown collapse when clicking anywhere outside it
2017-09-28 13:21:55 -07:00
Zach Fox
3742ccbdd3
Fix keyboard focus during setup while tip is up
2017-09-28 13:12:42 -07:00
Zach Fox
751dca0761
styling updates for purchases
2017-09-28 13:06:37 -07:00
Zach Fox
68c08969ae
Update Purchases
2017-09-28 12:49:38 -07:00
Zach Fox
8d74487393
Use edition number; fix CONFIRMED timer
2017-09-28 10:25:05 -07:00
Zach Fox
60823903cf
You own X others
2017-09-27 17:05:07 -07:00
Zach Fox
7b7e0bc78b
Updated Recent Activity
2017-09-27 16:35:35 -07:00
Atlante45
eb06c33187
Naming coding standard fix
2017-09-27 15:32:53 -07:00
Zach Fox
7ad3a5a1e3
Commerce: Tons of Interface changes ( #11463 )
...
* canRez(Tmp)Certified()
* CertifiedItem beginnings
* Skeleton of verifyOwnerChallenge()
* Controlled failure; updateLocation() skeletion
* Controlled failure on checkout page with ctrl+f
* Skeleton Purchases first-use tutorial
* Initial progress on new setup
* Security pic tip
* Skeleton Certificate page
* Updates to Certificate
* General progress; setup is nearly complete
* Better buttons; last step almost done
* Initial progress on wallet home
* Completed recent transactions
* Security page
* Scrollbar
* Fix auth error text
* PassphraseSelection
* Change security pic
* Minor layout changes; beginnings of emulated header
* Various layout changes; wallet nav bar
* Help screen
* Quick onaccepted change
* First pass at new purchases
* Small style updates
* Some error progress
* Lightbox in purchases
* Collapse other help answers when clicking on another
* REZZED notif
* Commerce Lightbox
* Lots of new interactions in Purchases
* Hook up 'view certificate'
* Fix errors, fix close button on cert
* Purchases timer; much faster filter
* Add debugCheckout
* Purchase updates
* GlyphButton; separator; Checkout Success; Ledger fix; debug modes
* Lock glyph below security pic should be white
* Various fixes, round 1
* Circular mask
* Passphrase change button fix; TextField error edge highlighting
* Recent Activity fixes
* Various changes
* Standard Security Pic location
* Color changes
* Filter bar changes
* Styling for multiple owned items
* Minor language change
* Header dropdown (harder than expected)
* Small fixes
* View backup instructions
* marketplaces.js onCommerceScreen
* Beginnign of new injection
* Marketplace injection changes
* Purchase button style changes
* More button styling
* MY PURCHASES button
* marketplace onUsernameChanged
* New help QA
* Help text changes etc
* Downscale security image, reducing filesize
* Lots of bugfixes
* Cleanup before PR
* Only open cert during inspection if commerce switch is on
* Help text changes
* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey
* Quick glyph change
* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
2017-09-27 14:43:51 -07:00
Atlante45
73483eef94
Update information sentence
2017-09-26 19:19:34 -07:00
Atlante45
bf984e8d1a
Fix tablet asset browser
2017-09-26 19:05:36 -07:00
Atlante45
03bd887f9a
Re-sync files
2017-09-26 18:42:50 -07:00
Atlante45
dda715e171
Update TabletAssetServer
2017-09-26 18:25:20 -07:00
Atlante45
acb0bf8d20
Asset Browser tweaks
2017-09-26 17:26:46 -07:00
Andrew Meadows
909e5e86b1
Merge pull request #11442 from vladest/fix_dde_visibility
...
Fix dde visibility
2017-09-26 14:19:47 -07:00
vladest
1a2d38e31f
Removed sounds for tablet in and out, added sounds for stylus instead. Added logging for testing semi-pressed laser and keyboard sounds
2017-09-25 17:11:44 +02:00
vladest
5a452fa981
Merge branch 'master' into tablet_extended_sounds
2017-09-25 15:40:40 +02:00
Ryan Huffman
883bdc6003
Merge pull request #11425 from Atlante45/feat/auto-bake
...
Asset Browser auto-refresh
2017-09-22 13:17:04 -07:00
vladest
5aab9bf5b0
Merge branch 'master' into fix_dde_visibility
2017-09-22 21:10:21 +02:00
vladest
4d530ef173
Make sure menu items vill be created even its not visible at the moment. Cleanup warnings on app close
2017-09-22 21:08:34 +02:00
Atlante45
6cdbf0c44a
Fix RunningScripts in tablet mode
2017-09-21 15:53:27 -07:00
Atlante45
1a571d0991
Add Asset Server auto refresh
2017-09-21 14:41:59 -07:00
Ryan Huffman
a56303a3fe
Merge pull request #11379 from highfidelity/feat/auto-bake
...
Add auto baking to Asset Server and mesh compression for FBXs
2017-09-21 08:33:51 -07:00
vladest
c48aba423a
Rename check box
2017-09-20 22:48:39 +02:00
vladest
3376786288
Added text selection on focus. Added basic check for text within url input field to decide is this something for search or for goto. Limited popup list height to do not cover virtual keyboard
2017-09-20 17:02:54 +02:00
vladest
56e6c8674a
Merge branch 'master' into webbrowser_updates
2017-09-20 14:38:09 +02:00
vladest
7a36894f76
Make sure audio device not gets unchecked
2017-09-19 23:25:41 +02:00
vladest
10f7f08171
Added peak model, missed during merging
2017-09-19 21:42:52 +02:00
vladest
6297448e90
Build fix
2017-09-19 19:49:19 +02:00
vladest
6c32783a09
Merge branch 'master' into audio_devices_split
2017-09-19 17:43:03 +02:00
vladest
e26118254f
Implemented Audio injector in Tablet scripting interface. Added missed sound events
2017-09-18 19:40:06 +02:00
vladest
bb214d7bf3
Merge branch 'master' into tablet_extended_sounds
2017-09-17 16:16:03 +02:00
beholder
353bab5277
7384 On Domains without Edit Access, Create Button Text still Highlights
...
(override color in states if captionColorOverride was specified)
2017-09-16 16:50:45 +03:00
Atlante45
a37642ba44
Pull Auto-Baking changes to TabletAssetServer.qml
2017-09-15 14:43:15 -07:00
Atlante45
c4d018504b
Pull Auto-Baking changes to TabletAssetServer.qml
2017-09-15 13:28:51 -07:00
vladest
de4f34aacb
Add resizable flag. Use the flag for Create only
2017-09-15 21:49:38 +02:00
Atlante45
8711823a9b
Sync up AssetServer.qml and TabletAssetServer.qml
2017-09-15 11:44:08 -07:00
Atlante45
ae14f1f88e
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake
2017-09-14 15:34:20 -07:00
Seth Alves
10494cf3e0
Merge pull request #11359 from vladest/fix_runningscripts_selection
...
use selection model of TreeView
2017-09-14 11:22:08 -07:00
Seth Alves
11df5a447e
Merge pull request #11310 from ElderOrb/case6718
...
6718 PR11082: Help text cannot be dismissed by clicking on the text i…
2017-09-14 11:17:48 -07:00
vladest
61b283743e
Merge branch 'master' into tablet_extended_sounds
2017-09-14 19:52:35 +02:00
vladest
7233c47257
use selection model of TreeView
2017-09-14 15:36:12 +02:00
Atlante45
2e84f48539
Fix QML errors
2017-09-13 09:54:55 -07:00
David Kelly
1903f65e45
oops
2017-09-08 16:58:12 -07:00
David Kelly
0a3958f743
cr feedback
2017-09-08 16:06:30 -07:00
David Kelly
99cdbbe306
and lets fix the purchases flow too
2017-09-08 14:00:09 -07:00
David Kelly
db0ecb61fd
Merge pull request #11325 from davidkelly/dk/UserHfcAccountRework
...
Use new hfc account endpoint
2017-09-08 09:03:53 -07:00
David Kelly
45c8dd9dd4
cr feedback
2017-09-08 05:28:41 -07:00
vladest
832e4aa5eb
Introducong tablet audio events
2017-09-08 09:51:10 +02:00
David Kelly
efdc340c5c
Use new hfc account endpoint
2017-09-07 18:15:04 -07:00
Stephen Birarda
5e1decb02b
Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake
2017-09-07 12:06:53 -07:00
Brad Hefta-Gaub
c5098abfb9
Merge pull request #10937 from kencooke/zzmp-audio/peak-values
...
Add peak values for all input devices in selection dialog
2017-09-07 11:58:50 -07:00
Howard Stearns
a0ae9ee747
Merge pull request #11311 from davidkelly/dk/walletCleanup
...
wallet cleanup
2017-09-06 14:29:24 -07:00
anshuman64
94e1545e58
Merge pull request #11298 from ElderOrb/case7382
...
7382 Create Menu does not Work on Tablet
2017-09-06 14:09:41 -07:00
vladest
e17f05a337
Correct UI
2017-09-06 14:52:08 +02:00
vladest
57643bd904
Merge branch 'master' into audio_devices_split
2017-09-06 14:20:41 +02:00
David Kelly
89cda8d306
oops -- === not ==
2017-09-05 17:15:25 -07:00
David Kelly
1fd30b1e0f
fix passphrase reset
2017-09-05 17:03:11 -07:00
David Kelly
350cee5f35
Wallet cleanup
2017-09-05 16:33:16 -07:00
beholder
41d014ca0c
6718 PR11082: Help text cannot be dismissed by clicking on the text inside the box.
2017-09-06 02:11:40 +03:00
Dante Ruiz
e69227aef8
Merge pull request #11209 from vladest/tablet_login_button
...
Added login button to Tablet
2017-09-05 12:59:02 -07:00
David Kelly
3bc45aefb1
Reset passphrase fix
2017-09-05 10:04:16 -07:00
vladest
87a5a6a5b9
Merge branch 'master' into webbrowser_updates
2017-09-05 13:12:27 +02:00
vladest
6de00c7969
Implemented suggestions popup. Cleanup
2017-09-05 13:11:52 +02:00
vladest
748ef8bb87
Enable edit in combobox
2017-09-03 18:10:53 +02:00
beholder
b5faa8ac56
7382 Create Menu does not Work on Tablet
2017-09-02 18:20:00 +03:00
David Kelly
90316e275a
Merge branch 'commerce_walletPassphraseModal' of https://github.com/zfox23/hifi into commerce_walletPassphraseModal
2017-09-01 13:33:23 -07:00
David Kelly
9fe6ce0337
working change passphrase. some cleanup to come
2017-09-01 13:11:56 -07:00
Zach Fox
3cf0df518f
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal
2017-09-01 11:53:47 -07:00
Zach Fox
51699c9a6a
Minor changes to fonts and colors
2017-09-01 11:44:46 -07:00
Zach Fox
8fcdfa171d
Add debug button to clear passphrase
2017-08-31 16:51:39 -07:00
Zach Fox
1bfc767daf
Quick fixes
2017-08-31 16:42:14 -07:00
Zach Fox
fa25c434ca
Messages to marketplaces.js
2017-08-31 15:50:42 -07:00
Zach Fox
0a9e3e8967
Remove unnecessary code
2017-08-31 15:46:37 -07:00
Zach Fox
2c2500875f
Fixes and improvements
2017-08-31 15:39:58 -07:00
Zach Fox
eab2947d40
Auth flow
2017-08-31 15:16:29 -07:00
Zach Fox
ce32d2d420
Checkout and Purchases
2017-08-31 14:12:05 -07:00
David Kelly
cdadaa8c9c
missed one
2017-08-31 13:41:53 -07:00
David Kelly
de2ce1cd5f
warning
2017-08-31 13:23:38 -07:00
Zach Fox
21a73b2f39
Changes in what I think are the right direction
2017-08-31 13:16:10 -07:00
druiz17
98b1fe6138
Merge pull request #11266 from ElderOrb/case6819
...
6819 - Create button not disabled
2017-08-31 12:36:08 -07:00
Zach Fox
914a6bae00
Commerce: Wallet Passphrase Modal
2017-08-31 12:18:38 -07:00
David Kelly
8fbdd207c8
display hfc in "pennies"
2017-08-31 12:10:12 -07:00
vladest
d6a7e69275
Merge branch 'master' into webbrowser_updates
2017-08-31 15:50:04 +02:00
David Kelly
962d1fc81d
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-wallet
2017-08-30 15:30:29 -07:00
David Kelly
988ee8c8d1
fix image provider, couple other things
2017-08-30 15:23:54 -07:00
vladest
b547b2573e
Added logged in property
2017-08-30 23:15:39 +02:00
Zach Fox
17d999e721
Fixes
2017-08-30 13:25:34 -07:00
vladest
903036a709
Merge branch 'master' into tablet_login_button
2017-08-30 22:12:03 +02:00
Zach Fox
580865fa5a
Add skeleton for infinite scroll
2017-08-30 12:54:26 -07:00
Zach Fox
7a7d7f95d7
Polish transaction history and prepare for whatever new design
2017-08-30 12:45:13 -07:00
Zach Fox
fb4b0f60fa
Remove most dependencies on 'onVisibleChanged'
2017-08-30 11:55:29 -07:00
howard-stearns
b8da08ca42
reset wallet
2017-08-30 11:29:43 -07:00
Zach Fox
f366743be7
Login; punctuationMode; new images
2017-08-30 11:07:03 -07:00
Zach Fox
1b48319a3f
Merge pull request #11267 from zfox23/commerce_zachsPunchlist1
...
Commerce: Zachs Punchlist 01
2017-08-30 10:10:56 -07:00
Zach Fox
6ee634b90a
Lock overlay on top of security image
2017-08-29 17:19:34 -07:00
druiz17
2a97257698
Merge pull request #11140 from ElderOrb/case6788
...
6788: You can deselect your current view mode
2017-08-29 17:15:51 -07:00
Zach Fox
5d1170c5d6
Only make message appear after inventory received
2017-08-29 16:17:59 -07:00
Zach Fox
a9c99854f9
Haven't purchased anything yet UI
2017-08-29 15:39:07 -07:00
Zach Fox
c7ad875485
Virtual keyboard and logic
2017-08-29 15:27:53 -07:00
Zach Fox
50241078ae
Buncha punchlist items checked off
2017-08-29 14:30:00 -07:00
beholder
180acbc188
6819 - Create button not disabled
2017-08-29 23:49:44 +03:00
beholder
a0a43ebf26
show checkbox or radiobutton dependently on exclusiveGroup presence
2017-08-29 23:23:16 +03:00
vladest
55eed37698
Start working on autocompletion
2017-08-29 20:47:09 +02:00
David Kelly
84126d8f95
cr feedback
2017-08-29 08:46:13 -07:00
David Kelly
67f25adac0
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay
2017-08-29 08:02:53 -07:00
David Kelly
a7af114144
fix wallet, use text from server in history (for now)
2017-08-28 17:04:19 -07:00
Zach Fox
22d3857501
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory
2017-08-28 15:10:17 -07:00
Zach Fox
37b6099f36
Hook up root_file_url
2017-08-28 12:46:01 -07:00
Zach Fox
1c1b841a86
Fix security images; actually do the right thing when wallet not set up
2017-08-28 12:18:53 -07:00
Atlante45
ca62e7168c
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake
2017-08-28 11:41:23 -07:00
Zach Fox
ceb38e261d
HMD Keyboard for purchases filterBar
2017-08-28 10:45:08 -07:00
David Kelly
3955624e63
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay
2017-08-28 10:13:21 -07:00
Zach Fox
ea00668725
Again to Another
2017-08-28 10:04:26 -07:00
Zach Fox
67f3b5c027
Remove quantity
2017-08-28 09:58:45 -07:00
Zach Fox
52cb1dd893
Correctly handle non-JSON items
2017-08-28 09:54:51 -07:00
Zach Fox
e293d122b1
Add security image to Checkout and Purchases
2017-08-28 09:33:30 -07:00
vladest
d8fb7300c3
Merge branch 'master' into tablet_login_button
2017-08-28 16:59:35 +02:00
vladest
d4332e7776
Adopting according comments from designers
2017-08-26 20:55:16 +02:00
vladest
7796946343
Merge branch 'master' into audio_devices_split
2017-08-26 20:00:00 +02:00
Zach Fox
4c16366562
Ints aren't floats, silly!
2017-08-25 16:55:50 -07:00
Zach Fox
50f7f91d4e
Close the loop.
2017-08-25 16:49:02 -07:00
Zach Fox
a03f9592c1
Inventory to Purchases
2017-08-25 16:34:48 -07:00
druiz17
06ab8ddbb2
Merge pull request #11251 from elisa-lj11/blocks
...
Blocks app accommodates updated Blocks website
2017-08-25 16:32:14 -07:00
Zach Fox
b1378816d5
Revert "MUCH faster filter!"
...
This reverts commit 5173774db0
2017-08-25 16:23:36 -07:00
Zach Fox
5173774db0
MUCH faster filter!
2017-08-25 16:15:07 -07:00
Zach Fox
ee8f5d6e7b
Filter
2017-08-25 16:08:32 -07:00
Zach Fox
d19377d2d4
Saving
2017-08-25 15:56:30 -07:00
Zach Fox
153c131482
Initial inventory progress
2017-08-25 15:28:35 -07:00
Atlante45
8a291f16ff
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake
2017-08-25 15:26:38 -07:00
Zach Fox
5487179a79
So much progress
2017-08-25 15:06:14 -07:00
David Kelly
b942faa60e
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay
2017-08-25 14:16:31 -07:00
David Kelly
f015ac3c68
get transaction history into qml
2017-08-25 13:55:38 -07:00
Zach Fox
dd9bb17791
Progress!
2017-08-25 12:13:51 -07:00
Zach Fox
e606e3dfb3
Squashed commit of the following:
...
commit 453897b9e2
2017-08-25 11:45:37 -07:00
Zach Fox
453897b9e2
Huge cleanup!
2017-08-25 10:56:53 -07:00
