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

194 commits

Author SHA1 Message Date
Zach Fox
255cede808 Correctly determine if we're on a marketplace screen 2017-09-29 16:05:26 -07:00
Zach Fox
63396a2fc3 WalletScriptingInterface; wallet status refactor 2017-09-29 13:42:04 -07:00
Zach Fox
66be558a04 My Items Interface 2017-09-28 14:04:57 -07:00
Zach Fox
68c08969ae Update Purchases 2017-09-28 12:49:38 -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
Zach Fox
57b5a23373 Enable Inspection Mode for all; change Commerce setting name 2017-09-21 11:18:21 -07:00
Zach Fox
fa25c434ca Messages to marketplaces.js 2017-08-31 15:50:42 -07:00
Zach Fox
ce32d2d420 Checkout and Purchases 2017-08-31 14:12:05 -07:00
Zach Fox
f366743be7 Login; punctuationMode; new images 2017-08-30 11:07:03 -07:00
Zach Fox
a9c99854f9 Haven't purchased anything yet UI 2017-08-29 15:39:07 -07:00
Zach Fox
a03f9592c1 Inventory to Purchases 2017-08-25 16:34:48 -07:00
Zach Fox
d19377d2d4 Saving 2017-08-25 15:56:30 -07:00
Zach Fox
e2c74d8b88 Initial progress 2017-08-24 15:22:30 -07:00
Zach Fox
b7282cc776 Lots of fixes 2017-08-15 13:46:20 -07:00
Zach Fox
bddce9328b V1 2017-08-15 11:08:03 -07:00
Zach Fox
c38837c200 Remove fixmes 2017-08-11 16:21:39 -07:00
Zach Fox
a21ff75a49 Big progress! 2017-08-11 12:54:55 -07:00
Zach Fox
080c6da71a Get HFC balance from QmlCommerce API 2017-08-11 10:49:11 -07:00
Zach Fox
e1064938cd Add inventory; also fix some bugs 2017-08-11 10:31:32 -07:00
howard-stearns
ca13d58b0b blance and inventory stubs 2017-08-10 12:44:50 -07:00
Zach Fox
2d256a62a9 Fix marketplaces message passing 2017-08-09 17:04:36 -07:00
Zach Fox
65f9b0052f Working buy button 2017-08-09 13:59:21 -07:00
Howard Stearns
cc634a2d1b Merge pull request #11148 from zfox23/commerce_singleSetting 
New commerce mode now depends on 1 setting; bugfixes; Tablet -> TAB key
 2017-08-09 13:25:10 -07:00
howard-stearns
1cf81495ab basic commerce infrastructure 2017-08-09 11:50:52 -07:00
Zach Fox
33fa8c4f86 Fix bugs and also change to single setting 2017-08-09 11:44:09 -07:00
Zach Fox
61526256bc Remove personalized comment 2017-08-09 09:30:18 -07:00
Zach Fox
4f85923517 Tons of fixes and improvements! 2017-08-08 17:58:41 -07:00
Zach Fox
69fc69cffb Comment fix and overlay click fix 2017-08-08 15:52:59 -07:00
Zach Fox
7d26d2d88b Switch and fix overlay clicks 2017-08-08 14:29:44 -07:00
Zach Fox
1493a310af Beginning of stack stuff 2017-08-07 17:02:24 -07:00
Zach Fox
7e922cb2c2 Layout 2017-08-07 16:16:17 -07:00
Zach Fox
517128a939 More steps 2017-08-07 16:03:42 -07:00
Zach Fox
d7dd331685 Bugfixes 2017-08-07 14:39:31 -07:00
Zach Fox
7d4fd995f2 First steps 2017-08-07 14:29:47 -07:00
Zach Fox
65c28ca821 Bugfixes 2017-07-26 13:17:51 -07:00
Zach Fox
9147bc21d0 Getting there. 2017-07-26 11:41:27 -07:00
Zach Fox
9020607ccf First pass 2017-07-25 17:54:46 -07:00
Brad Davis
de88a34e97 Fix toolbar button activation states 2017-06-26 23:33:32 -07:00
David Rowe
f397adb22a Reinstate scrollbars to marketplace pages 2017-04-01 11:06:27 +13:00
David Rowe
c7f648a6c2 Disable marketplace directory and Clara.io scrollbars in tablet 2017-03-30 14:20:32 +13:00
Anthony J. Thibault
7e6ff7c2fb Scrollbar is visible on marketplace in toolbar mode. 2017-03-24 11:40:10 -07:00
Dante Ruiz
59b4fa5fd7 Close toolbar windows when scripts are reloaded 2017-03-08 21:44:04 +00:00
Anthony J. Thibault
7564b6f0f5 More consistent highlights/toggle for toolbar buttons 
When the "app" for a button is visible the button should become active.
Also clicking on a highlighted/active button should close the associated "app".

This should be noticeable on the following tablet apps.

* audio
* menu
* people
* market
* users
 2017-02-21 10:59:36 -08:00
Anthony J. Thibault
47e87e1ad4 Bug fix for clara.io marketplace 2017-02-16 17:41:36 -08:00
Anthony J. Thibault
345f0519ef Removed use of Toolbar API for most default scripts. 2017-02-16 17:29:35 -08:00
Seth Alves
68de18a3bb Merge pull request #9610 from sethalves/tablet-ui-use-models-from-s3-again 
use tablet models from s3 until relative model urls work
 2017-02-03 18:34:28 -08:00
Seth Alves
f635cd8a07 use tablet models from s3 until relative model urls work 2017-02-03 15:17:33 -08:00
Anthony J. Thibault
85e01e3922 tablet-ui: Added sortOrder property to buttons 
By default user created buttons will appear after system buttons.
 2017-02-02 17:18:22 -08:00
Seth Alves
d9bdbb92ef use tablet model from distribution rather than from s3 2017-02-01 16:55:29 -08:00
Seth Alves
ff8d13ecc7 get button-states for toolbar buttons working again 2017-01-25 15:38:54 -08:00
Seth Alves
98f1664a46 use a setting to decide which UI is enabled 2017-01-25 14:17:45 -08:00
Seth Alves
f18094f565 make use of tablet or HUD depend on a single variable. avoid some duplicated code 2017-01-25 12:00:34 -08:00
Seth Alves
4335bbe4fe provide a way to switch mostly back to HUD-based ui 2017-01-24 18:48:11 -08:00
Dante Ruiz
41bf65ed5e home button improvments 2017-01-20 16:35:41 -08:00
Anthony J. Thibault
56fc42a2bd clara.io marketplace works on tablet 2017-01-17 15:38:44 -08:00
Seth Alves
9430d2a58d get marketplace-in-tablet working again 2017-01-13 11:03:02 -08:00
Seth Alves
9de8144f0d merge from upstream 2017-01-13 10:17:03 -08:00
David Rowe
ad5822d96d Fix first progress message box not closing 2017-01-13 12:26:42 +13:00
David Rowe
632989e031 Fix progress messages not displaying in HMD 2017-01-13 12:09:22 +13:00
Dante Ruiz
71083645e9 branch update 2017-01-12 20:51:25 +00:00
Dante Ruiz
a16b229c65 begining to remove hud items 2017-01-12 10:49:45 -08:00
David Rowe
9587b6a80e Fix initial marketplace URL 2017-01-12 20:53:57 +13:00
David Rowe
37da800a14 Display Clara model preparation progress 2017-01-12 15:47:41 +13:00
Dante Ruiz
bf6178f500 diff minimize 2016-12-21 23:48:45 +00:00
Dante Ruiz
5ed8831bee all hud buttons on tablet 2016-12-21 23:25:40 +00:00
Seth Alves
dc996bee95 merge from upstream 2016-12-20 08:06:01 -08:00
David Rowe
18a3555453 Fix flash of old desktop window content if reopen after closing with "x" 2016-12-16 12:21:32 +13:00
David Rowe
2b0529bcea Inform user if can't do Clara.io download because can't write to ATP 2016-12-14 14:45:33 +13:00
David Rowe
4890e92733 Start at HiFi marketplace page instead of directory page 2016-12-14 00:12:52 +13:00
Dante Ruiz
ccecce77de removed unneeded whitespace 2016-12-12 23:21:14 +00:00
Dante Ruiz
1b7c89c41d home button working 2016-12-12 14:34:42 -08:00
Seth Alves
6c99b5e9ca code review 2016-12-09 06:50:10 -08:00
Seth Alves
369f61e172 bring over some previous tablet-ui work 2016-12-08 16:54:39 -08:00
David Rowe
c4c2a95e83 Add "back" button to marketplaces footer 2016-12-08 10:58:37 +13:00
David Rowe
1de2c14fee Remove e-mail message hyperlink if displaying on tablet 2016-12-07 12:52:53 +13:00
David Rowe
460d332c6f Delete redundant code 2016-12-07 10:06:32 +13:00
David Rowe
8e30674069 Tidying 2016-12-07 09:28:35 +13:00
David Rowe
a5bdd9066f Add JavaScript event bridge for Web 3D overlay 2016-12-05 17:20:30 +13:00
David Rowe
a8a04cfbba Add script injection to Web 3D overlay 2016-12-05 12:19:49 +13:00
David Rowe
e4b8d34080 Add navigation bar to marketplace pages 2016-11-15 14:38:03 +13:00
David Rowe
1eeec2a3a1 Fix up script injection methods 2016-11-15 10:24:38 +13:00
David Rowe
e7d9f98ca4 Get script injection working in new marketplaces window 2016-11-15 09:23:51 +13:00
David Rowe
0c6ed67e3b Tidying 2016-11-02 00:05:30 +13:00
howard-stearns
d232d115d5 persist tablet data, and clean it up on startup 2016-10-13 16:53:44 -07:00
howard-stearns
78f96a80bd oops 2016-10-12 16:31:12 -07:00
howard-stearns
b377127fc1 make marketplace tablet be clientOnly 2016-10-12 14:46:04 -07:00
howard-stearns
333ec388a8 make marketplace button state match whether tablet being shown 2016-10-10 14:30:47 -07:00
elisa-lj11
bebf9c5890 Added error feature when user tries to download a non fbx file 2016-08-31 17:46:35 -07:00
elisa-lj11
f2e61aa504 added status bar to marketplace 2016-08-29 18:43:32 -07:00
Andrew Meadows
a0911d2b9d add local scope wrappers to new default scripts 2016-08-25 09:04:06 -07:00
Andrew Meadows
6f6a7bcc44 wrap default scripts with local scope 2016-08-25 08:57:06 -07:00
Anthony J. Thibault
c234f1b65d marketplace.js: merge fix for WebTablet.js path 2016-08-24 16:26:53 -07:00
Anthony J. Thibault
c2af948e25 Merge branch 'master' into feature/handheld-marketplace 2016-08-24 16:07:04 -07:00
elisa-lj11
2d38d47bcc separated clara.js from marketplace.js 2016-08-23 11:24:03 -07:00