Skip to content

Commit

Permalink
Smiley fixes
Browse files Browse the repository at this point in the history
For particular smilies, the 'Annoying 5' as I like to calm them, have all had their shortcodes changed to match Discord, GitHub, etc. because they're weird, vague and I don't have a better idea for what to call them.

- smile -> slight_smile
- big_smile -> grinning
- happy -> smiley
- grin -> smile
- grinning -> grin
- wink_kiss -> blowing_a_kiss

- Also this slipped through the cracks many years ago - The idea for mild_panic was from cassidoo on Twitter and I assumed I had credited them as the originator of the idea, but I didn't and completely forgot, they have been added to the design credits now.

- Coherence test sh now outputs to its own subfolder.
  • Loading branch information
dzuk-mutant committed Dec 21, 2023
1 parent f985b34 commit eafb744
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 15 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions manifest/emoji/expressions/smilies.orx
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ define smiley_path expressions/smileys

# happy-fun
# --------------------------------------------
emoji short = smile src = $(smiley_path)/1f642_smile.svg code = #1F642 cat = expressions desc = smiling face
emoji short = slight_smile src = $(smiley_path)/1f642_slight_smile.svg code = #1F642 cat = expressions desc = slightly smiling face
emoji short = upside_down src = $(smiley_path)/1f643_upside_down.svg code = #1F643 cat = expressions desc = upside down smiling face
emoji short = halo src = $(smiley_path)/1f607_halo.svg code = #1F607 cat = expressions desc = face smiling with a halo
emoji short = content src = $(smiley_path)/1f60c_content.svg code = #1F60C cat = expressions desc = face with a content expression
emoji short = wink src = $(smiley_path)/1f609_wink.svg code = #1F609 cat = expressions desc = winking face

emoji short = big_smile src = $(smiley_path)/1f600_big_smile.svg code = #1F600 cat = expressions desc = face with a big smile
emoji short = happy src = $(smiley_path)/1f603_happy.svg code = #1F603 cat = expressions desc = happy face
emoji short = grin src = $(smiley_path)/1f604_grin.svg code = #1F604 cat = expressions desc = grinning face
emoji short = grinning src = $(smiley_path)/1f600_grinning.svg code = #1F600 cat = expressions desc = grinning face
emoji short = smiley src = $(smiley_path)/1f603_smiley.svg code = #1F603 cat = expressions desc = smiling face with open mouth
emoji short = smile src = $(smiley_path)/1f604_smile.svg code = #1F604 cat = expressions desc = grinning face with open mouth and smiling eyes
emoji short = sweat_smile src = $(smiley_path)/1f605_sweat_smile.svg code = #1F605 cat = expressions desc = face grinning while sweating
emoji short = grinning src = $(smiley_path)/1f601_grinning.svg code = #1F601 cat = expressions desc = grinning face with teeth showing
emoji short = grin src = $(smiley_path)/1f601_grin.svg code = #1F601 cat = expressions desc = beaming face with smiling eyes

emoji short = laughing src = $(smiley_path)/1f606_laughing.svg code = #1F606 cat = expressions desc = laughing face
emoji short = joy src = $(smiley_path)/1f602_joy.svg code = #1F602 cat = expressions desc = laughing face with tears
Expand All @@ -44,7 +44,7 @@ emoji short = hugging_face src = $(smiley_path)/1f917_hugging_face.svg
emoji short = kiss src = $(smiley_path)/1f617_kiss.svg code = #1F617 cat = expressions desc = kissing face
emoji short = happy_kiss src = $(smiley_path)/1f619_happy_kiss.svg code = #1F619 cat = expressions desc = face kissing with happy closed eyes
emoji short = blush_kiss src = $(smiley_path)/1f61a_blush_kiss.svg code = #1F61A cat = expressions desc = face kissing while blushing
emoji short = wink_kiss src = $(smiley_path)/1f618_wink_kiss.svg code = #1F618 cat = expressions desc = face that is winking while making a kiss and a heart appears out of the kiss
emoji short = blowing_a_kiss src = $(smiley_path)/1f618_blowing_a_kiss.svg code = #1F618 cat = expressions desc = face that is winking while blowing a kiss

emoji short = smile_hearts src = $(smiley_path)/1f970_smile_hearts.svg code = #1F970 cat = expressions desc = smiling face surrounded by hearts
emoji short = heart_eyes src = $(smiley_path)/1f60d_heart_eyes.svg code = #1F60D cat = expressions desc = face with hearts in front of its eyes
Expand Down
2 changes: 1 addition & 1 deletion out_coherence_test.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
cd "$(dirname "$0")"
./orxporter/orxport.py -m manifest/out.orx -i ../input -q 32x32 -o out/all_slice -r resvg -f %f/%s -t 8 -F svg
./orxporter/orxport.py -m manifest/out.orx -i ../input -q 32x32 -o out/coherence -r resvg -f %f/%s -t 8 -F svg
6 changes: 4 additions & 2 deletions texts/design notes.txt → texts/design credits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ I want to give credit where credit is due :)

- The disabled icon is from The Accessible Icon Project (accessibleicon.org/)

- The idea for :hot_shit: was from @b_worsfold on Ello, of the runners up of Ello's emoji competition (ello.co/elloemojicontest/post/tgrlrlaaxcytbbfncugeka).
- The idea for :flaming_poop: was from @b_worsfold on Ello, of the runners up of Ello's emoji competition (ello.co/elloemojicontest/post/tgrlrlaaxcytbbfncugeka).

- The font for Latin text is D-DIN by datto, licensed SIL OFL. (https://fontlibrary.org/en/font/d-din)

Expand All @@ -15,4 +15,6 @@ I want to give credit where credit is due :)

- The don't @ me emoji idea was originally created by Spencer Alves. (@[email protected]) (https://dev.glitch.social/@impiaaa/99957358777306942)

- 'enby crossbow' was originally created by Qwyrdo & REM (@[email protected]). info about it's origins: https://todon.nl/@Qwyrdo/102560126483275761
- 'enby crossbow' was originally created by Qwyrdo & REM (@[email protected]). info about it's origins: https://todon.nl/@Qwyrdo/102560126483275761

- The original idea for :mild_panic: was by @cassidoo on Twitter (https://twitter.com/cassidoo/status/1129062070702419973)

0 comments on commit eafb744

Please sign in to comment.