Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

new avatar items #2401

Merged
merged 15 commits into from
Oct 14, 2018
Merged

new avatar items #2401

merged 15 commits into from
Oct 14, 2018

Conversation

owocki
Copy link
Contributor

@owocki owocki commented Oct 9, 2018

further just trying to understand sketch and add a shirt

adds an eth-trek logo to the avatar builder

screen recording 2018-10-09 at 02 36 pm

jack o lantern
46696271-05c0f280-cbcf-11e8-973a-73b161e4e09c

robe and parrot
screen shot 2018-10-09 at 7 04 33 pm
screen shot 2018-10-09 at 7 04 21 pm

@@ -72,7 +72,7 @@ def get_avatar_context():
{
'name': 'Clothing',
'title': 'Pick your clothing',
'options': ('cardigan', 'hoodie', 'knitsweater', 'plaid', 'shirt', 'shirtsweater', 'spacecadet')
'options': ('cardigan', 'hoodie', 'knitsweater', 'plaid', 'shirt', 'shirtsweater', 'spacecadet', 'ethlogo')

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

E501 line too long (123 > 120 characters)

@codecov
Copy link

codecov bot commented Oct 9, 2018

Codecov Report

Merging #2401 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2401   +/-   ##
=======================================
  Coverage   29.27%   29.27%           
=======================================
  Files         147      147           
  Lines       11872    11872           
  Branches     1605     1605           
=======================================
  Hits         3475     3475           
  Misses       8279     8279           
  Partials      118      118
Impacted Files Coverage Δ
app/avatar/utils.py 18.43% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2f14667...2217e6c. Read the comment docs.

@owocki
Copy link
Contributor Author

owocki commented Oct 9, 2018

when u want to market to nerds, you do something star trek inspired:

screen recording 2018-10-09 at 02 43 pm

@@ -93,7 +93,7 @@ def get_avatar_context():
'options': (['Glasses-0'], ['Glasses-1'], ['Glasses-2'], ['Glasses-3'], ['Glasses-4'],
['HatShort-backwardscap'], ['HatShort-ballcap'], ['HatShort-headphones'],
['HatShort-shortbeanie'], ['HatShort-tallbeanie'], ['Earring-0'], ['Earring-1'],
['EarringBack-2', 'Earring-2'], ['Earring-3'], ['Earring-4'], ['Masks-jack-o-lantern'])
['EarringBack-2', 'Earring-2'], ['Earring-3'], ['Earring-4'], ['Masks-jack-o-lantern'], ['Extras-Parrot'])

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

E501 line too long (134 > 120 characters)

@@ -72,7 +72,7 @@ def get_avatar_context():
{
'name': 'Clothing',
'title': 'Pick your clothing',
'options': ('cardigan', 'hoodie', 'knitsweater', 'plaid', 'shirt', 'shirtsweater', 'spacecadet')
'options': ('cardigan', 'hoodie', 'knitsweater', 'plaid', 'shirt', 'shirtsweater', 'spacecadet', 'ethlogo', 'cloak')

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

E501 line too long (132 > 120 characters)

@@ -72,7 +72,7 @@ def get_avatar_context():
{
'name': 'Clothing',
'title': 'Pick your clothing',
'options': ('cardigan', 'hoodie', 'knitsweater', 'plaid', 'shirt', 'shirtsweater', 'spacecadet')
'options': ('cardigan', 'hoodie', 'knitsweater', 'plaid', 'shirt', 'shirtsweater', 'spacecadet', 'ethlogo', 'cloak', 'robe')

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

E501 line too long (140 > 120 characters)

@owocki owocki changed the title adds an eth-trek logo to the avatar builder new avatar items Oct 10, 2018
@@ -93,7 +93,7 @@ def get_avatar_context():
'options': (['Glasses-0'], ['Glasses-1'], ['Glasses-2'], ['Glasses-3'], ['Glasses-4'],
['HatShort-backwardscap'], ['HatShort-ballcap'], ['HatShort-headphones'],
['HatShort-shortbeanie'], ['HatShort-tallbeanie'], ['Earring-0'], ['Earring-1'],
['EarringBack-2', 'Earring-2'], ['Earring-3'], ['Earring-4'], ['Masks-jack-o-lantern'])
['EarringBack-2', 'Earring-2'], ['Earring-3'], ['Earring-4'], ['Masks-jack-o-lantern'], ['Masks-jack-o-lantern-lighted'], ['Extras-Parrot'])

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

E501 line too long (168 > 120 characters)

Copy link
Contributor

@mbeacom mbeacom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to include the dynamic .txt templates for these as well?

@thelostone-mc
Copy link
Member

compressed and fixed linting ^_^
@owocki we would need the .txt too

@owocki
Copy link
Contributor Author

owocki commented Oct 11, 2018

hey @thelostone-mc @mbeacom i see this example of the dynamic .txts -- whats the different between futuristic_pony_back.txt and futuristic_pony_front.txt? where is futuristic_pony_back and futuristic_pony_front linked in the app? i.e. how does the backend know that futuristic_pony_* is the same as app/assets/v2/images/avatar/HairStyle/9-front-F0E6FF.svg ?

@owocki
Copy link
Contributor Author

owocki commented Oct 13, 2018

@mbeacom @thelostone-mc i figured it out... fix is in => 14d6707

@@ -73,14 +73,15 @@ def get_avatar_context():
{
'name': 'Clothing',
'title': 'Pick your clothing',
'options': ('cardigan', 'hoodie', 'knitsweater', 'plaid', 'shirt', 'shirtsweater', 'spacecadet', 'suit')
'options': ('cardigan', 'hoodie', 'knitsweater', 'plaid', 'shirt', 'shirtsweater', 'spacecadet', 'suit', 'ethlogo', 'cloak', 'robe')

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

E501 line too long (148 > 120 characters)

['None', '10'])
'options': (
['None', '0'], ['None', '1'], ['None', '2'], ['None', '3'], ['None', '4'], ['5', 'None'],
['6-back', '6-front'], ['7-back', '7-front'], ['8-back', '8-front'], ['9-back', '9-front'], ['None', '10']

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

E501 line too long (126 > 120 characters)

@owocki
Copy link
Contributor Author

owocki commented Oct 14, 2018

9c3c799
fixes merge conflcits

@owocki
Copy link
Contributor Author

owocki commented Oct 14, 2018

e586c3b make fix in da house

@owocki
Copy link
Contributor Author

owocki commented Oct 14, 2018

tested.. seems fine

@owocki owocki merged commit 8bbe12e into master Oct 14, 2018
@thelostone-mc thelostone-mc deleted the kevin/eth-logo branch October 15, 2018 03:43
@owocki owocki mentioned this pull request Dec 13, 2018
5 tasks
@owocki owocki mentioned this pull request Feb 9, 2019
5 tasks
@dhimanparamjeet
Copy link

dhimanparamjeet commented Feb 27, 2019

I add new items in clothing. Please check my work @owocki PR #3855
canva-photo-editor 1
canva-photo-editor

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants