Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-06 13:29:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
76777 commits 69 branches 57 tags 1.2 GiB
Commit graph

701 commits

Author SHA1 Message Date
Roxanne Skelly
70cc6594c7 CR fixes 2019-03-08 12:43:43 -08:00
Roxanne Skelly
c33d2aafda Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-03-08 11:41:34 -08:00
Roxanne Skelly
750dbfae21 Stand-alone Tags: Throw up popup for first unoptimized domain 
Throw up a popup in stand-alone builds when user attempts to go to
an unoptimized domain.
 2019-03-08 10:48:42 -08:00
Roxanne Skelly
cce43357d0 Case 21315, Case 21326, Case 21370 
Case 21315 - Clicking on item picture from Inventor Items list does not
always display the Marketplace item page.
Case 21326 - See All Markets page is missing its footer and the two
Explore buttons no longer work
Case 21370 - QML Marketplace - For unavailable items (no more editions
for sale), marketplace item list 'buy' button is not disabled

Also, a few minor font sizing and other graphics tweaks
 2019-03-07 13:58:51 -08:00
Howard Stearns
c6b2697b44 cleanup 2019-03-06 13:28:55 -08:00
Howard Stearns
ddfd437696 ensure error message when marketplace update fails 2019-03-06 11:37:17 -08:00
Howard Stearns
366dd935dd trading in has nothing to do with whether you own the new item 2019-03-06 11:36:34 -08:00
Howard Stearns
416cde4c1f fix uses of updated_item_id that got lost 2019-03-06 11:36:08 -08:00
Howard Stearns
f5afc2033f work through stocking vs update issues, and cleanup 2019-03-06 11:35:36 -08:00
Roxanne Skelly
292ac88c96 Update with new standalone-optimized icon 2019-02-25 11:36:45 -08:00
Roxanne Skelly
dca166f821 Stand-alone Optimized Tagging - Add tagging for GOTO User Stories 2019-02-20 14:23:54 -08:00
Roxanne Skelly
d957b38f10 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-02-19 12:34:10 -08:00
Howard Stearns
e9b323a807 fix HFC symbol location at checkout, and the display of unavailable items 2019-02-15 16:56:31 -08:00
Howard Stearns
f16eb1c029 Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory 2019-02-15 15:15:13 -08:00
Roxanne Skelly
2c4f485079 QmlMarketplace invert arrow direction on sort. 2019-02-15 12:31:01 -08:00
Roxanne Skelly
fb524f8900 Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace 2019-02-15 11:35:06 -08:00
Roxanne Skelly
be98fb1ac7 Standalone Tags - checkpoint 2019-02-15 11:21:40 -08:00
Howard Stearns
490ef3542e update for marketplace-in-qml, and make specific to username 2019-02-15 10:58:09 -08:00
Howard Stearns
30c0dda9ed Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory 2019-02-15 09:27:48 -08:00
Roxanne Skelly
20d7e00ea8 Standalone Tags - Checkpoint 2019-02-14 08:48:37 -08:00
Roxanne Skelly
a82221d2a5 Case 21118 - descending sorts don't work in new (qml) marketplace 2019-02-12 13:20:47 -08:00
Roxanne Skelly
4f8de7ed0b Case 21123, Case - marketplace license display has weird crud in it (new qml version) 2019-02-11 12:48:04 -08:00
Roxanne Skelly
a0199c5884 Case 21119, 21120 
Case 21119 - text filter doesn't change as you type in new (qml) marketplace
Case 21120 - text filter doesn't clear in new (qml) marketplace
 2019-02-11 12:27:02 -08:00
Simon Walton
44c163b7cc Tweak inventory-delete message to be more accurate 2019-02-11 10:30:51 -08:00
Roxanne Skelly
4bbb030ad7 Show only free items when running from the oculus store 2019-02-07 15:34:44 -08:00
Roxanne Skelly
d04445c244 Qml Marketplace - remove some quest incompatibilities and disable 
links for quest
 2019-02-07 13:22:49 -08:00
Roxanne Skelly
d3bc536b58 Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace 2019-02-05 11:35:28 -08:00
Roxanne Skelly
2b40260953 QmlMarketplace - disable HTML for quest 2019-02-05 09:27:12 -08:00
Roxanne Skelly
364a1698fe QmlMarketplace - Height of Marketplace Item was improperly calcualted with attributions 2019-02-04 17:24:30 -08:00
Roxanne Skelly
db9b44a71a QmlMarketplace - The QML Text object has sufficient markup to handle 
all of our needs, so use that instead of webengineview
 2019-02-04 15:30:53 -08:00
Roxanne Skelly
78aa1783a0 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-02-04 15:04:55 -08:00
Roxanne Skelly
e23c589de7 QmlMarketplace - fix issue with footer not appearing in marketplaces list 2019-02-04 15:04:18 -08:00
Roxanne Skelly
1840f874ab Add Attributions to Qml Marketplace 2019-02-04 13:29:06 -08:00
Roxanne Skelly
39ad36a4d0 QmlMarketplace - bugfixes and Markup rendering of descriptions 
* Render markup in descriptions (bold, italic, quote, etc.)
* Back button from marketplaces list now works properly
* Layout fixes
 2019-02-01 15:27:17 -08:00
Dante Ruiz
f4118213b1 give tablet root color 2019-02-01 10:12:04 -08:00
Dante Ruiz
ccf02d8b65 fix SendAssets.qml 2019-01-29 17:16:27 -08:00
Roxanne Skelly
0fdbca8ade QmlMarketplace Bugfixes 
* Fix upgrades
* Certificate 'View in Marketplace' wasn't working
* command-line hifiapp:MARKET wasn't launching
* Home link wasn't disappearing where it should
* Log In button on marketplace wasn't working
* Other minor UI bugfixes
 2019-01-29 16:07:27 -08:00
Roxanne Skelly
2fe78383ed QmlMarketplace - Fix issues found during test 
* command line --url hifiapp:MARKET was not bringing up correct
marketplace
* Search field was not being cleared when 'home' button was clicked
after a search
* tablet button was not lit when marketplace was launched
 2019-01-28 15:14:49 -08:00
Roxanne Skelly
8357f1f9b5 CR fixes 2019-01-28 11:10:35 -08:00
Roxanne Skelly
dfac0d88a2 QmlMarketplace - Add 'logged out' behavior, fix issue with search scope 
display
 2019-01-25 16:41:13 -08:00
Howard Stearns
49a3a13d57 use space a bit better 2019-01-25 14:13:58 -08:00
Howard Stearns
52a43ca4cd support artist's stocking to inventory 2019-01-25 14:09:00 -08:00
Roxanne Skelly
ff2d51701e QML Marketplace 
Add keyboard while in search
General cleanup
 2019-01-25 13:41:16 -08:00
Roxanne Skelly
c1ff51a02d QML Marketplace 
Checkpoint full functionality
 2019-01-24 17:20:42 -08:00
Roxanne Skelly
8010d86210 QML Marketplace support 
Support QML UI for the Marketplace as some devices do not handle
web on 3d surfaces.
Checkpoint code
 2019-01-21 13:39:16 -08:00
Zach Fox
b0ce3a54d5 Merge branch 'MS20187_itemTrash' of github.com:zfox23/hifi into MS20187_itemTrash 2018-12-19 15:16:55 -08:00
Zach Fox
d0998174ff Un-wear things when trashing them if worn 2018-12-19 15:16:48 -08:00
Zach Fox
46e00cf1b3 Merge branch 'master' of github.com:highfidelity/hifi into MS20187_itemTrash 2018-12-19 15:03:36 -08:00
Zach Fox
116edcc224
I have no idea how this happened 2018-12-19 09:36:05 -08:00
Zach Fox
f407042f3e
Quick polish fix to prevent UI flashing 2018-12-18 17:11:10 -08:00