Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-19 04:09:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85079 commits 25 branches 0 tags 1.1 GiB
Commit graph

3292 commits

Author SHA1 Message Date
Alexander Ivash
3c78ba0060 resolve constant switching between hover/no-hover for page indicator 2018-07-06 21:00:54 +03:00
Alexander Ivash
afc09c13b2 specify updated shadow params from Mukul 2018-07-06 21:00:54 +03:00
Alexander Ivash
99affb22f5 show spinner during avatar thumbnails loading 2018-07-06 21:00:54 +03:00
Alexander Ivash
567298b59b shadow for wearables indicator (based on mockups) 2018-07-06 21:00:54 +03:00
Alexander Ivash
6efcea2c27 adjust settings layout according to mockups, update style9 2018-07-06 21:00:54 +03:00
Alexander Ivash
b7614684de add check for duplicate names into 'create favorites dialog', style accordingly to mockups 2018-07-06 21:00:54 +03:00
Alexander Ivash
a26248e1d2 switch to regexp-based method of extracting marketplaceId from url 2018-07-06 21:00:54 +03:00
Alexander Ivash
1778e59142 blue version of TextStyle3 should only be used for avatar name under favorites 2018-07-06 21:00:54 +03:00
Alexander Ivash
a4a1ac5d12 The height of the “Take it off” button should be the same as “save” button 
“m” and “deg” should align with “Position” and “Rotation” text
The step size in degrees should be 1 degree
 2018-07-06 21:00:54 +03:00
Alexander Ivash
17acb5e106 when the user clicks on it should take the user to the marketplace info page of the avatar 2018-07-06 21:00:54 +03:00
Alexander Ivash
9f7fd3faa2 add slight animation on hover 2018-07-06 21:00:54 +03:00
Alexander Ivash
462d2d5d80 fix 'card moves rapidly between hover and non-hover' 2018-07-06 21:00:54 +03:00
Alexander Ivash
459a1906a5 make highlight border width 4 per request from Mukul 2018-07-06 21:00:54 +03:00
Alexander Ivash
bad7890c83 extract avatar name from url if empty 2018-07-06 21:00:54 +03:00
Alexander Ivash
c765730c5a use avatarUrl instead of avatarThumbnailUrl for comparison, as thumbnail url is calculated 2018-07-06 21:00:53 +03:00
Alexander Ivash
3520285079 remove debug code 2018-07-06 21:00:53 +03:00
Alexander Ivash
e740f494ce styling settings slider, adjust height of edit fields 2018-07-06 21:00:53 +03:00
Alexander Ivash
764dc6d156 add link to 'external avatar' dialog 2018-07-06 21:00:53 +03:00
Alexander Ivash
235b0e9f4d change icon for 'guy-in-circle' 2018-07-06 21:00:53 +03:00
Alexander Ivash
91e1714b0e external avatars support 2018-07-06 21:00:53 +03:00
Alexander Ivash
856c95b52a move avatarapp-specific images into appropriate subfolder 2018-07-06 21:00:53 +03:00
Alexander Ivash
3ac44376b2 bind Settings page to a backend 2018-07-06 21:00:53 +03:00
Alexander Ivash
1cc086f9c6 cleanup and bugfixing 2018-07-06 21:00:53 +03:00
Alexander Ivash
74bfea59cc reply => data 2018-07-06 21:00:53 +03:00
Alexander Ivash
bcb373618f navigation to market / my purchases from message dialog links 2018-07-06 21:00:53 +03:00
Alexander Ivash
4ce8e29d97 navigate to BodyMart / AvatarIsland on 'get avatars' / 'get wearables' 2018-07-06 21:00:53 +03:00
Alexander Ivash
3baa1a588f bound 'displayName' to backend, adjust font 2018-07-06 21:00:53 +03:00
Alexander Ivash
10f2fe5fe6 implement adding bookmark 
improve comparision of attachments/wearables
 2018-07-06 21:00:53 +03:00
Alexander Ivash
fe8bb3c8ea simplify code a bit 
explicite store attachments in model
use models for comparison instead JS Objects
 2018-07-06 21:00:53 +03:00
Alexander Ivash
47ffcf8c42 change logic for determining if current avatar is bookmarked & move to model 2018-07-06 21:00:53 +03:00
Alexander Ivash
512e72d6d1 integrate deleting favorite avatars with backend 2018-07-06 21:00:53 +03:00
Alexander Ivash
6ff397e9e0 move all messagebox-es into dedicated component 2018-07-06 21:00:53 +03:00
Alexander Ivash
d1bf80b50c update UI based on the latest zeplin mockups 2018-07-06 21:00:53 +03:00
Alexander Ivash
5ebe26887d updated text styles based on the latest zeplin specs 2018-07-06 21:00:53 +03:00
Alexander Ivash
51c8248463 introduce reverting avatar wearables on cancel 2018-07-06 21:00:53 +03:00
Alexander Ivash
9914a1d523 AdjustWearables: implement deleting/refreshing wearables/wearable 2018-07-06 21:00:52 +03:00
Alexander Ivash
b6769f9678 avatar selection & wearables adjustments work-on-progress 2018-07-06 21:00:52 +03:00
Alexander Ivash
57568d120e attempt to produce thumbnail url from marketId (works only partially), move model population code to model 2018-07-06 21:00:52 +03:00
Alexander Ivash
566074c86f use slider from ui-toolkit (per request from Mukul) 2018-07-06 21:00:52 +03:00
Alexander Ivash
de81f30407 page indicators styling 2018-07-06 21:00:52 +03:00
Alexander Ivash
4fa72eab6d show real wearables from avatar in combobox 2018-07-06 21:00:52 +03:00
Alexander Ivash
245ab7a309 explicitely specify 'getMoreAvatars', otherwise QML starts complaining about not-existing property 2018-07-06 21:00:52 +03:00
Dante Ruiz
ce3015662e backend integration from Dante 
* adding some functionality to avatar bookmarks
* saving work
 2018-07-06 21:00:52 +03:00
Alexander Ivash
5007c259bb query real avatar favorites (but use fake urls for now) 2018-07-06 21:00:52 +03:00
Alexander Ivash
6059ef2904 a few updates to adjust wearables & settings pages 2018-07-06 21:00:52 +03:00
Alexander Ivash
4bb517f620 reimplement 'text input with pencil' based on QQC2 TextField 2018-07-06 21:00:52 +03:00
Alexander Ivash
00b54c3f46 disable hover effect for selected avatar 2018-07-06 21:00:52 +03:00
Alexander Ivash
7723d0f306 turn all input controls to uit-based 2018-07-06 21:00:52 +03:00
Alexander Ivash
cdc9a325eb use standard radiobuttons with light color scheme 2018-07-06 21:00:52 +03:00
Alexander Ivash
d3848ea0c5 spelling issue fix 2018-07-06 21:00:52 +03:00
Alexander Ivash
34693a8562 use correct overlay for avatars in management state 2018-07-06 21:00:52 +03:00
Alexander Ivash
3acde99587 hide 'get all avatars' while in 'manage' state 2018-07-06 21:00:52 +03:00
Alexander Ivash
f8917a835a hide page indicator when only one page 2018-07-06 21:00:52 +03:00
Alexander Ivash
1916df6c81 specify border radius for 'get more avatars' 2018-07-06 21:00:52 +03:00
Alexander Ivash
8a5abb32a7 rework avatar selection logic based on changed requirements: selecte avatar always goes to the beginning of the list, selected page auto-switches to the first one 2018-07-06 21:00:52 +03:00
Alexander Ivash
bdacd1b792 left-to-right layout in favorites grid 2018-07-06 21:00:52 +03:00
Alexander Ivash
10e5f03f5e move selected avatar to the beginning of the page 2018-07-06 21:00:52 +03:00
Alexander Ivash
e0a8d90141 adjust link icon size 2018-07-06 21:00:52 +03:00
Alexander Ivash
3d4fb2d368 fix spelling error 2018-07-06 21:00:52 +03:00
Alexander Ivash
4d2a37aff2 show add to favorites on clicking star 2018-07-06 21:00:51 +03:00
Alexander Ivash
bd48ff9ee6 remove link glyph rotation 2018-07-06 21:00:51 +03:00
Alexander Ivash
c54b2c8f26 adjust avatar thumbnail image radius 2018-07-06 21:00:51 +03:00
Alexander Ivash
bd719286d8 move highlight under the green wearable indicator, use internal highlight of ShadowImage instead of extra Rectangle 2018-07-06 21:00:51 +03:00
Alexander Ivash
8a8f599583 rounded avatar images 2018-07-06 21:00:51 +03:00
Alexander Ivash
1ddfc87396 wip on avatarapp 2018-07-06 21:00:51 +03:00
Seth Alves
c0e1e9c23a
Merge pull request #13353 from vladest/address_dialog_focus_fix 
Remove extra textfield fro address bar input
 2018-07-06 09:00:00 -07:00
Thijs Wenker
c583c07d9c Merge branch 'feat/create/interactive-window' into feat/create/native-windows 
# Conflicts:
#	scripts/system/libraries/entityList.js
#	scripts/system/particle_explorer/particleExplorerTool.js
 2018-07-03 18:47:38 +02:00
Dante Ruiz
603ab87c47 fix configuration page 2018-07-02 14:38:16 -07:00
Zach Fox
c95b359aa7 Fix MS16390: Correctly update UI when Buy endpoint fails 2018-07-02 10:23:53 -07:00
vladest
0f1312ab9b Merge branch 'master' into address_dialog_focus_fix 2018-06-29 19:41:26 +02:00
Thijs Wenker
7fe9365a76 create app - native windows 2018-06-28 19:12:03 +02:00
John Conklin II
040978830a
Merge pull request #13413 from Atlante45/fix/audio-starve 
Fix audio device sometimes being on the wrong thread
 2018-06-28 09:59:00 -07:00
r3tk0n
f36ba49fbd
Update TabletGeneralPreferences.qml 
Fixed a typo
 2018-06-27 16:30:38 -07:00
r3tk0n
d6684e5ef7 Re-add mouse sensitivity option to tablet. 2018-06-27 16:23:40 -07:00
r3tk0n
c80ab0d237 Re-added mouse sensitivity settings to General Preferences dialog. 2018-06-27 16:10:07 -07:00
Howard Stearns
5fe7b874a4
Merge pull request #13455 from howard-stearns/test-wearables 
16089: test wearables for wear before gifting and wearing
 2018-06-25 16:44:53 -07:00
Zach Fox
3ceb9ddee9
Merge pull request #13444 from zfox23/MS16074_16076_banklinks 
Fix MS16074, MS16076: Fix links to Go To BankOfHighFidelity
 2018-06-25 13:47:08 -07:00
howard-stearns
43cba68cd2 test wearables for wear before gifting and wearing 2018-06-25 13:40:45 -07:00
Zach Fox
6fce6431a3 Fix MS16088: Prevent long usernames from overlapping HFC logo in Wallet Home 2018-06-22 16:09:49 -07:00
Zach Fox
25f22326a8 Fix MS16074, MS16076: Fix links to Go To BankOfHighFidelity 2018-06-22 15:43:16 -07:00
Atlante45
4a4c0d132e Make stereo interface async 2018-06-18 17:26:29 -07:00
Zach Fox
ad1da3e225 Fix MS16012: Correct the criteria used to determine empty txn history 2018-06-18 14:26:46 -07:00
vladest
41dad71634 Merge branch 'master' into address_dialog_focus_fix 2018-06-17 12:27:03 +02:00
howard-stearns
97fa22b69b fix concurrency drillDown 2018-06-15 16:57:21 -07:00
John Conklin II
2655dd77b6
Merge pull request #13368 from zfox23/MS15501_CreateModelKeyboard 
MS15501: Fix keyboard in Create -> Model in HMD
 2018-06-15 15:34:02 -07:00
Anthony Thibault
f2d6d0ee56
Merge pull request #13351 from ctrlaltdavid/21891 
Fix Avatar > Attachments joint and spinboxes
 2018-06-14 11:31:04 -07:00
John Conklin II
7057e00583
Merge pull request #13298 from danteruiz/fix-vive-configuration-page 
Controller Confguration Page fixes
 2018-06-14 11:07:26 -07:00
Dante Ruiz
dc28e8f03f fixing error 2018-06-13 18:24:06 -07:00
Dante Ruiz
eb01b50e6f making code review changes 2018-06-13 17:58:10 -07:00
Zach Fox
6b59b5b53c MS15501: Fix keyboard in Create -> Model in HMD 2018-06-13 13:23:43 -07:00
vladest
75ce8e56df Merge branch 'master' into address_dialog_focus_fix 2018-06-13 11:47:29 +02:00
howard-stearns
05d3f92867 drillDownToPlace and iStacked based on server data. 2018-06-12 13:18:44 -07:00
vladest
11129eddde Remove extra textfield fro address ber input 2018-06-12 18:48:41 +02:00
Stephen Birarda
10e34000aa
Merge pull request #13278 from SimonWalton-HiFi/tablet-popup-remains 
Domain-unreachable message remaining on slow connects
 2018-06-11 10:46:55 -07:00
David Rowe
0161015746 Fix setting avatar attachment joint 2018-06-11 15:31:42 +12:00
howard-stearns
020d622302 don't depend on matching handlers with overlapping requests 2018-06-09 17:34:49 -07:00
howard-stearns
421edbfa1e PSFListModel isa ListModel instead of hasa 2018-06-09 16:03:45 -07:00
howard-stearns
d68415c47c code feedback 2018-06-08 16:47:06 -07:00
howard-stearns
f0d486a6a5 remove the unused client-side stuff from model 2018-06-08 15:48:39 -07:00
howard-stearns
d9daa3495a remove comments / dead code 2018-06-08 15:36:10 -07:00
howard-stearns
36a0adf553 strip snapshot stacking code - we'll do it on server or not at all 2018-06-08 14:24:24 -07:00
howard-stearns
3ade31bdf6 always show edition 2018-06-08 12:57:40 -07:00
Zach Fox
9f0864944c Fix Friending in Connections tab - READ FIXME 2018-06-08 11:37:02 -07:00
Dante Ruiz
5d570f030f fixing calibration 2018-06-08 11:18:52 -07:00
howard-stearns
21ed081eae proper name for updated type filter of inventory endpoint 2018-06-08 09:52:11 -07:00
howard-stearns
64e466ee7d snapshot stacks 2018-06-07 21:10:40 -07:00
howard-stearns
595a0d8733 restore lost code 2018-06-07 19:24:05 -07:00
howard-stearns
348d5fc359 inventory text filter 2018-06-07 17:01:48 -07:00
howard-stearns
2761688d39 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-07 16:14:57 -07:00
howard-stearns
8b08505116 using filter/sort endpoint parameters 2018-06-07 16:14:18 -07:00
Zach Fox
f9b6e3e2ac
Merge pull request #13300 from zfox23/MS15582_PurchasesButtonClicks 
Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable
 2018-06-07 15:10:00 -07:00
howard-stearns
890c97e7cb Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-07 12:24:27 -07:00
David Back
ae5d056ca0
Merge pull request #13292 from dback2/fileChooser 
File Dialog Fixes
 2018-06-07 09:38:56 -07:00
howard-stearns
8185d1b5f5 cleanup and consistently don't getNextPage at beginning 2018-06-06 15:24:54 -07:00
howard-stearns
335aeaeb38 purchases cleanup, wearables, and edition numbers when multiples seen. 2018-06-05 17:06:08 -07:00
howard-stearns
6aa551b35c Don't getNextPage when at beginning (even if that is also the end). 2018-06-05 17:04:29 -07:00
howard-stearns
ce41b83bad Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-05 15:30:04 -07:00
Zach Fox
2932ce177d Fix MS15500: Ensure Connection usernames show up in PAL 2018-06-05 10:57:25 -07:00
howard-stearns
f72f8c762b goto client-side filtering (preliminary) 2018-06-04 16:52:20 -07:00
Zach Fox
c5ef5cfccb Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable 2018-06-04 16:13:18 -07:00
Dante Ruiz
f5e2a6834b fixing some issues 2018-06-04 16:09:31 -07:00
David Back
6b7d9586d1 apply fixes to other file dialogs and fix tablet dialog buttons 2018-06-04 15:56:10 -07:00
Dante Ruiz
48c0b7379a fix vive configuration page 2018-06-04 15:16:11 -07:00
howard-stearns
5a1b56d573 checkpoint with goto feeds working (but without filtering) 2018-06-04 13:11:06 -07:00
howard-stearns
e40fc20cb6 fix some bugs that had been introduced by various out-of-team prs. 2018-06-04 13:00:08 -07:00
howard-stearns
29b09d64e6 checkpoint with PAL working. 2018-06-01 13:33:45 -07:00
Simon Walton
7d1d7f7bcd Closing the open tablet dialog - try harder 2018-05-31 18:31:53 -07:00
howard-stearns
e8e12eef8f checkpoint 2018-05-31 14:42:52 -07:00
howard-stearns
b0d3729d4d Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-30 17:09:57 -07:00
howard-stearns
bdd38cef7a checkpoint 2018-05-30 17:09:13 -07:00
Wayne Chen
81eea5d8d1
Merge pull request #13213 from wayne-chen/filebrowser-case-14515 
Adding showHidden properties to file dialogs to allow for showing hidden files/folders
 2018-05-30 10:43:58 -07:00
howard-stearns
a84829392f Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-29 16:14:22 -07:00
howard-stearns
17be460adf checkpoint 2018-05-25 16:37:06 -07:00
howard-stearns
d30d84f1bd checkpoint that has two ways to do filtering 2018-05-25 15:30:27 -07:00
howard-stearns
235971f8bf checkpoint 2018-05-24 15:23:45 -07:00
Wayne Chen
345138f4ff Changing showHidden property to be always true 2018-05-23 10:30:08 -07:00
Wayne Chen
e3414c320e changing property to alias to reflect folderListModel 2018-05-22 11:03:31 -07:00
Wayne Chen
1774b401c8 allowing file dialogs to show hidden files/folders via showHidden property 2018-05-22 10:24:04 -07:00
Dante Ruiz
60dd7e49ab making requested changes 2018-05-18 16:41:39 -07:00
Dante Ruiz
2a6204ca8d remove option for mouse sensivtity 2018-05-16 15:47:55 -07:00
Zach Fox
bc590f556a Get first page 2018-05-16 14:43:43 -07:00
Zach Fox
97bb014734 Almost working for Purchases! 2018-05-16 13:20:23 -07:00
Zach Fox
0021af8714 Merge in in-progress changes from old commerce_paginationAndFiltering branch 2018-05-16 12:28:52 -07:00
Zach Fox
154d70866f It's working 2018-05-16 12:17:17 -07:00
Zach Fox
79f8232c14 Merge branch 'master' of github.com:highfidelity/hifi into PSFListModel 2018-05-16 11:11:24 -07:00
Dante Ruiz
37c51a7246 Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates 2018-05-16 10:41:40 -07:00
Dante Ruiz
e676348c4f fixing some menu reog bugs 2018-05-16 10:40:28 -07:00
vladest
72838f6d34 Implemented radio button preferences. Reimplemented snap smooth turn to radio buttons 2018-05-16 17:06:31 +02:00
vladest
5127cb0ea6 Merge branch 'master' into menu-updates 2018-05-16 14:37:00 +02:00
John Conklin II
a6cda2166a
Merge pull request #13158 from highfidelity/stable 
RC67.1 stable mergeback to master
 2018-05-15 14:01:06 -07:00
vladest
7ea6181520 Merge branch 'master' into menu-updates 2018-05-15 21:54:45 +02:00
Zach Fox
ccab2dd641 Starting the work 2018-05-15 11:48:33 -07:00
vladest
e2a8ee2a4c Fixed About date format. Increased space between logo and build info 2018-05-15 20:02:29 +02:00
vladest
a6ef459723 Open browser within Interface 2018-05-15 16:07:32 +02:00
vladest
fee3cc0aca Implemented backend for About dialog 2018-05-15 15:49:20 +02:00
vladest
58f04121b7 Correct link colors 2018-05-15 06:22:10 +02:00
Dante Ruiz
82422edb59 fixinig the controller settings page and have menu option on by default 2018-05-14 18:51:39 -07:00
vladest
2a3004079e About UI 2018-05-14 23:22:06 +02:00
Zach Fox
83cae54601 Show 'invalidated' label for valid = false 2018-05-14 13:34:20 -07:00
Zach Fox
2a1c2ba7b1 PurchasedItem logic 2018-05-14 09:54:05 -07:00
Zach Fox
81ebb681bb Show invalidated items in My Purchases 2018-05-14 09:35:34 -07:00
vladest
f8ebe7e669 remoed no more used LOD dialogs. Fixed Slider properties min and max settings 2018-05-12 16:01:43 +02:00
Anthony J. Thibault
0ac12fa317 Bug fix for Vive Tracker Calibration Settings 
This issue was inadvertently introduced by the name change of the Vive display plugin.
 2018-05-10 17:56:54 -07:00
vladest
62aa2df836 Merge branch 'master' into menu-updates 2018-05-10 10:36:38 +02:00
Zach Fox
22c26c348d MS14937: Fix Replace button for content sets during Checkout 2018-05-08 16:37:11 -07:00
Zach Fox
540f200b99 MS14937: Fix Replace button for content sets during Checkout 2018-05-08 16:34:28 -07:00
John Conklin II
286bed25bd
Merge pull request #13106 from zfox23/RC67_MS14758 
RC67: MS14758: Fix avatar reset when gifting worn avatar
 2018-05-07 10:10:41 -07:00
vladest
c7ab1f3dbf Merge branch 'master' into menu-updates 2018-05-05 20:48:40 +02:00
vladest
5a5bfcfe02 Merge branch 'master' into menu-updates 2018-05-05 07:11:39 +02:00
Zach Fox
4ebed7605c MS14758: Fix avatar reset when gifting worn avatar 2018-05-04 16:04:05 -07:00
John Conklin II
b314d496ec
Merge pull request #13103 from zfox23/MS14699_clearCachedPasscode 
MS14699: Prevent Wallet passcode from being sticky in certain cases
 2018-05-04 15:22:41 -07:00
Zach Fox
53fe0bc616 MS14699: Prevent Wallet passcode from being sticky in certain cases 2018-05-04 14:08:21 -07:00
Zach Fox
e48d39ec38 MS14758: Fix avatar reset when gifting worn avatar 2018-05-04 10:10:48 -07:00
Gabriel Calero
c15ef56d90 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-05-02 14:38:10 -03:00
vladest
ea66e04ab8 Removed unwanted code 2018-05-02 18:58:40 +02:00
vladest
aef62d09c7 Merge branch 'master' into menu-updates 2018-05-01 21:47:46 +02:00
vladest
617b49fe14 Added mouse sensivity UI. Reworked advanced movements. TODO: properties interface complitely broken in Tablet mode 2018-05-01 21:22:48 +02:00
Zach Fox
9b80c500e3
Merge pull request #13039 from zfox23/sideloadAppJson 
Enable sideloading .app.json Apps from local disk
 2018-04-30 11:14:24 -07:00
vladest
be22f49c32 Merge branch 'master' into menu-updates 2018-04-28 20:22:28 +02:00
Zach Fox
dbd7d7e2b4 Small cleanup 2018-04-27 14:19:58 -07:00
Zach Fox
ea716f2a1e Enable sideloading .app.json Apps from local disk 2018-04-27 14:08:53 -07:00
Zach Fox
c0fe504713
Merge pull request #13030 from zfox23/finalize_14295_14559 
Finalize work on MS14295 and MS14559
 2018-04-27 13:49:02 -07:00
Zach Fox
684d2b08ba Finalize work on MS14295 and MS14559 2018-04-27 12:03:54 -07:00
Howard Stearns
f8ad36afd0
Merge pull request #13028 from zfox23/updateCommerceFor67 
Allow gifting of Pending items; remove PoP verification rescheduling on Pending items
 2018-04-27 11:55:40 -07:00
Zach Fox
bbc15cdc63 Finalize work on MS14295 and MS14559 2018-04-27 11:04:46 -07:00
Zach Fox
c163ae63b8 Allow gifting of Pending items; remove PoP verification rescheduling on Pending items 2018-04-27 10:28:59 -07:00
Zach Fox
0f36fb113d Allow gifting of Pending items; remove PoP verification rescheduling on Pending items 2018-04-27 10:20:55 -07:00
Brad Hefta-Gaub
e4f5eb9cca
Merge pull request #13020 from zfox23/MS14295_GiftsUIFixes 
MS14295: Fix lingering Gifts UI Bugs
 2018-04-27 07:30:14 -07:00
Zach Fox
e3b14bf478 MS14295: Fix lingering Gifts UI Bugs 2018-04-26 15:57:37 -07:00
Zach Fox
fc324f67bd MS14559: Fix sometimes being unable to click on 'Nearby' orb when sending Gift/HFC 2018-04-26 15:09:53 -07:00
vladest
3296ae0db8 Merge branch 'master' into menu-updates 2018-04-26 22:21:40 +02:00
John Conklin II
236e75b6c6
Merge pull request #12903 from druiz17/add-more-hmd-data 
Get the correct device name connect to OpenVr
 2018-04-24 13:29:41 -07:00
vladest
2b716f051c Merge branch 'master' into menu-updates 2018-04-20 19:34:15 +02:00
vladest
0e28e41107 Fix various issues with SpinBox-es and Sliders 2018-04-20 19:15:29 +02:00
Gabriel Calero
adfbaac18f Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-19 19:40:00 -03:00
Gabriel Calero
f2184bf456 Handle android back button. Remove unused resources. Fix compilation errors. 2018-04-19 17:31:25 -03:00
vladest
ab1a89a6f9 Merge branch 'master' into menu-updates 2018-04-19 21:02:30 +02:00
Howard Stearns
6d151f022d
Merge pull request #12910 from zfox23/MS12217_letterboxMessageFix 
Only dismiss letterbox when clicking on grey areas
 2018-04-19 11:47:10 -07:00
Gabriel Calero
c8fe45eb8f Remove debug statements and unused code. Put JNI code in a separated file. 2018-04-19 11:41:59 -03:00
vladest
60d53359bb Fix Toolbar vertical position 2018-04-19 11:39:58 +02:00
Zach Fox
e01e7cc7bc Be a bit more efficient 2018-04-18 16:34:02 -07:00
vladest
7b21b36d3c Disable menu button in Toolbar mode 2018-04-18 22:19:54 +02:00
Dante Ruiz
9d6fc13a04 Merge branch 'master' of github.com:highfidelity/hifi into more-tablet-changes 2018-04-18 13:06:51 -07:00
Dante Ruiz
a65f5f7917 making tablet changes 2018-04-18 13:06:26 -07:00
vladest
b5071d28e8 Merge branch 'master' into menu-updates 2018-04-18 21:10:57 +02:00
vladest
cacb9359c2 Toolbar at bottom 2018-04-18 20:57:28 +02:00
vladest
c402cb2c19 Fix Desktop double windows 2018-04-17 19:51:43 +02:00
Zach Fox
93cf399fd6 Only dismiss letterbox when clicking on grey areas 2018-04-16 15:09:19 -07:00
Zach Fox
02aa8ac566 Bugfixes per QA 2018-04-16 11:53:37 -07:00
Gabriel Calero
e3b94b163c Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-16 14:55:16 -03:00
Zach Fox
071bf35683 Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018 2018-04-16 10:11:44 -07:00
Dante Ruiz
5af1ea54d3 Merge branch 'master' of github.com:highfidelity/hifi into add-more-hmd-data 2018-04-16 10:10:55 -07:00
vladest
6d53512c6c Merge 2018-04-15 15:24:16 +02:00
Gabriel Calero
476e1cf7ae Adjust UI with pixel perfect precision. Support devices with on-screen bars. 2018-04-12 17:59:38 -03:00
Seth Alves
46a741be7b
Merge pull request #12068 from vladest/move_to_qqc2 
Move to qqc2
 2018-04-12 11:26:55 -07:00
John Conklin II
213c35dab4
Merge pull request #12790 from WolfGangS/bugfix/12759-editoverlay-subimage 
Bugfix for #12759 Overlays.editOverlay not applying subImage property
 2018-04-12 10:34:17 -07:00
Gabriel Calero
865e3a05f1 Move jump button to the right. Adjust position of buttons 2018-04-11 19:33:43 -03:00
Gabriel Calero
8010fd2420 New view selector behaviour. Update icons 2018-04-11 18:43:39 -03:00
Gabriel Calero
578012b662 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-11 16:30:53 -03:00
Zach Fox
0c9d65bc15
Merge pull request #12758 from zfox23/commerce_fixCertificateInfoError 
Commerce: Fix Certificate Info error
 2018-04-11 09:38:43 -07:00
Zach Fox
a2f5891a0b Cleanup 'Private' HMD Preview State Machine Logic 2018-04-10 16:00:18 -07:00
Zach Fox
ffab27d442 Commerce: Fix Certificate Info error 2018-04-10 15:54:55 -07:00
Zach Fox
a9b9a1cb10 Commerce: Gifts 2018-04-10 15:54:19 -07:00
Clément Brisset
c62a701a2d
Merge pull request #12838 from highfidelity/RC66 
RC66 merge back to master
 2018-04-09 13:17:12 -07:00
Gabriel Calero
e85f5c97dc Remove bottom bar. Apply new design for android 2018-04-09 11:41:00 -03:00
Alexander Ivash
faddc556d7 FB14015 - Go To app does not close when selecting forward and back arrows on desktop 2018-04-07 17:57:22 +03:00
Zach Fox
0c48ccefa4 Clean up failResponse to make it better 2018-04-06 11:41:17 -07:00
Zach Fox
af5a68b282 Merge branch 'master' of github.com:highfidelity/hifi into commerce_fixCertificateInfoError 2018-04-06 10:58:32 -07:00
Gabriel Calero
15163f5e87 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-04 19:25:20 -03:00
WolfGang
787127b149 move subImage recalculation to it's own method 2018-04-04 22:10:54 +01:00
Howard Stearns
3a428bc44f
Merge pull request #12776 from zfox23/fixHmdPreviewAgain_1 
Fix 'Private' HMD preview texture enable/disable...again
 2018-04-04 10:03:18 -07:00
WolfGang
f9bcd23463 make subimage update the image anchors 2018-04-04 17:28:55 +01:00
Seth Alves
2df334c50e
Merge pull request #12663 from ElderOrb/FB12870 
Fix for not updating checkbox state on 'baking' / 'unbaking'.
 2018-04-04 09:03:03 -07:00
Zach Fox
f20eddefc8 Fix 'Private' HMD preview texture enable/disable...again 2018-04-03 13:46:02 -07:00
Gabriel Calero
78c50410b3 Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash 2018-04-03 14:37:19 -03:00
Zach Fox
5441767442 Better cert display 2018-04-02 12:22:41 -07:00
Gabriel Calero
2ff13270ed Go back to GoTo screen 2018-04-02 12:22:21 -03:00
Zach Fox
32e5e9986f Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation 2018-03-30 10:10:43 -07:00
Alexander Ivash
814cfa4587 fix TabletAssetServer 2018-03-30 00:09:28 +03:00
Alexander Ivash
e5da59a62f FB12870 - Tablet UI ->Asset Browser unresponsive when enabling/disabling "use baked version" 2018-03-29 23:01:59 +03:00
Liv Erickson
387ff680d5 support deleted scenario 2018-03-28 18:12:30 -07:00
Liv Erickson
b78f00342e Merge branch 'master' of github.com:highfidelity/hifi into feat/disable-add-without-url 2018-03-28 17:53:42 -07:00
vladest
70ce1b2bf7 Fix invalid scrolling detection 2018-03-28 21:48:44 +02:00
Cristian Luis Duarte
f0bcaa47c8 Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera 2018-03-28 16:47:21 -03:00
Zach Fox
0175028a88 Ensure location is correctly updated when replacing set from Checkout page 2018-03-28 11:31:51 -07:00
vladest
001b6d23ff Merge branch 'master' into move_to_qqc2 2018-03-28 20:16:26 +02:00
Zach Fox
ca2fba675d Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation 2018-03-28 10:28:32 -07:00
John Conklin II
586fb4829c
Merge pull request #12637 from druiz17/fix-asset-server-qml 
Fix asset server qml sorting
 2018-03-28 09:35:53 -07:00
Seth Alves
46fb2033f2
Merge pull request #12574 from druiz17/remap-keybaord 
changing keyboard mapping
 2018-03-27 19:00:05 -07:00
Dante Ruiz
ad9ca0da20 fix tablet version 2018-03-27 16:03:06 -07:00
John Conklin II
a258a330d3
Merge pull request #12676 from druiz17/fix-keyboard 
fixing AddressManager keyboard when switching domains
 2018-03-27 15:34:23 -07:00
vladest
096b56395e Fix crash on startup 2018-03-27 18:22:56 +02:00
Zach Fox
db2f3451bd Support .content.zip content sets 2018-03-26 16:20:29 -07:00
Zach Fox
bf48ecda6d Fix cert location for content sets 2018-03-26 14:48:05 -07:00
Zach Fox
a588776b47 Fix infinite loading when authing wallet during Checkout 2018-03-26 13:19:40 -07:00
Dante Ruiz
b8796db1e5 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-26 09:13:58 -07:00
Cristian Luis Duarte
6cb5cd7f92 Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera 2018-03-26 11:19:42 -03:00
vladest
56150f8962 Merge branch 'master' into move_to_qqc2 2018-03-24 15:34:49 +01:00
vladest
aefda9ef71 Merge branch 'master' into move_to_qqc2 2018-03-24 15:32:04 +01:00
Cristian Luis Duarte
686af4ff77 Clean code that manually checked for windows coordinates to disable radar touch 2018-03-23 20:02:51 -03:00
Cristian Luis Duarte
242b009562 Android - Use mouse events for interacting with UI. Now LoginDialog UI interation does not move radar camera. Remove repeated tooggle call in audio.js. Adapt button to simulated mouse events. 2018-03-23 18:59:55 -03:00
John Conklin II
563ff61325
Merge pull request #12661 from SamGondelman/android 
Android: Stats, disable IK, reduce impact of InputRecorder
 2018-03-23 11:08:50 -07:00
Dante Ruiz
1d17658c80 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-22 16:29:16 -07:00
Howard Stearns
113670e33b
Merge pull request #12638 from zfox23/commerce_upgrades_1 
Commerce: Item Updates!
 2018-03-22 15:40:22 -07:00
Liv Erickson
1244559618 remove spaces for clean-ness 2018-03-22 15:37:12 -07:00
Liv Erickson
0647155c30 re-add experimental image removal 2018-03-22 15:33:23 -07:00
Liv Erickson
f62e1ed54e disable add button on model until text is entered 2018-03-22 15:29:41 -07:00
Sam Gondelman
bbded2215d
Merge pull request #12665 from gcalero/android_bottombar_resize 
Android - Resize bottombar after window size changes (to always fill …
 2018-03-22 11:15:02 -07:00
Dante Ruiz
86cd5ffa30 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-21 08:49:25 -07:00
Zach Fox
0b810c3aa8 Various fixes 2018-03-19 14:39:50 -07:00
Zach Fox
18aa95e0bb New Checkout flow for updating specific Editions 2018-03-19 13:35:27 -07:00
Dante Ruiz
652faaa116 fixing AddressManager keyboard when switching domains 2018-03-16 16:32:37 -07:00
Dante Ruiz
1dcdcffa69 hopefully the last fix 2018-03-16 13:52:08 -07:00
Zach Fox
eb8cfcd8e9 Bugfix 2018-03-16 13:13:38 -07:00
Zach Fox
ad33e775f1 Fix bottom anchor for listView when banner is showing 2018-03-16 11:28:03 -07:00
Cristian Luis Duarte
e6a8b322b1 Android bottom bar - remove extra semicolon 2018-03-16 15:15:00 -03:00
Cristian Luis Duarte
18682d854c Android bottom bar - Put height up at the top of the Item definition it's clearer where relocateAndResize gets its height from 2018-03-16 15:06:12 -03:00
Cristian Luis Duarte
79ff2df860 Android - Resize bottombar after window size changes (to always fill the screen horizontally) 2018-03-16 13:03:50 -03:00
SamGondelman
0fa73c73ce stats 2018-03-15 16:05:46 -07:00
Zach Fox
eb2f8aa169 New notification flow for item updates 2018-03-15 16:03:49 -07:00
David Rowe
a7cd5a240a Fix "text" overlay not clipping to right and bottom margins 2018-03-15 17:31:02 +13:00
Zach Fox
2d57c444b6 Don't auto apply 'updatable' filter 2018-03-14 16:02:33 -07:00
Zach Fox
cc4726b24b Some bugfixes 2018-03-14 15:47:19 -07:00
Zach Fox
f3efdda6b0 Fix content set filter 2018-03-14 14:34:15 -07:00
Zach Fox
6647475f5c Wrong sign 2018-03-14 11:19:55 -07:00
Zach Fox
74e24ec289 Final touches? 2018-03-14 10:58:18 -07:00
Zach Fox
70b3d0fe5f Merge branch 'filterBar' into commerce_upgrades_1 2018-03-14 09:53:02 -07:00
Zach Fox
98cdbbb3e6 Small update to dot before merging in filterBar 2018-03-14 09:45:42 -07:00
Dante Ruiz
d6b3e91de1 removing debug statement 2018-03-14 09:35:22 -07:00
Dante Ruiz
2fb1fbe027 fix sorting 2018-03-14 09:17:22 -07:00
Zach Fox
e2326a3733 Initial work for 'messages waiting' light 2018-03-13 17:05:16 -07:00
Dante Ruiz
2d85669b08 fix backedColumn width 2018-03-13 16:30:43 -07:00
Zach Fox
882e4d6b45 Parse the string that comes from the backend 2018-03-13 15:13:41 -07:00
Zach Fox
7b6b08fd26 Upgrade specific edition 2018-03-13 13:51:10 -07:00
Zach Fox
f42255f46b Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-13 13:42:42 -07:00
Zach Fox
86115a8578 Merge branch 'master' of github.com:highfidelity/hifi into filterBar 2018-03-13 13:42:13 -07:00
Zach Fox
5563edd957 Focus fix; Switch to QQC2 2018-03-13 13:11:59 -07:00
Zach Fox
50e709c738 Add updates; drop shadow 2018-03-13 12:13:14 -07:00
vladest
d41dd1b18d Merge branch 'master' into move_to_qqc2 2018-03-13 19:28:51 +01:00
Dante Ruiz
00fa5cfd06 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-13 10:08:00 -07:00
Dante Ruiz
f521a129b6 fixing issues 2018-03-13 10:07:34 -07:00
Zach Fox
bce7fb1ff1 Improvements 2018-03-12 16:54:10 -07:00
Zach Fox
9c7d857ecb Fix some focus issues 2018-03-12 16:15:50 -07:00
Zach Fox
f1121db4da It's working! 2018-03-12 15:54:11 -07:00
Zach Fox
db7eea543e Initial progress 2018-03-12 15:11:09 -07:00
SamGondelman
9953e7051f Merge remote-tracking branch 'upstream/master' into android 2018-03-12 14:15:31 -07:00
SamGondelman
4bef033d6f cleanup, don't compress rcc file to fix corruption 2018-03-12 13:05:03 -07:00
Alexia Mandeville
8c9c7248d4 Reorganize of menu action items as well as QML categories 2018-03-12 12:52:12 -07:00
vladest
fe5d7463fe Merge branch 'master' into move_to_qqc2 2018-03-10 14:42:51 +01:00
John Conklin II
42a686ad93
Merge pull request #12578 from druiz17/use-correct-audio-api 
use correct scripting api  for audio in Audio.qml
 2018-03-09 13:41:20 -08:00
Dante Ruiz
e21c4988fb stereo checkbox text change 2018-03-09 10:11:25 -08:00
Dante Ruiz
3a39fca268 made requested changes 2018-03-09 10:09:51 -08:00
John Conklin II
6969f014fc
Merge pull request #12601 from howard-stearns/clear-wallet-when-picking-a-new-one 
clear wallet when picking a new one
 2018-03-09 10:09:41 -08:00
John Conklin II
407dfec342
Merge pull request #12603 from howard-stearns/RC65-clear-wallet-when-picking-a-new-one 
clear wallet when picking a new one
 2018-03-09 10:09:24 -08:00
Zach Fox
2b137f94a6
Merge pull request #12596 from zfox23/fixFontsAgain 
Fix font loading for MacOS via completely different font loading method
 2018-03-09 09:49:56 -08:00
Dante Ruiz
c49d0557fc fixing check box issues 2018-03-09 09:29:37 -08:00
Dante Ruiz
8703e9e002 Merge branch 'master' of github.com:highfidelity/hifi into use-correct-audio-api 2018-03-09 08:42:50 -08:00
Atlante45
69fb830480 Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-08 17:23:17 -08:00
Zach Fox
c22d79041d Cleanup after cherry-pick 2018-03-08 14:35:56 -08:00
howard-stearns
883528488c clear wallet when picking a new one 2018-03-08 14:35:43 -08:00
Zach Fox
747a6b07ce Fix font loading for MacOS via different font loading method 2018-03-08 14:31:48 -08:00
howard-stearns
9d805283d1 clear wallet when picking a new one 2018-03-08 14:24:44 -08:00
Zach Fox
086431d0e7 Merge branch 'master' of github.com:highfidelity/hifi into fixFontsAgain 2018-03-08 13:50:19 -08:00
Dante Ruiz
9f246ea314 Merge branch 'master' of github.com:highfidelity/hifi into use-correct-audio-api 2018-03-08 13:04:02 -08:00
Zach Fox
4df58f1e67 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-08 12:58:08 -08:00
NissimHadar
fda32e4aa4 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-08 12:16:36 -08:00
Zach Fox
a479439b23
Merge pull request #12572 from zfox23/sendMoney_connectionInstructions 
Show Connection instructions in Send Money when 0 connections
 2018-03-08 11:20:23 -08:00
Zach Fox
d0cc64f63d Fix font loading for MacOS via different font loading method 2018-03-08 11:19:49 -08:00
Sam Gondelman
1e9cfe29f2
Merge pull request #12388 from highfidelity/android 
Android Tip
 2018-03-08 10:18:35 -08:00
Zach Fox
a0eb7e0712 Don't default unknown Marketplace item types to 'Entity' 2018-03-07 15:01:12 -08:00
Zach Fox
d71fc22ed8 Support argument to available_updates endpoint 2018-03-07 14:06:29 -08:00
Zach Fox
eded8586a5 Use correct backend terminology 2018-03-07 13:40:55 -08:00
Zach Fox
0285bf9379 purposeful incorrect indentation to prevent insane diff 2018-03-07 13:27:40 -08:00
Zach Fox
a2eb13b70b Prevent logspam 2018-03-07 13:23:13 -08:00
Zach Fox
08b2be85d2 Don't pass isUpdating around 2018-03-07 11:44:54 -08:00
Zach Fox
d07d02b2bc Take certID from backend instead of query params; Better loading; Uninstall app before updating 2018-03-07 11:10:47 -08:00
Zach Fox
91e0af9b46 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-07 10:16:10 -08:00
Zach Fox
b764a4d404 Filter out invalid purchases 2018-03-07 09:22:57 -08:00
Dante Ruiz
13767beece Caps change 2018-03-07 08:19:36 -08:00
Cristian Luis Duarte
bde2ba9272 Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed 2018-03-06 22:02:23 -03:00
NissimHadar
d72f46ec3e Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-06 16:24:53 -08:00
Zach Fox
04a230c20f
Merge pull request #12491 from ElderOrb/FB12523 
fix for not re-enabling preview on leaving security-sensitive pages in marketplace
 2018-03-06 16:19:39 -08:00
Dante Ruiz
97d283cc5f use correct api call for audio and correct function call to set stereo input mode 2018-03-06 16:17:27 -08:00
NissimHadar
dbf1be5de3 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-06 15:22:40 -08:00
Zach Fox
48aa862c16 Show Connection instructions in Send Money when 0 connections 2018-03-06 13:52:42 -08:00
Alexander Ivash
53e1a0cae5 forward 'maybeEnableHmdPreview' if control is not visible 2018-03-06 22:25:35 +03:00
Zach Fox
ee28983334 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-06 11:13:40 -08:00
vladest
86b9e1b873 Merge branch 'master' into move_to_qqc2 2018-03-06 13:40:51 +01:00
Zach Fox
35b23cc954 It's working! 2018-03-05 15:54:17 -08:00
John Conklin II
7bc3848c36
Merge pull request #12533 from druiz17/stereo-checkbox 
Adding Stereo checkbox in Audio settings
 2018-03-05 12:45:01 -08:00
Brad Davis
8bfc610cfb Merge remote-tracking branch 'upstream/master' into android 2018-03-05 11:48:58 -08:00
Zach Fox
4046c873bd Still need to send correct thing to metaverse 2018-03-05 11:24:59 -08:00
Zach Fox
f5a8187fe2 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-05 10:01:55 -08:00
Zach Fox
f10f9aa939 Continued progress 2018-03-05 10:01:40 -08:00
vladest
148faa3a93 Merge branch 'master' into move_to_qqc2 2018-03-04 14:16:21 +01:00
NissimHadar
8536b44c61 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-02 16:09:06 -08:00
Zach Fox
f53aba2a32 Initial progress 2018-03-02 15:53:06 -08:00
John Conklin II
8f403ebc23
Merge pull request #12543 from zfox23/improveFontLoading 
Improve font loading via QRC instead of file path
 2018-03-02 14:22:17 -08:00
Dante Ruiz
7ce13a3ce7 adding comment 2018-03-02 11:06:28 -08:00
Dante Ruiz
55d8cfd4c1 make sure dont make audio devices that don't use stereo use stereo 2018-03-02 10:56:44 -08:00
NissimHadar
000b08f7c0 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-02 08:07:01 -08:00
Sam Gateau
88ecfe7895
Merge pull request #12464 from jherico/android_dev 
Android Master
 2018-03-01 17:22:34 -08:00
NissimHadar
0f2cf8ea85 Re-implemented shadow controls. 2018-03-01 14:24:20 -08:00
Dante Ruiz
4b572eda6b changing Name 2018-03-01 11:05:40 -08:00
Dante Ruiz
8cae20f53d adding stereo checkbox to audio settings 2018-03-01 11:03:18 -08:00
Zach Fox
877fa52034 Merge branch 'master' of github.com:highfidelity/hifi into improveFontLoading 2018-03-01 10:14:23 -08:00
John Conklin II
1e1836c009
Merge pull request #12502 from elisa-lj11/2dimages-update 
Image entity has correct orientation and is collisionless
 2018-03-01 09:57:08 -08:00
Dante Ruiz
95e14446dd update qml file to show the current OpenVr headset 2018-03-01 09:03:52 -08:00
vladest
02612e0465 cleanup and fits text to buttons 2018-03-01 11:18:18 +01:00
vladest
f51025061c Make Edit view more consistant with original one #2 2018-03-01 11:03:56 +01:00
vladest
7cbdbe9ab0 Make Edit view more consistant with original one 2018-03-01 11:02:05 +01:00
Zach Fox
67034274fa Improve font loading by using QRC instead of relative paths 2018-02-28 17:59:37 -08:00
Cristian Luis Duarte
9acb83632c Android - Make joystick move up when showing the bottom bar 2018-02-28 18:52:13 -03:00
Cristian Luis Duarte
55d52f92df Android - Make Joystick appear always when possible (not in radar mode and when not hidden by some windows) 2018-02-28 15:55:50 -03:00
vladest
531c4dc41d Merge branch 'master' into move_to_qqc2 2018-02-28 11:40:46 +01:00
Brad Davis
136ced98c3 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-27 13:44:00 -08:00
Howard Stearns
1fb0f898b4
Merge pull request #12505 from howard-stearns/wallet-help 
new wallet help
 2018-02-27 13:18:36 -08:00
Howard Stearns
0e4f3460b3
Merge pull request #12497 from howard-stearns/end-seeding 
End seeding
 2018-02-27 13:18:13 -08:00
howard-stearns
30896c264b reduced text 2018-02-27 12:04:41 -08:00
howard-stearns
53b976b400 fix typo in bank href 2018-02-27 11:46:06 -08:00
SamGondelman
0fca56eef0 Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" 
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
 2018-02-27 11:33:05 -08:00
howard-stearns
053640f216 a guess a linking bank 2018-02-27 08:36:45 -08:00
howard-stearns
ce0ae61947 Merge branch 'master' of https://github.com/highfidelity/hifi into wallet-help 2018-02-27 08:10:17 -08:00
vladest
90b891dbc3 Fix push issue due to merge errors 2018-02-27 16:42:30 +01:00
vladest
6a5fe0d513 Merge branch 'master' into move_to_qqc2 2018-02-27 15:23:52 +01:00
Clément Brisset
2a7a71db13
Merge pull request #12477 from Atlante45/new-master 
Merge stable back into master
 2018-02-26 17:18:24 -08:00
howard-stearns
eb683d4793 mail is a link 2018-02-26 17:09:33 -08:00
howard-stearns
2f6e2f6b84 new wallet help 2018-02-26 16:52:41 -08:00
Elisa Lupin-Jimenez
b56c78d36c image has correct orientation and is collisionless 2018-02-26 14:44:46 -08:00
Zach Fox
0802bd2c21 Fix going to marketplace main page from WalletChoice 2018-02-26 14:27:59 -08:00
Brad Davis
b9387f2a21 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-26 13:18:14 -08:00
Zach Fox
8223ebf393 Correctly handle referrer from WalletChoice 2018-02-26 12:44:41 -08:00
howard-stearns
4e4aebc7ee get WalletChoice setup flow from My Purchases and confirmation. Still 
not correct referrer.
 2018-02-26 12:02:56 -08:00
John Conklin II
4feea929ce
Merge pull request #12449 from misslivirose/fix/atp-collisions 
change default add to world shape for asset browser
 2018-02-26 11:15:01 -08:00
howard-stearns
2de72c125d Merge branch 'master' of github.com:highfidelity/hifi into end-seeding 2018-02-26 10:54:22 -08:00
John Conklin II
e586a35d38
Merge pull request #12489 from vladest/fix_table_sort_indicator 
Make sure sort indicator is attached to the right of title
 2018-02-26 10:33:27 -08:00
howard-stearns
a5cedde3c8 Merge branch 'master' of github.com:highfidelity/hifi into end-seeding 2018-02-26 10:33:03 -08:00
John Conklin II
3201d2ba21
Merge pull request #12407 from NissimHadar/shadowControlsOffZvork 
Shadow control for zones, models and shapes
 2018-02-26 10:13:40 -08:00
howard-stearns
30a6cca4b3 Merge branch 'master' of github.com:highfidelity/hifi into end-seeding 2018-02-26 09:26:09 -08:00
howard-stearns
dee3df5299 remove debugging 2018-02-25 15:26:18 -08:00
howard-stearns
300f611c47 working, with soft reset 2018-02-25 14:06:06 -08:00
vladest
62f2ba0dad More intellectual calculation of title positions taking in account actual sort indicator glyph size 2018-02-24 09:32:08 +01:00
vladest
b1070f85f0 Merge branch 'master' into move_to_qqc2 2018-02-24 02:59:40 +01:00
howard-stearns
726c1ed816 receiveAt with new key 2018-02-23 17:05:46 -08:00
Zach Fox
fe515e949b New UI for new HFC users 2018-02-23 16:36:20 -08:00
Zach Fox
cc98eb6424 Fix lightbox stuck 2018-02-23 16:14:42 -08:00
howard-stearns
f66e688f41 Merge branch 'master' of github.com:highfidelity/hifi into end-seeding 2018-02-23 16:12:41 -08:00
howard-stearns
53614a1d9f almost working 2018-02-23 16:12:01 -08:00
Zach Fox
47b25740de Update commerceLightBox 2018-02-23 15:23:51 -08:00
howard-stearns
34253082d4 always reset when asked 2018-02-23 15:11:08 -08:00
Zach Fox
432e647f7a Fix 'What's This' link 2018-02-23 15:08:33 -08:00
howard-stearns
3c2626894c fixes 2018-02-23 14:54:03 -08:00
howard-stearns
050df2ac2a merge 2018-02-23 14:46:13 -08:00
Zach Fox
9b54ab1080 UI changes, V1 2018-02-23 14:42:05 -08:00
howard-stearns
09091d29f7 more logic framework 2018-02-23 14:35:30 -08:00
howard-stearns
84f9bff330 basic element, but not pretty and not functioning 2018-02-23 13:56:56 -08:00
Brad Davis
0550138609 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-23 12:48:10 -08:00
Alexander Ivash
f9de255fa7 FB12523 - HMD: Commerce specific disabled preview is not dismissed when user leaves page without entering credentials 2018-02-23 20:07:09 +03:00
Bradley Austin Davis
12d1885dff
Merge pull request #12428 from gcalero/android_ui_fixes 
Android ui fixes
 2018-02-22 18:28:18 -08:00
Brad Davis
aeb29db37d Merge remote-tracking branch 'upstream/stable' into android_stable 2018-02-22 17:35:00 -08:00
Zach Fox
249f0568a1 New loader 2018-02-22 17:14:23 -08:00
howard-stearns
1aaae94cc1 checkpoint 2018-02-22 17:04:27 -08:00
Zach Fox
e3ccfc9935 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_apps 2018-02-22 16:39:26 -08:00
Zach Fox
f14673bc50 Fixup Checkout for apps 2018-02-22 16:38:38 -08:00
Zach Fox
33f73fef0d YAY! 2018-02-22 16:26:35 -08:00
Zach Fox
10fa3fa346 It's working! 2018-02-22 16:09:01 -08:00
John Conklin II
730dce31e3
Merge pull request #12444 from zfox23/commerce_extendedCerts_1 
Commerce: Extended Certificate Support, V1
 2018-02-22 15:19:57 -08:00
Atlante45
7bad82818b Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-02-22 14:45:41 -08:00
Zach Fox
de0eee52d6 cool 2018-02-22 14:45:32 -08:00
Zach Fox
4d2d7fa51f lots of fun initial progress! 2018-02-22 13:56:46 -08:00
NissimHadar
c6580f642a Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-22 13:45:00 -08:00
Zach Fox
3d4e6de6ab Quick bugfix 2018-02-22 10:49:11 -08:00
Liv
478ec48b63
Merge pull request #12463 from misslivirose/fix/edit-bugs 
Fix two bugs with Create Menu
 2018-02-22 09:43:50 -08:00
Zach Fox
90f05f4db7 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-22 09:23:49 -08:00
vladest
7d7c3bb1f5 Change new material dialog to QQC2 2018-02-22 10:30:42 +01:00
Liv Erickson
aba1cae36d get rid of magic number 2018-02-21 16:19:50 -08:00
Liv Erickson
990e848de6 fix typo that was breaking popup dialog 2018-02-21 15:54:00 -08:00
Liv Erickson
68f0c0391a Initial fix - need a little style fixing 2018-02-21 15:44:23 -08:00
Nissim Hadar
b519ebd6f1 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-21 12:36:56 -08:00
Zach Fox
74655bde49 Fix skeletonmodelURLchanged signal 2018-02-21 12:12:20 -08:00
Zach Fox
b548567f5a Apps protection 2018-02-21 11:17:47 -08:00
Zach Fox
1fbc16aae2 Fix noPermissionGlyph margin 2018-02-21 10:52:17 -08:00
SamGondelman
4dde178b93 fix new material UI 2018-02-21 10:33:15 -08:00
Seth Alves
220d9abbfc
Merge pull request #12435 from vladest/fix_flickable_tablethome 
Make sure Flickable for GridView for TabletHome will not flick
 2018-02-21 09:21:45 -08:00
Nissim Hadar
6f84e4c977 Moved shadows and ambient occlusion to menu checkboxes. 2018-02-20 23:45:07 -08:00
Liv Erickson
5cd184ddc3 change default add to world shape for asset browser 2018-02-20 17:55:30 -08:00
Zach Fox
f08c66e3ac Remove debug code 2018-02-20 14:16:55 -08:00
Zach Fox
fd6f4b569f Fix active focus issue 2018-02-20 13:19:31 -08:00
Zach Fox
eb29bdf5d2 Don't allow tabs or newlines 2018-02-20 13:06:10 -08:00
Zach Fox
2daa30f125 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-20 12:41:12 -08:00
Zach Fox
9bde9f5a4f Fix height of Optional Message in Send Money 2018-02-20 12:36:11 -08:00
Gabriel Calero
5e3ad3fe9a Disable VPAD on bottom bar tapping and modes bar tapping 2018-02-20 17:20:48 -03:00
Zach Fox
11f897beb0 Initial app support 2018-02-20 10:39:36 -08:00
vladest
c320761900 Merge branch 'master' into move_to_qqc2 2018-02-20 06:01:59 +01:00
Sam Gateau
fd49c0d100
Merge pull request #12401 from SamGondelman/decals 
Material Entities
 2018-02-19 10:58:02 -08:00
vladest
e5f953c103 Make sure Flickable for GridView for TabletHome will not flick 2018-02-17 16:52:32 +01:00
Cristian Luis Duarte
5f1fc37684 Android - Support display with smaller resolution than 1440p for Go To window 2018-02-16 18:29:22 -03:00
Zach Fox
c4e9c76258 Small UIT tweaks 2018-02-15 16:03:49 -08:00
Dante Ruiz
a194c8bc03 Merge branch 'master' of github.com:highfidelity/hifi into fix-qml-tablet-apps 2018-02-15 15:46:16 -08:00
Zach Fox
811ecf9db8 Fix 2018-02-15 14:44:33 -08:00
Zach Fox
8072372822 Lots of changes 2018-02-15 13:27:13 -08:00
vladest
a500ba8f2d Merge branch 'master' into move_to_qqc2 2018-02-15 20:42:17 +01:00
Zach Fox
b8fb08dc74 Avatar support 2018-02-15 11:24:22 -08:00
Zach Fox
3c620282b1
Merge pull request #12393 from zfox23/fixAvailabilityMouseArea 
PAL: Prevent opening of Availability from WebView
 2018-02-15 11:10:05 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals 2018-02-14 17:33:01 -08:00
SamGondelman
324eefc914 remove fresnel, add unlit, fix overlays, cleanup 2018-02-14 17:02:07 -08:00
Zach Fox
5a8b8d4ac8 Lots of changes 2018-02-14 16:44:02 -08:00
Alexander Ivash
611c67bf2f FB12297 - HMD: Disabled preview mode only occurs during step 2 of the wallet setup wizard 2018-02-15 02:00:51 +03:00
vladest
d71448d217 Merge branch 'master' into move_to_qqc2 2018-02-14 20:47:37 +01:00
John Conklin II
6187731fdc
Merge pull request #12291 from 1P-Cusack/FogBugz/Case_10865 
[Case 10865] Make Asset Browser multi-select work with Ctrl/Cmd/Shift+Click
 2018-02-14 11:14:26 -08:00
Zach Fox
0fca843667 Integrate 'alreadyOwned' endpoint 2018-02-14 10:24:34 -08:00
Zach Fox
2f0c9e1acb
Merge pull request #12394 from zfox23/commerce_fixRecentActivityWrap 
Commerce: Fix wrap mode for very long P2P memos
 2018-02-14 09:14:21 -08:00
Zach Fox
a477a3da70 Done with My Purchases flow for now 2018-02-13 15:04:31 -08:00
Dante Ruiz
119a7554ee Prevent add the same tablet url app to the tabletApps list 2018-02-13 14:33:15 -08:00
SamGondelman
4500ed17e7 merge from master 2018-02-13 13:58:39 -08:00
Zach Fox
ae8a8a48eb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-13 13:55:32 -08:00
Zach Fox
3e41229e8c Commerce: Fix wrap mode for very long P2P memos 2018-02-13 13:30:17 -08:00
Zach Fox
8cd00c49d6 PAL: Prevent opening of Availability from WebView 2018-02-13 13:21:40 -08:00
vladest
e8959b4cc0 Merge branch 'master' into move_to_qqc2 2018-02-13 22:01:16 +01:00
Elisa Lupin-Jimenez
a61021f46c
Merge pull request #12272 from elisa-lj11/2d-images 
2d images (JPG and PNG) are now supported as (quasi) entities
 2018-02-13 11:44:02 -08:00
Zach Fox
0809210dc3 No permission card 2018-02-13 11:16:48 -08:00
Zach Fox
95e9eb8e4a Lots of progress 2018-02-12 17:06:57 -08:00
Zach Fox
ffea8104fc Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-09 15:59:38 -08:00
Zach Fox
abdd50fb45 it's a start 2018-02-09 15:56:28 -08:00
Cristian Luis Duarte
8c1a1eba02 Android - Fix modes bar layout when expanded 2018-02-09 17:32:13 -03:00
Cristian Luis Duarte
bb4f57f982 Android - Avatar selection window accessible from the bottom bar. Only hardcoded avatars, no marketplace. 2018-02-09 17:32:12 -03:00
Gabriel Calero
d5e101c2e8 Add mode selector (my view / radar), not finished 2018-02-09 17:32:12 -03:00
Gabriel Calero
8093ed7c5c Add audio bar to mute/unmute the mic 2018-02-09 17:32:12 -03:00
Gabriel Calero
0f07d0b493 Add bottom bar and address dialog (Android) 2018-02-09 17:32:12 -03:00
SamGondelman
84cd0e1529 wip live material swapping on model entities, model overlays, avatars, 
and albedo swap on shape entities
 2018-02-09 12:00:08 -08:00
Zach Fox
ecc0a2f43b Bugfix. 2018-02-08 10:41:22 -08:00
Zach Fox
679d53e2cf This works, but is it correct? 2018-02-08 10:41:10 -08:00
Zach Fox
3a7e626463 Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign 
Commerce: Inspection Certificate Redesign
 2018-02-08 10:41:04 -08:00
Zach Fox
a92e614aff Bugfix. 2018-02-08 10:35:34 -08:00
Zach Fox
e01e88d4ae This works, but is it correct? 2018-02-07 15:13:22 -08:00
Zach Fox
2270dcd79d Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign 
Commerce: Inspection Certificate Redesign
 2018-02-07 13:52:20 -08:00
Zach Fox
3c34d13ec6
Revert "Commerce: Inspection Certificate Redesign" 2018-02-07 13:22:09 -08:00
Zach Fox
a40244b5d2
Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign 
Commerce: Inspection Certificate Redesign
 2018-02-07 10:19:30 -08:00
SamGondelman
4d4294dd6a Merge remote-tracking branch 'upstream/master' into decals 2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8 wip finish adding material entity 2018-02-02 16:49:33 -08:00
Elisa Lupin-Jimenez
e2bf8ad231 reverted to S3 for model URL 2018-02-02 15:36:28 -08:00
Zach Fox
2a0d85a119
Merge pull request #12315 from zfox23/commerce_SendMoneyNearbyParticle 
Commerce: Send Money Nearby particle effect!
 2018-02-02 14:17:48 -08:00
Elisa Lupin-Jimenez
d20ff0955c qml doesn't work, .js might not work on osx 2018-02-02 11:26:21 -08:00
Zach Fox
f26477b3e1 Slight wording change to Optional Message placeholder 2018-02-02 11:00:32 -08:00
Zach Fox
19235b8d94 Fix a bug where hover events incorrectly propagate under popups 2018-02-02 10:50:35 -08:00
Elisa Lupin-Jimenez
73fde4333e new local reference to image model 2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
d7a847930d added image icon 2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
f71d9e4d6a snapshot referenced locally, won't work on OS 2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
cc4bafb46f image entities shown as images in entity list 2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
9f8e2017ce can add image directly from asset server 2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
2ff47fa454 images auto-add to asset server, started asset browser add link 2018-02-02 10:27:42 -08:00
Elisa Lupin-Jimenez
d390e20139 removed extraneous commenting and image class 2018-02-02 10:27:42 -08:00
Elisa Lupin-Jimenez
fdca8ab93e added image button to edit.js, working on connecting to cpp 2018-02-02 10:08:39 -08:00
Zach Fox
dd2b7eb107 Send Money Effect & Lightbox 2018-02-01 15:17:50 -08:00
Zach Fox
fa69ea0352 Small comment addition 2018-02-01 13:57:05 -08:00
Zach Fox
ce79504f03 Fix checkbox 2018-02-01 11:51:08 -08:00
Zach Fox
bd26c9dfc0 More improvements 2018-02-01 09:36:41 -08:00
Zach Fox
14051bce0c This logic is insane 2018-01-31 17:20:20 -08:00
Zach Fox
fb5308e517 This logic is insane 2018-01-31 17:06:29 -08:00
Zach Fox
ab3a91a1da Oooooh it's so pretty 2018-01-31 16:53:23 -08:00
Zach Fox
7879fb293f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign 2018-01-31 13:19:39 -08:00
vladest
1c63bcf02e Merge branch 'master' into move_to_qqc2 2018-01-31 22:13:52 +01:00
Zach Fox
90c2371f0c It's working! 2018-01-31 12:09:23 -08:00
Zach Fox
8a729e3cf0 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_SendMoneyNearbyParticle 2018-01-31 10:54:32 -08:00
Seth Alves
600cc1b48e
Merge pull request #12250 from druiz17/fix-multihighlight 
Don't manually highlight tablet buttons from swipeview.
 2018-01-31 09:33:33 -08:00
Zach Fox
05fe33e417 Initial work 2018-01-30 18:01:46 -08:00
Atlante45
bc819c698e Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back 2018-01-30 16:09:30 -08:00
Zach Fox
d13d0e6ba2 Minor fixes 2018-01-30 14:30:50 -08:00
LaShonda Hopper
70e23f3ce8 [Case 10865] Bringing in multi-select fix from Desktop AssetServer. 
Changes Committed:
    modified:   interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
 2018-01-30 14:44:34 -05:00
LaShonda Hopper
dfdf28f37e [Case 10865] Some cleanup for multi-selection (details below). 
* Remove setCurrentIndex call when looping over current selection.
* Changed selectedItems var name to selectedItemCount to clarify what
  it represents.
* Change path arg name to paths to clarify that there can be more
  than a single path contained within it.

Changes Committed:
    modified:   interface/resources/qml/hifi/AssetServer.qml
 2018-01-30 14:44:34 -05:00
LaShonda Hopper
5a771e3a16 [Case 10865] Ctrl/Cmd/Shift+Click Multi-Select for Asset Browser. 
* Removes manual selectionModel update from controls-uit/Tree.qml
    * This was interfering with the Key+Click functionality.  It
      was introduced via Commit 99617600c4 to address a selection
      issue; however, it's unclear what that issue was.  Selection
      within the Asset Browser works without it at present.
* Amends the ContextMenu within the AssetBrowser to work in conjunction
  with the multi-selection changes.
    * ContextMenu will _only_ display when triggered within the current
      selection be it one or more items as opposed to previous behavior
      of selecting the item the menu was triggered on.
    * CopyURL is only enabled when the selection size is 1
    * Rename is only enabled when the selection size is 1
    * Delete is enabled when the selection size is greater than 0

Changes Committed:
    modified:   interface/resources/qml/controls-uit/Tree.qml
    modified:   interface/resources/qml/hifi/AssetServer.qml
 2018-01-30 14:44:34 -05:00
Gabriel Calero
999e3a39fa Add mode selector (my view / radar), not finished 2018-01-30 14:48:37 -03:00
Gabriel Calero
7fb28f4296 Add audio bar to mute/unmute the mic 2018-01-30 14:48:37 -03:00
Gabriel Calero
07a542e35d Add bottom bar and address dialog (Android) 2018-01-30 14:48:37 -03:00
Zach Fox
b60a45d358 Inspection Certificate Redesign 2018-01-29 15:14:29 -08:00
Dante Ruiz
be42f0cfb1 finally fix the multihighlighting 2018-01-26 13:24:44 -08:00
Dante Ruiz
f3e20e72cb really fix multi-highlighing 2018-01-25 15:09:03 -08:00
Zach Fox
f117dd33a8 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixSortingAgain 2018-01-25 15:04:28 -08:00
Dante Ruiz
07842f8e54 Merge branch 'master' of github.com:highfidelity/hifi into fix-multihighlight 2018-01-25 13:30:45 -08:00
Zach Fox
afc71a5ac5 Fix Purchases sorting (again); Fix (i) icon loading 2018-01-25 12:17:34 -08:00
Andrew Meadows
289356dfe7
Merge pull request #12227 from ZappoMan/sendDataDescription 
some settings cleanup
 2018-01-25 11:30:14 -08:00
ZappoMan
cb01bd14b9 Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescription 2018-01-25 10:39:43 -08:00
John Conklin II
e081808ace
Merge pull request #12235 from luiscuenca/assetBrowserFix 
RC63 Fix Edit/Asset Browser in HMD mode
 2018-01-25 09:38:23 -08:00
Zach Fox
94e1c425ab Fix MacOS Security Pic visibility; fix incorrect button state when changing pic 2018-01-24 17:03:16 -08:00
Dante Ruiz
c73c0487a0 min diff 2018-01-24 16:41:19 -08:00
Dante Ruiz
6149630ccd don't manually highlight tablet buttons from swipeview, since the tablet button highligh themselves 2018-01-24 16:36:08 -08:00
Zach Fox
6f54921cb1
Merge pull request #12236 from zfox23/commerce_fixSecurityImageSelectionClear 
Fix security image index clear after back nav
 2018-01-24 13:43:49 -08:00
Zach Fox
6566c5c5e6
Merge pull request #12238 from zfox23/commerce_fixPurchasesFilter 
Fix the text filter in My Purchases
 2018-01-24 08:42:55 -08:00
luiscuenca
29dd24b05f Fix GoTo app in HMD mode 2018-01-23 15:50:32 -07:00
Zach Fox
1920bedaf3 Fix the text filter in My Purchases 2018-01-23 13:42:38 -08:00
luiscuenca
fddbf13796 Fix Asset Browser access from Create 2018-01-23 11:12:22 -07:00
Zach Fox
86ce9766f3 Fix security image index clear after back nav 2018-01-23 10:11:23 -08:00
Brad Davis
8ae0b09ea2 Merge remote-tracking branch 'upstream/master' into android 2018-01-22 15:07:30 -08:00
vladest
b947504849 Merge conflicts 2018-01-22 21:42:32 +01:00
John Conklin II
8b461b960f
Merge pull request #12223 from zfox23/commerce_sendMoney2 
Commerce: Pixel-perfect "Send Money" UI
 2018-01-22 09:39:23 -08:00
ZappoMan
4ad5d34a10 more preferences cleanup, removing some dead code from ScriptEngines/ScriptModel 2018-01-20 17:20:42 -08:00
Zach Fox
1dde640a40 -_- 2018-01-19 16:06:01 -08:00
Zach Fox
89e403d438 Balance text in send money 2018-01-19 15:39:57 -08:00
Zach Fox
4d408a8df5 Nearby UI 2018-01-19 14:49:28 -08:00
vladest
c235deb6f0 Merge branch 'master' into move_to_qqc2 2018-01-19 23:01:04 +01:00
Zach Fox
495c4f56e2 Only small tweaks remaining? 2018-01-18 17:51:08 -08:00
Zach Fox
6b5389a167 go go go go go 2018-01-18 17:37:26 -08:00
Brad Davis
bdfa1273ba Merge remote-tracking branch 'upstream/master' into android 2018-01-18 17:33:10 -08:00
Zach Fox
c6429f4f33 Path towards pixel perfection 2018-01-18 17:05:36 -08:00
David Kelly
2e4fc5e58c
Merge pull request #12207 from davidkelly/dk/placesInHfcTransferHistory 
nearby hfc transfers should send the location
 2018-01-18 16:46:34 -08:00
David Kelly
844ec6a863 eliminate dash in history, replace with 0 HFC 2018-01-18 16:02:40 -08:00
Clément Brisset
37504eca15
Merge pull request #12186 from ctrlaltdavid/21702 
Add Window.protocolSignature() as a replacement for location.protocolVersion()
 2018-01-18 15:20:03 -08:00
Brad Hefta-Gaub
77837e2cf0
Merge pull request #12194 from misslivirose/feat/exp-gif 
change ImageOverlay to use AnimatedImage instead of Image
 2018-01-18 14:57:39 -08:00
David Rowe
13bbd1fcbf Update places feed to use new function 2018-01-19 10:10:33 +13:00
Brad Davis
cbb2d9d854 Merge remote-tracking branch 'upstream/master' into android 2018-01-17 17:51:39 -08:00
Zach Fox
5ce768f402
Merge pull request #12151 from zfox23/commerce_sendMoney1 
Commerce: P2P Transfer Iteration 1
 2018-01-17 16:41:56 -08:00
Liv Erickson
88ba5e5a00 change ImageOverlay to use AnimatedImage instead of Image to support .gif files in image overlay objects 2018-01-17 13:45:56 -08:00
Seth Alves
8edded7059
Merge pull request #12164 from ctrlaltdavid/21695 
Remove old ToolWindow code
 2018-01-17 13:43:59 -08:00
Zach Fox
1d747bc0e4 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-17 11:56:00 -08:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08:00
Zach Fox
8cc427a374 Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1 2018-01-16 15:07:53 -08:00
Zach Fox
8cc5a0a7cb Add UserInfoViewer 2018-01-16 15:06:51 -08:00
David Kelly
a9fc63da4c fix error when pending 2018-01-16 15:04:05 -08:00
Zach Fox
d64b35729f Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1 2018-01-16 13:44:29 -08:00
vladest
b3b7a7636f Merge branch 'master' into move_to_qqc2 2018-01-16 21:08:49 +01:00
David Kelly
d8f8f9ff1a First cut at alan's new design 2018-01-16 11:19:10 -08:00
Clément Brisset
1949471dad
Merge pull request #12182 from highfidelity/stable 
Merge stable (RC62) to master
 2018-01-16 11:01:07 -08:00
Zach Fox
6b90ceaeb4 Quick bugfix and code change for clarity 2018-01-16 10:40:51 -08:00
Melissa Brown
991dad18ba
Merge pull request #12160 from ElderOrb/FB11241 
FB11241 Changing options in menu causes the title “Menu” to change to…
 2018-01-15 10:46:37 -08:00
Zach Fox
f7ed8c10fa Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-15 10:13:07 -08:00
Brad Davis
bee869d88e Merge remote-tracking branch 'upstream/master' into android 2018-01-14 13:53:47 -08:00
Zach Fox
e627925bd3 Fix 'Browse Avatars' button from Avatar Settings 2018-01-12 15:14:42 -08:00
David Kelly
579a4d85b3 Merge branch 'commerce_sendMoney1' of https://github.com/zfox23/hifi into dk/senderAndRecipientInTxnHistory 2018-01-12 14:37:46 -07:00
Zach Fox
6920e57613 Fix 'Browse Avatars' button from Avatar Settings 2018-01-12 13:31:58 -08:00
David Rowe
1fa31d3c10 Remove old ToolWindow code 2018-01-13 10:27:43 +13:00
Zach Fox
b7f4fe2ba3
Merge pull request #12149 from howard-stearns/do-not-delete-wallet-file 
Do not delete wallet file
 2018-01-12 09:44:40 -08:00
Brad Davis
7579451c24 Merge remote-tracking branch 'upstream/master' into android 2018-01-11 23:31:45 -08:00
Zach Fox
c216144015 Remove unnecessary comments 2018-01-11 16:21:59 -08:00
Zach Fox
464bbe5d43 Bugfixes, refactoring, and improvements 2018-01-11 15:26:51 -08:00
Alexander Ivash
11e918681a FB11241 Changing options in menu causes the title “Menu” to change to “root” 
note: fix is based on removing duplicated top-level menu entry from stack view
 2018-01-12 02:08:10 +03:00
Zach Fox
1e608b13b2 Show username when admin (this probably isn't the way to get username 2018-01-11 14:45:43 -08:00
John Conklin II
96babdf2e2
Merge pull request #12135 from luiscuenca/palVolumeSlider 
RC62 Pal volume slider fix
 2018-01-11 13:36:03 -08:00
vladest
cff80e86b6 Temporarily disable magnification until further notice 2018-01-11 22:18:22 +01:00
vladest
45144bece6 Fix Properties does not fit in Create tab 2018-01-11 22:05:11 +01:00
Zach Fox
df58065e75 Silly bug 2018-01-11 13:02:00 -08:00
vladest
d8d12e362f Merge branch 'master' into move_to_qqc2 2018-01-11 21:55:08 +01:00
Zach Fox
d25ef074e1 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-11 12:35:18 -08:00
howard-stearns
c39771d995 do not delete wallet file when things go wrong, and remove obsolete 
reset machinery
 2018-01-11 11:50:23 -08:00
Zach Fox
d577b2e9e8 Actually add the API calls 2018-01-11 11:45:43 -08:00
luiscuenca
54a1da8d73 Only mod my card 2018-01-11 11:55:28 -07:00
Anthony Thibault
8d5e7dbeff
Merge pull request #12140 from hyperlogic/bug-fix/master-snapshot-app-settings 
Fix for black screen when clicking Settings from Snap app
 2018-01-11 09:58:10 -08:00
vladest
b5f3631c21 Merge branch 'master' into move_to_qqc2 2018-01-11 18:54:40 +01:00
Seth Alves
363b9bfe11
Merge pull request #12127 from SamGondelman/freeze 
Comment out TabletAddressDialog logging of long messages
 2018-01-10 18:07:18 -08:00
Zach Fox
939012a2d0 Hook up the endpoints! 2018-01-10 17:10:05 -08:00
Zach Fox
0d137d62c8 HMD tweaks 2018-01-10 16:37:47 -08:00
Anthony J. Thibault
1deb75daf7 Fix for black screen when clicking Settings from Snap app 
(cherry picked from commit d5e3b97c93)
 2018-01-10 16:31:51 -08:00
Zach Fox
b3e3af4ee7 Add character count :) 2018-01-10 16:23:29 -08:00
Zach Fox
260aee42a8 Improvements 2018-01-10 16:18:34 -08:00
Anthony J. Thibault
d5e3b97c93 Fix for black screen when clicking Settings from Snap app 2018-01-10 16:03:53 -08:00
Zach Fox
c15b1669b1 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-10 15:53:23 -08:00
Zach Fox
93b15c0aa6 Payment Failure 2018-01-10 15:53:13 -08:00
Zach Fox
6812010660 The skeleton is there 2018-01-10 15:33:18 -08:00
Zach Fox
22631065e4 Serious flow state 2018-01-10 15:09:15 -08:00
Brad Davis
2c35242af1 Merge remote-tracking branch 'upstream/master' into android_nov 2018-01-10 13:40:12 -08:00
Zach Fox
c5a5bddbc9 More progress 2018-01-10 12:21:12 -08:00
vladest
04d45be0a9 Merge branch 'master' into move_to_qqc2 2018-01-10 21:21:03 +01:00
luiscuenca
e54f7d5a45 Fix Pal Master Volume overlap 2018-01-10 13:03:54 -07:00
Zach Fox
e5abdc77d9 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1 2018-01-10 10:02:56 -08:00
Howard Stearns
fafc98f51c
Merge pull request #12098 from ElderOrb/FB11123 
FB11123 Make the certificate GOLD (and change title to Proof of Prove…
 2018-01-10 10:01:15 -08:00
Zach Fox
f366fdf695 Beginnings of nearby 2018-01-10 09:58:23 -08:00
Brad Davis
fb59a0a56f Merge remote-tracking branch 'upstream/master' into android_nov 2018-01-09 20:02:55 -08:00
Brad Davis
105dffebaf Fixing UI 2018-01-09 18:36:42 -08:00
Zach Fox
928e3d2ef7
Merge pull request #12108 from zfox23/commerce_pagination 
Commerce: Support pagination at History endpoint; improve Purchases scrolling
 2018-01-09 15:57:34 -08:00
Zach Fox
5469025113 More more more 2018-01-09 15:53:25 -08:00
Zach Fox
530df5447d Even more proress 2018-01-09 15:19:50 -08:00
SamGondelman
a42b0cf485 comment out logging 2018-01-09 14:58:23 -08:00
Zach Fox
40a3f8b31b Progress 2018-01-09 14:13:36 -08:00
Melissa Brown
19802b33eb
Merge pull request #12109 from vladest/tablet_page_indicator 
Page indicator visible only when pages more than one
 2018-01-09 14:05:32 -08:00
Zach Fox
a6259a5ef5 Initial progress 2018-01-09 13:39:28 -08:00
Brad Davis
d6dd29b952 Merge remote-tracking branch 'upstream/master' into android_nov 2018-01-09 11:43:03 -08:00
Seth Alves
87dfe0efc3
Merge pull request #12097 from vladest/tablet_pagination_magnify 
Tablet pagination magnify
 2018-01-09 08:08:02 -08:00
Alexander Ivash
0f6b93eaea FB11123 Make the certificate GOLD (and change title to Proof of Provenance License) 2018-01-09 03:13:31 +03:00
vladest
891663bae9 Page indicator visible only when pages more than one 2018-01-08 23:07:09 +01:00
Zach Fox
611f25d542 Improve scrolling thru My Purchases 2018-01-08 13:17:04 -08:00
Zach Fox
dcfceab078 Remove all work done on paginating purchases 2018-01-08 12:03:56 -08:00
Zach Fox
2231bf2bdd Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_pagination 2018-01-08 11:45:20 -08:00
Zach Fox
cdd62c7119 I don't think auto-refresh and pagination of inventory is possible 2018-01-08 11:29:41 -08:00
Zach Fox
99510f522d
Merge pull request #12095 from ElderOrb/FB10621 
FB10621 "HIFI-Commerce Login" page title change to "Log in to continue"
 2018-01-08 10:05:53 -08:00
Bradley Austin Davis
68cd768a65
Merge branch 'android' into android_render_pr 2018-01-08 12:49:52 -05:00
Howard Stearns
724db93389
Merge pull request #12002 from howard-stearns/consistent-goToUser 
Consistent go to user
 2018-01-07 11:07:39 -08:00
vladest
00b1d4b0ea Merge branch 'master' into move_to_qqc2 2018-01-05 23:40:36 +01:00
vladest
02972c92f0 Merge branch 'master' into tablet_pagination_magnify 2018-01-05 19:12:13 +01:00
Seth Alves
2071d42d25
Merge pull request #12088 from ElderOrb/FB11008 
11008 GoTo app does not focus on address bar when opened
 2018-01-05 10:07:36 -08:00
Andrew Meadows
c33c637f07
Merge pull request #12041 from vladest/case_10854_fix_not_loading_dialogs 
Adopt path to certain Tablet dialogs to new loading subsystem and pat…
 2018-01-05 09:07:54 -08:00
Seth Alves
fd8b521c50
Merge pull request #12038 from ElderOrb/audio_name_conflict_fix 
Audio name conflict fix (fix for https://github.com/highfidelity/hifi/issues/11963)
 2018-01-05 08:15:48 -08:00
Alexander Ivash
437b78dce5 FB10621 "HIFI-Commerce Login" page title change to "Log in to continue" 2018-01-05 13:35:19 +03:00
Zach Fox
4612ef3d7c Use atYBeginning 2018-01-04 15:41:01 -08:00
vladest
67ca76baa1 Magninfication 2018-01-04 23:11:42 +01:00
Zach Fox
14447c26a0 Prevent visual data loss 2018-01-04 13:47:31 -08:00
Alexander Ivash
7ab7a46530 11008 GoTo app does not focus on address bar when opened 2018-01-04 23:38:10 +03:00
Zach Fox
10d494b51d Pagination for Recent Activity 2018-01-04 12:32:30 -08:00
Ryan Downe Karpf
eada0b1ff7
Merge pull request #11546 from vladest/tablet_home_paginate 
Tablet home paginate
 2018-01-03 18:12:32 -08:00
Gabriel Calero
d31346c047 Use qml engine 2018-01-03 16:40:14 -03:00
Zach Fox
6f077f3a92 Fix Security Pic Change dialog after QML security changes 2018-01-03 11:28:39 -08:00
Zach Fox
917db14879 Add a link to My Purchases from Wallet Home 2018-01-02 15:26:11 -08:00
vladest
2fbd0a41b1 Move Slider 2017-12-28 15:39:22 +01:00
vladest
afc3082593 Cleanup. Errors checks 2017-12-28 13:16:51 +01:00
vladest
35fee739c5 Use buttons index 2017-12-27 23:50:15 +01:00
vladest
ffcccacfa5 Selection consistency #2 2017-12-25 23:46:06 +01:00
vladest
cb7472c270 Selection consistency #1 2017-12-25 20:14:31 +01:00
vladest
9fa78bae0d Merge branch 'master' into tablet_home_paginate 2017-12-23 17:46:51 +01:00
vladest
a497047666 Refactored using new GridView approach 2017-12-23 17:44:26 +01:00
Zach Fox
808b9cbc31
Merge pull request #12047 from zfox23/commerce_dataTracking3 
Commerce Data Tracking: Iteration 3 (Purchases)
 2017-12-22 14:31:03 -08:00
Zach Fox
ef71470d85 Small change 2017-12-21 17:03:04 -08:00
Zach Fox
2acea75db3 Commerce: Checkout Layout Revisions 2017-12-21 16:09:46 -08:00
Zach Fox
618e5c9032 Commerce Data Tracking: Iteration 3 (Purchases) 2017-12-21 15:46:01 -08:00
vladest
7985c39f2a Adopt path to certain Tablet dialogs to new loading subsystem and path resolver 2017-12-21 22:14:15 +01:00
Alexander Ivash
bd3a056f4e rename exposed to QML "Audio" context object to "AudioScriptingInteface" to avoid naming conflict 
note: I'm not sure what exactly causes naming conflict - importing QtMultimedia in ForceLoad.qml, or the fact of existance of Audio.qml, but starting with Qt 5.10.0 'Audio' already exists in global scope
 2017-12-21 20:03:38 +00:00
vladest
2bca0939b3 Preliminary proxy model 2017-12-21 19:32:13 +01:00
vladest
d6e1a3ea41 Merge conflicts solved 2017-12-21 09:02:04 +01:00
vladest
79f9b54f6a Store button list in the resources section of fake item instead of C++ space 2017-12-20 22:59:07 +01:00
Zach Fox
e02e6790fe Fix error state for Commerce passphrase TextInputs 2017-12-20 13:46:02 -08:00
Zach Fox
08edc52932
Merge pull request #12025 from zfox23/commerce_fixWalletSetupCancel 
Commerce: Fix the behavior of the 'cancel' button in Wallet Setup
 2017-12-20 09:18:10 -08:00
Zach Fox
a72ed27a25 CR feedback 2017-12-19 16:57:48 -08:00
Zach Fox
5da49d156e Commerce: Fix the behavior of the 'cancel' button in Wallet Setup 2017-12-19 16:26:58 -08:00
vladest
012f65a87f Merge branch 'master' into tablet_home_paginate 2017-12-19 21:40:47 +01:00
howard-stearns
bb499000a6 trailing semicolon 2017-12-19 10:51:32 -08:00
howard-stearns
16a58ddf5a Merge branch 'master' of https://github.com/highfidelity/hifi into consistent-goToUser 2017-12-19 10:48:34 -08:00
Zach Fox
18d5be147c Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-19 09:48:15 -08:00
Zach Fox
6fc58b713e
Merge pull request #12009 from zfox23/commerce_dataTracking2 
Commerce: Add Passphrase Auth Status data tracking
 2017-12-18 16:26:59 -08:00
Zach Fox
afd3cf7045 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-18 14:08:09 -08:00
vladest
29a17d366e Merge branch 'master' into move_to_qqc2 2017-12-18 20:57:04 +01:00
Zach Fox
e075cd79fb Add Passphrase Auth Status data tracking 2017-12-18 11:51:12 -08:00
vladest
38453afb3b Create pages and store in global array, makes sure it will not be cleared by garbage collector whe out of scope 2017-12-18 14:56:33 +01:00
vladest
62a762b879 Merge branch 'master' into tablet_home_paginate 2017-12-16 20:32:21 +01:00
vladest
cdb9d72387 Added smart pointer for qml buttons. removed extra modifiers. page changed using left and right buttons 2017-12-16 20:27:19 +01:00
howard-stearns
d730b7b87b consistent goToUser behavior in PAL, and be able to go to flying user. 2017-12-15 17:00:54 -08:00
Zach Fox
89795272c7 More security images! 2017-12-15 16:26:13 -08:00
Zach Fox
3764445272 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-13 14:12:08 -08:00
Seth Alves
d3e24d3629
Merge pull request #11960 from ElderOrb/FB10334 
10334 Unable to type in Go To app search bar after UI reappears from …
 2017-12-13 09:06:53 -08:00
vladest
99a6b12828 Merge branch 'master' into tablet_home_paginate 2017-12-13 16:02:29 +01:00
vladest
2770650b65 Merge branch 'master' into move_to_qqc2 2017-12-12 18:48:41 +01:00
vladest
e052784431 Code style 2017-12-12 14:12:03 +01:00
Zach Fox
2225352b1e Fix wallet setup 2017-12-11 17:15:15 -08:00
Howard Stearns
8e36228c12
Merge pull request #11948 from MandatoryMania/noFundsSymbol 
Provides a nice alert in case of insufficient funds to make a purchase
 2017-12-11 11:45:27 -08:00
Zach Fox
b81cdf49ef Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-11 09:52:32 -08:00
vladest
e797f5cda0 Merge branch 'master' into tablet_home_paginate 2017-12-11 17:53:21 +01:00
vladest
cc78fc1f53 Added buttons list mutex protection. Reworked keyboard tablet navigation. no more double selections 2017-12-11 17:50:16 +01:00
Alexander Ivash
cb471582e5 10334 Unable to type in Go To app search bar after UI reappears from moving Avatar 2017-12-10 01:34:03 +03:00
humbletim
abba85ac54 add missing colonsemi 2017-12-08 18:14:30 -05:00
humbletim
34243f4239 disable connections console.log to prevent UI lag 2017-12-08 17:10:57 -05:00
vladest
3aaf666295 Merge branch 'master' into tablet_home_paginate 2017-12-08 19:59:41 +01:00
Zach Fox
a81a981676 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-08 09:44:52 -08:00
Seth Alves
eda63e5758
Merge pull request #11919 from ElderOrb/FB9706 
9706 Editing Attachments Results In Attachments Window Scrolling To Top
 2017-12-08 07:01:00 -08:00
H Q
4ce784291c Provides a nice alert in case of insufficient funds to make a purchase 2017-12-07 15:13:01 -08:00
vladest
9b3db0725b Retreive buttons list from tablet proxy 2017-12-07 22:36:34 +01:00
Zach Fox
b2bafed2bb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-07 11:21:24 -08:00
vladest
c9f86e4b6b Merge branch 'master' into tablet_home_paginate 2017-12-07 19:16:13 +01:00
vladest
3c11d29a7f Something intermediate 2017-12-07 19:13:39 +01: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
David Rowe
efd72be96f Fix image overlay's subImage property's width and height support 2017-12-07 12:05:46 +13:00
Zach Fox
3183a1a8b9 Add setupAttemptID to every step (thanks Dave) 2017-12-05 16:48:30 -08: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
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
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
vladest
a0878298d5 Merge branch 'master' into tablet_home_paginate 2017-12-04 20:55:38 +01:00
vladest
b52163cb24 Intitial SpinBox port 2017-12-04 20:54:35 +01: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
vladest
f2d7e2f607 Merge branch 'master' into move_to_qqc2 2017-12-02 22:41:19 +01:00
vladest
e1df38784b Merge branch 'master' into tablet_home_paginate 2017-12-02 22:40:10 +01:00
vladest
fd9539a9e4 Using Flickable signals to remove hover state instead of timer. No more delays 2017-12-02 13:57:12 +01: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
ebb2e50d01 Fix month display in commerce... 2017-12-01 09:29:19 -08:00
vladest
570be69fcf Fix warnings after apps closed 2017-12-01 09:52:45 +01: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
vladest
f510b4bcd8 Swipe area expanded to whole tablet. Icons doesnt stick together anymore 2017-11-30 21:10:12 +01:00
vladest
69264a6ea8 Merge with master. Conflicts solved 2017-11-30 15:34:21 +01:00
vladest
8c9e530adf Merge branch 'master' into move_to_qqc2 2017-11-29 16:33:59 +01:00
Zach Fox
3c892920e3 Prevent seeding text from flashing 2017-11-28 17:00:15 -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
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
vladest
3f0de940a4 Merge branch 'master' into move_to_qqc2 2017-11-26 10:18:44 +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
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
vladest
f20a723a7d Merge branch 'master' into move_to_qqc2 2017-11-20 17:04:26 +01:00
vladest
6b640bd028 Resolve merge conflicts 2017-11-19 20:52:39 +01: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
vladest
b21f66f666 Port PlaySampleSound to QQC2. Fix crash on press down key in scroll window 2017-11-19 20:09:07 +01: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
vladest
19f9af0576 Port avatar preferences 2017-11-18 23:03:52 +01:00
vladest
68b08f429c Port Attachments to QQC2 2017-11-18 22:49:16 +01:00
vladest
d92f461f12 Port ControllerSettings 2017-11-18 20:44:52 +01:00
vladest
41f338e6ad Port ScrollingWindow and TabletDebugWindow 2017-11-18 20:18:17 +01:00
vladest
c8d864465f Merge branch 'master' into move_to_qqc2 2017-11-18 18:54:08 +01:00
vladest
34fe517c67 Merge conflicts 2017-11-18 18:48:33 +01: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
vladest
dbd6ec0dff Port Edit.qml to QQC2 as well as some tablet preferences compinents 2017-11-17 20:46:21 +01: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
vladest
2aae8edde0 Merge branch 'master' into move_to_qqc2 2017-11-16 19:08:15 +01: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
vladest
0e53afc346 Merge branch 'master' into move_to_qqc2 2017-11-15 20:53:14 +01: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
vladest
4c1bbdacec Fix merge conflicts 2017-11-13 16:45:10 +01:00
vladest
0c13c2b6e2 Remove unused QQC1 imports 2017-11-13 16:37:28 +01: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