As I've modified the hawk sprites in the meantime, I think you'll need to get the latest version of wikipedia-fairy-sprites.png
The (ever recurring) problem is that yesterday night I still made some more 2d sprites for the 3d pieces I had already created with Tube, so that I could add and commit those. As a result we have again two incompatible 'latest versions' of the fairy-sprites file. Git cannot merge binary files, so I will have to create the merged image by hand, and then commit the rusult as a new commit, different from the original one. As I also had to do for adding the Terror. I will download the version from GitHub and take the new Hawk image out of that to copy it over the old one in my latest version.
This is really a very annoying characteristic of Jocly. It would have been much better is all the 2d sprites were just separate image files.
I think it should be possible to pull and merge the documentation reorganization into the same branch, as they should consider only independent changes. I will try it later today. If not we should copy it to a different branch, and then rebase one on top of the other; I am sure that will work.
Many of the games I made would need documentation too; since I was hacking those into the library, and control.html would not display rules and such anyway, I never bothered with that. The new pieces would need images that can be included in rule descriptions too.
The (ever recurring) problem is that yesterday night I still made some more 2d sprites for the 3d pieces I had already created with Tube, so that I could add and commit those. As a result we have again two incompatible 'latest versions' of the fairy-sprites file. Git cannot merge binary files, so I will have to create the merged image by hand, and then commit the rusult as a new commit, different from the original one. As I also had to do for adding the Terror. I will download the version from GitHub and take the new Hawk image out of that to copy it over the old one in my latest version.
This is really a very annoying characteristic of Jocly. It would have been much better is all the 2d sprites were just separate image files.
I think it should be possible to pull and merge the documentation reorganization into the same branch, as they should consider only independent changes. I will try it later today. If not we should copy it to a different branch, and then rebase one on top of the other; I am sure that will work.
Many of the games I made would need documentation too; since I was hacking those into the library, and control.html would not display rules and such anyway, I never bothered with that. The new pieces would need images that can be included in rule descriptions too.