Shannon Romano
ef44218fe3
Merge pull request #15128 from roxanneskelly/case21315etc
...
Case 21315, Case 21326, Case 21370
2019-03-08 08:37:23 -08:00
danteruiz
d1e376de0e
destroy modal dialogs that prevent interface from getting input
2019-03-07 14:29:38 -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
ab8f6273ad
Merge pull request #15113 from howard-stearns/stock-to-master
...
Stock to master
2019-03-07 11:02:53 -08:00
Anthony Thibault
96a696203c
Merge pull request #15101 from amantley/bugAvatarHovers
...
Fixed: Avatar hovers off ground while running
2019-03-07 10:52:20 -08:00
Howard Stearns
c6b2697b44
cleanup
2019-03-06 13:28:55 -08:00
Howard Stearns
8ebab88613
Merge branch 'master' of github.com:highfidelity/hifi into stock-to-master
2019-03-06 13:08:19 -08:00
Shannon Romano
3600b98bd0
Merge pull request #15013 from thoys/feat/avatarTools/avatarDoctorProjectStatus
...
Case 21340: avatar doctor project page status
2019-03-06 12:36:18 -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
Thijs Wenker
a84a43320c
added spacing between lines
2019-03-06 19:15:01 +01:00
Thijs Wenker
59200103af
Not for sale explanation
2019-03-06 07:06:48 +01:00
amantley
8e9618d740
added a lower run animation to stop hovering when running
2019-03-05 11:44:53 -08:00
Wayne Chen
028cce5394
change short username to 14 characters, displaying as normal text
2019-02-26 12:26:50 -08:00
Wayne Chen
650b34c463
adding clock
2019-02-25 18:00:56 -08:00
Thijs Wenker
79d0a0a0a8
avatar doctor project status
2019-02-25 19:28:38 +01:00
amantley
c9db426ce4
Merge remote-tracking branch 'upstream/master' into animSplineIK
2019-02-21 14:36:13 -08:00
John Conklin II
87556059d3
Merge pull request #13901 from Cristo86/android_handshake
...
case 20058: Android - Handshake implementation
2019-02-20 13:33:52 -08:00
Brad Davis
d60dcb99d2
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-19 12:37:30 -08:00
Howard Stearns
d7d6ff53ca
Merge pull request #14765 from howard-stearns/artist-stocking-inventory
...
Case 20657: artist stocking inventory
2019-02-19 10:46:01 -08:00
Angus Antley
70764bc3c4
Merge remote-tracking branch 'upstream/master' into animSplineIK
2019-02-15 19:24:30 -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
John Conklin II
4520236873
Merge pull request #14917 from thoys/feat/avatarTools/avatarDoctor
...
Case 21012: Avatar Doctor
2019-02-15 15:43:18 -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
Thijs Wenker
e900d3784b
fixes
2019-02-15 23:58:42 +01:00
John Conklin II
09d8221582
Merge pull request #14834 from gcalero/connection_failure_dialog
...
Case 20936: Set message dialog text width so wrap mode takes effect
2019-02-15 14:16:02 -08:00
Brad Davis
578bc4fc89
Suppress logspam with missing Controller in QML
2019-02-15 14:15:24 -08:00
Roxanne Skelly
2c4f485079
QmlMarketplace invert arrow direction on sort.
2019-02-15 12:31:01 -08:00
Thijs Wenker
74ce98a075
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarDoctor
2019-02-15 20:57:20 +01:00
Thijs Wenker
556a55ff16
Better scale and texture checks
2019-02-15 20:55:27 +01:00
Roxanne Skelly
fb524f8900
Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace
2019-02-15 11:35:06 -08:00
Howard Stearns
490ef3542e
update for marketplace-in-qml, and make specific to username
2019-02-15 10:58:09 -08:00
amantley
0fcaa695ba
Merge remote-tracking branch 'upstream/master' into animArmIK
2019-02-15 10:35:33 -08:00
Brad Davis
0b171ffe13
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-15 10:31:04 -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
Simon Walton
748747da2d
Merge pull request #14864 from SimonWalton-HiFi/pal-sort-loudness-persist
...
Case 19724: If sorting PAL by loudness re-sort upon loudness updates
2019-02-15 09:24:34 -08:00
amantley
425413419a
fixed merge conflict in avatar.h
2019-02-15 08:26:54 -08:00
Angus Antley
382a03929e
changed back to regular 2 bone Ik for arms in json and cleaned up rig.cpp and polevector constraint
2019-02-15 07:06:43 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal
...
Case 20723, Case 20334: Internally, replace all overlays with local entities
2019-02-14 13:49:47 -08:00
Brad Davis
292602afd7
Resolving more master differences
2019-02-14 12:55:28 -08:00
Brad Davis
0f4d1f073b
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-14 12:49:56 -08:00
Sam Gateau
969c62d0df
Merge pull request #14907 from danteruiz/fix-qml-crash-on-mac
...
Case 21157: Fix Desktop.qml crash on local mac build
2019-02-14 12:15:50 -08:00
Thijs Wenker
3026fd625a
Avatar Doctor
2019-02-14 18:52:50 +01:00
danteruiz
562e159ab4
the proper fix for browser qml issues
2019-02-13 10:45:07 -08:00
danteruiz
a111aa1724
fix blocks app
2019-02-12 16:45:45 -08:00
Shannon Romano
10e5e9e0c3
Merge pull request #14900 from MarkBrosche/avatarAppKeyboardFix
...
Fixed MS21059: Avatar App Keyboard Raise in Desktop
2019-02-12 15:02:28 -08:00
Brad Davis
db121957d2
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-12 15:00:03 -08:00
Dante Ruiz
5e9b63b352
fix-qml-crash-on-mac
2019-02-12 13:56:56 -08:00
