xander/main
1
0
Fork 0
mirror of https://github.com/googlefonts/noto-emoji.git synced 2025-07-08 05:26:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'remotes/origin/master' into emoji12

Browse source 
# Conflicts:
#	CHANGES.md
This commit is contained in:
Constantin A 2019-06-13 11:30:38 +02:00
commit 5b68a2abba
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES.md
View file

@ -6,6 +6,8 @@ Due to the fact that I didn't worked with git in mind, ALL emojis have been reup
Any other modifications that have been made can be seen in the Git history as these modifications have been made _after_ uploading
this repository to Github.
It's totally possible that this list is not complete and it might be broken in some parts since it's in many parts semi-automatically created.
There are currently four types of changes:
- `new`: Completely new emojis which do not have to do anything with the original Noto Emoji project.
@ -185,7 +187,6 @@ The entries are currently not in order
| ![🥌](https://rawgit.com/googlei18n/noto-emoji/png/128/emoji_u1f94c.png) | ![🥌](http://rawgit.com/C1710/blobmoji/master/png/128/emoji_u1f94c.png) | U+1f94c | goo | |
| ![🧥](https://rawgit.com/googlei18n/noto-emoji/png/128/emoji_u1f9e5.png) | ![🧥](http://rawgit.com/C1710/blobmoji/master/png/128/emoji_u1f9e5.png) | U+1f9e5 | goo | |
| ![🤫](https://rawgit.com/googlei18n/noto-emoji/e456654119cc3a5f9bebb7bbd00512456f983d2d/png/128/emoji_u1f92b.png) | ![🤫](http://rawgit.com/C1710/blobmoji/master/png/128/emoji_u1f92b.png) | U+1f92b | new* | |
| ![🏳](https://rawgit.com/googlei18n/noto-emoji/e456654119cc3a5f9bebb7bbd00512456f983d2d/png/128/emoji_u1f3f3.png) | ![🏳](http://rawgit.com/C1710/blobmoji/master/png/128/emoji_u1f3f3.png) | U+1f3f3 | new | |
| ![🧐](https://rawgit.com/googlei18n/noto-emoji/e456654119cc3a5f9bebb7bbd00512456f983d2d/png/128/emoji_u1f9d0.png) | ![🧐](http://rawgit.com/C1710/blobmoji/master/png/128/emoji_u1f9d0.png) | U+1f9d0 | new* | |
| ![🥺](https://rawgit.com/googlei18n/noto-emoji/e456654119cc3a5f9bebb7bbd00512456f983d2d/png/128/emoji_u1f97a.png) | ![🥺](http://rawgit.com/C1710/blobmoji/master/png/128/emoji_u1f97a.png) | U+1f97a | new* | |
| ![🥶](https://rawgit.com/googlei18n/noto-emoji/e456654119cc3a5f9bebb7bbd00512456f983d2d/png/128/emoji_u1f976.png) | ![🥶](http://rawgit.com/C1710/blobmoji/master/png/128/emoji_u1f976.png) | U+1f976 | new* | |

2
README.md
View file

@ -33,7 +33,7 @@ use 'python setup.py develop' ('install' currently won't fully install all the
data used by nototools). You will also need fontTools, get it from
https://github.com/behdad/fonttools.git.
Then run make. NotoColorEmoji is the default target. It's suggested to use -j,
Then run `make`. NotoColorEmoji is the default target. It's suggested to use `-j`,
especially if you are using zopflipng for compression. Intermediate products
(compressed image files, for example) will be put into a build subdirectory; the
font will be at the top level.

2
emojicompat/README.md
View file

@ -1,4 +1,4 @@
# Please note that all these features (except for the Blobmoji EmojiCompat font itself) are now included in their own library which you can find at [FileMojiCompat](FileMojiCompat). This page (and folder) will be updated soon :sweat_smile:
# Please note that all these features (except for the Blobmoji EmojiCompat font itself) are now included in their own library which you can find at [FileMojiCompat](https://github.com/C1710/FilemojiCompat). This page (and folder) will be updated soon :sweat_smile:
## You can use this font in [EmojiCompat](https://developer.android.com/guide/topics/ui/look-and-feel/emoji-compat.html)!
The most important file for this is `NotoEmojiCompat.ttf`. This is the font you'll need.
There are three different ways to use this font in EmojiCompat: