Page 4 of 6

Re: Cimpletoon graphics

Posted: Tue Jun 14, 2022 2:21 am
by cazfi
Elefant wrote: Tue Jun 14, 2022 2:02 am I can't find information on how to make a patch with binary (.blend) files in it. Do you know where I could find that?
Unless you have a good reason to do a patch with an external tool (diff), you should do them directly with git, and that can handle binary files all right. It also produces patches easily applied by the tools we have (i.e., less work for maintainers)

https://www.freeciv.org/wiki/How_to_Con ... e_with_Git

Re: Cimpletoon graphics

Posted: Fri Jun 17, 2022 3:14 am
by Elefant
I made a patch using git-cola (a gui for git). However, someone will have to make sure it contains the blend files properly.
https://osdn.net/projects/freeciv/ticket/44825

Re: Cimpletoon graphics

Posted: Fri Jun 17, 2022 7:16 am
by cazfi
I'll check that.

On a general note, unfortunately OSDN does not send any notifications when a ticket has been updated by just adding an attachment. So please add also a comment (even if only "Patch attached") after you have added a patch to an existing ticket, for the notifications to be sent. So we know to look at the new patch.

I consider this a bug in OSDN, but at the moment we have to live with it.

Re: Cimpletoon graphics

Posted: Fri Jun 17, 2022 9:52 am
by cazfi
cazfi wrote: Fri Jun 10, 2022 5:32 amIt would make sense to have Isocams1.blend and IsoRender.blend in some subdirectory under data/graphics, wouldn't it?
btw. That was not meant like those would be the only things from your sets that should go in. That was just the most obvious and easiest part. Feel free to open further tickets now that you've got a bit more familiar with the process.

I've not evaluated them thoroughly, but I'd imagine that some of it could go in as similar separate "extra_units" .spec & .png for cimpletoon as what some other tilesets already have.

Re: Cimpletoon graphics

Posted: Fri Jun 17, 2022 2:32 pm
by Elefant
A quick question, is there a way to #include more than one spec file in a spec file? I tried to do this but it would just pick the first one and only include that.

Re: Cimpletoon graphics

Posted: Fri Jun 17, 2022 3:37 pm
by cazfi
There's no restrictions on how many files one can include (there might be some limit on the depth of includes; files including files including files including files ...)
More likely the format of the formed "complete file" was not proper. For example, I recently encountered this issue: https://osdn.net/projects/freeciv/ticket/44590

Re: Cimpletoon graphics

Posted: Sat Jun 18, 2022 3:02 am
by Elefant
Here's a patch to try and add some units.
https://osdn.net/projects/freeciv/ticket/44853

Re: Cimpletoon graphics

Posted: Sat Jun 18, 2022 5:02 am
by cazfi
You have not answered my question about the "Elefant@Elefant-PC.lan" email address in the first ticket, but as you now created also the new patch with that same configuration I assume that it's the address that you want to go to the repository.

Re: Cimpletoon graphics

Posted: Sat Jun 18, 2022 1:34 pm
by Elefant
That address is the address that is made by default by debian when you set it up. I guess I could change it to a no-reply address like you suggested.

Re: Cimpletoon graphics

Posted: Sat Jun 18, 2022 1:58 pm
by cazfi
You can reconfigure your email address in git by

Code: Select all

git config --global user.email "my.name@domain.org"
After that you can amend your existing commit (HEAD of your current branch) to update the author information:

Code: Select all

git commit --amend --reset-author