search

guidokessels / xwing-data

An easy-to-use collection of data and images from X-Wing: The Miniatures Game by Fantasy Flight Games.
93 stars 37 forks source link

Added images and data for game tokens and upgrade slots. #212

Closed jmthompson2015 closed 6 years ago

jmthompson2015 commented 6 years ago

Applied TinyPNG to images.

jmthompson2015 commented 6 years ago

I don't know what to do. I'm stuck.

guidokessels commented 6 years ago

Hey, thanks for your pull request!

It seems like there's a merge conflict, I think it's because your copy of ship.js was lagging behind the copy in my repository. So there have been changes in the meantime which prevent your changes from being merged. Your copy is from Dec 29, 2017 where as my copy of ships.js was last changed in Apr 30, 2018.

Do you really need to have all these silhouettes/tokens/icons as image files? In my projects I've been using the excellent xwing-miniatures-font to display these.

jmthompson2015 commented 6 years ago

Using the font is a good idea. Let's forget this PR.