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

add rhombic polihedra #1022

Merged
merged 5 commits into from
Aug 11, 2021
Merged

add rhombic polihedra #1022

merged 5 commits into from
Aug 11, 2021

Conversation

mfrasca
Copy link
Contributor

@mfrasca mfrasca commented Jun 7, 2021

more options for calendars

addresses own issue #1020

adds square-of-two rhombic icosahedron (type 1) and golden rhombic icosahedron (makes a nice flat lying calendar).

Checklist

I'm very happy to contribute my changes/enhancements under the following terms:

  • Code changes are licensed under GPLv2 + LPPLv1.3c
  • Documentation changes are licensed under FDLv1.2
  • Add an example in the manual.

mfrasca added 4 commits June 6, 2021 17:30
the rhombi faces are four: right or left leaning, golden or square-of-two
ratio between diagonals.  there's the "type 1" rhombic dodecahedron, a
Catalan solid having as faces square-of-two rhombi, the "type 2" rhombic
dodecahedron having as faces golden rhombi, and about half the faces needed
to build a golden rhombic tricontahedron.
@hmenke
Copy link
Member

hmenke commented Aug 4, 2021

Sorry for the long wait. Can you please add an example to the manual? Then I will merge it.

@mfrasca
Copy link
Contributor Author

mfrasca commented Aug 9, 2021

"Commit is not signed off by the committer"
what do I need to do?

@hmenke
Copy link
Member

hmenke commented Aug 10, 2021

Your PR was opened before I decided to require a Developer Certificate of Origin, but if you feel like doing it please read https://developercertificate.org/ and then after rebasing and squashing your commits, add --signoff to add the Signed-off-by: message.

$ git fetch https://github.com/pgf-tikz/pgf master
$ git rebase origin/master
$ git reset --soft origin/master 
$ git commit --signoff -m "folding: add dodecahedron rhombic and golden"
$ git push -f

@mfrasca
Copy link
Contributor Author

mfrasca commented Aug 10, 2021

Your PR was opened before I decided to require a Developer Certificate of Origin […]

$ git fetch https://github.com/pgf-tikz/pgf master
$ git rebase origin/master
$ git reset --soft origin/master 
$ git commit --signoff -m "folding: add dodecahedron rhombic and golden"
$ git push -f

I'm not sure … doesn't this assume I may write on your upstream? my remotes are:

mario@rune:~/Local/github/mfrasca/pgf$ git remote -v
origin	git@github.com:mfrasca/pgf.git (fetch)
origin	git@github.com:mfrasca/pgf.git (push)

@hmenke hmenke merged commit 3abc90c into pgf-tikz:master Aug 11, 2021
@hmenke
Copy link
Member

hmenke commented Aug 11, 2021

Nevermind, it's fine as it is. Merged.

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

Successfully merging this pull request may close these issues.

2 participants