Jump to content

Some animations are broken (gathering and other)


Mr.lie
 Share

Recommended Posts

15 hours ago, Nescio said:

Yes, command-line git is powerful and straightforward, whereas github, gitlab, etc. add a graphical interface on top of that, which can make it less obvious what you're doing. I'm glad you're comfortable with using a terminal, that makes things easier for me to reproduce.

Whenever you don't know which git command to use, type:


git help

To start, get a fresh repository (you already did that):


git clone https://github.com/0ADMods/millenniumad.git ad1000
cd ad1000/

And update it (that should not change anything right now):


git pull

Next, set your github credentials:


git config --local user.name "your github username"
git config --local user.email "your github e-mail"

At any point you can check your repository (that does not change anything, but makes it easier to understand what is happening):


git status

In this case, get the relevant commit (you already did that too):


git merge 2d06dab647b27ac28a341f12779148c7c1224417

In other cases, make changes in your repository, then commit them:


git add *
git commit -m "message what you did"

Then push to the relevant branch:


git push https://github.com/mrlie58/millenniumad

Enter your github username and password when prompted.

Next, visit https://github.com/mrlie58/millenniumad in your web browser. It should say:

This branch is 1 commit ahead of 0ADMods:master.

  • Click on “Pull request” (and sign in to your github account if you've not done so already).
  • Click on “Create pull request”.
  • Describe what you've done in the “Write”/“Leave a comment” field.
  • Click on “Create pull request”.
  • Wait for someone else to review and commit your pull request.

 

Just create a "Pull request" in the manner you describe - seems to be ok :)

pull_request_55.thumb.png.258d777607c0d27ca81c8cb9cc4a810a.png

pull_request_55_comments.thumb.png.6cd889fea1e28322eefd0f817fc8fc1c.png

Link to comment
Share on other sites

@Stan`, I've added a .editorconfig file to the Han China, which could be useful for other mods as well.

20 hours ago, Mr.lie said:

What should i find in the 'interestinglog.html'?

A list of all the errors and warnings you encountered in 0 A.D. or Atlas.

20 hours ago, Mr.lie said:

3. I know how to enable or disble mods - my question was, whether or not i can leave all mod-files in the mod-folder independently of they are enable or not.

Yes, you can leave all files in your local 0ad/mods/{any mod}/ folder.

5 hours ago, Mr.lie said:

Just create a "Pull request" in the manner you describe - seems to be ok :)

I've replied over there. Only someone with push authorization (e.g. @Stan`) can merge pull requests into the master repository, though.

  • Like 2
Link to comment
Share on other sites

14 hours ago, Stan` said:

I've never used it before @Nescio but thanks I guess. 

It's automatically detected by gitbucket, github, gitlab, etc. and could help preventing people from messing up file indentation etc.

14 hours ago, Stan` said:

Will try to look tomorrow

  • #54 corrects some unit templates.
  • #55 improves numerous art files.
  • #56 properly formats json data files.
Link to comment
Share on other sites

4 hours ago, Nescio said:

It's automatically detected by gitbucket, github, gitlab, etc. and could help preventing people from messing up file indentation etc.

  • #54 corrects some unit templates.
  • #55 improves numerous art files.
  • #56 properly formats json data files.

 

I've just installed Visual Studio Code and the Plug-in "EditorConfig for VS Code". So editing files with VS Code should always match your rules, is this right?

Link to comment
Share on other sites

1 hour ago, Mr.lie said:

I've just installed Visual Studio Code and the Plug-in "EditorConfig for VS Code". So editing files with VS Code should always match your rules, is this right?

51 minutes ago, Mr.lie said:

The difference between VS Code as VS is, that VS Code format the files on opening. In Visul Studio you have always use Ctrl-K, Ctrl-D (or menu) to format the code. And VS Code is much more quicker.

Just place the .editorconfig file in your mod folder and see what happens. Fedora 32 (operating system) and gedit (text editor) here, so I don't really know how things on Windows and in Visual Studio.

Link to comment
Share on other sites

On 7/16/2020 at 12:34 AM, Mr.lie said:

Camelry-Archer who have an helmet-prop attached have problems with the animation "attack_slaughter" - until now i didn't found a solution.

umay_cavalry_archer_merc_e.thumb.png.f981e9221361460419f2f60b62766244.png

ptol_cavalry_archer_e.thumb.png.f56ecbd1b8b5fba4e1d000d970382541.png

ptol_cavalry_archer_b.thumb.png.74bdc9014731be7988f1e065b9406594.png

ptol_cavalry_archer_a.thumb.png.91bf1ff5f21c4b48b2d4d99c7c1aaf56.png

 

Hello guys, maybe i've found the solution, please can you check this:

correct_attack_4.thumb.png.e8025ed31d07f26c072aeb850a3731c8.png

 

correct_attack_3.thumb.png.d9b854fb47eb667545429a5d6c2b77dc.png

correct_attack_2.thumb.png.d032e2124aa80784e68d2fbe948956b9.png

correct_attack_1.thumb.png.dbe3e94607a8bfab2557394f9754ce29.png

correct_attack_5.thumb.png.b986a28d8e8e0cb5ed3f78d616f1409c.png

 

 

Edited by Mr.lie
  • Like 2
Link to comment
Share on other sites

On 7/16/2020 at 1:51 PM, Mr.lie said:

Enter your github username and password when prompted.

Next, visit https://github.com/mrlie58/millenniumad in your web browser. It should say:

This branch is 1 commit ahead of 0ADMods:master.

  • Click on “Pull request” (and sign in to your github account if you've not done so already).
  • Click on “Create pull request”.
  • Describe what you've done in the “Write”/“Leave a comment” field.
  • Click on “Create pull request”.
  • Wait for someone else to review and commit your pull request.

I have just push some small changes in this manner, but at this point i can't go on:

grafik.thumb.png.35bed839310e08356a449c198a5e6ac0.png

 

After click on "Pull request i got this:

grafik.thumb.png.8f256663ed20d89ec3223e450300cd41.png

 

So at this point i'll stopped and waiting for your instructions :D

Link to comment
Share on other sites

37 minutes ago, Mr.lie said:

I have just push some small changes in this manner, but at this point i can't go on:

After click on "Pull request i got this:

So at this point i'll stopped and waiting for your instructions :D

Since you've already created a pull request, pushing to its branch is sufficient. As you can see your three commits are included: https://github.com/0ADMods/millenniumad/pull/55/commits

Now you just have to edit your opening post to summarize what you've done.

  • Thanks 1
Link to comment
Share on other sites

You could try:

git restore simulation/templates/*

Though I suspect that has no effect in this case, since you already committed your changes.

Which means you'll have to open the affected files, manually revert the changes you made, and save the files.

[EDIT] Basically it could be solved by copy-and-paste. In this case it's not too much work, only 3 + 6 files, I believe:

art/actors/units/anglo/infantry_javelinist_a.xml
art/actors/units/anglo/infantry_javelinist_b.xml
art/actors/units/anglo/infantry_javelinist_e.xml
simulation/templates/template_unit_infantry_melee.xml
simulation/templates/units/anglo_support_female_citizen.xml
simulation/templates/units/caro_support_female_citizen.xml
simulation/templates/units/norse_support_female_citizen.xml
simulation/templates/units/umay_infantry_clubman_merc_b.xml
simulation/templates/units/umay_support_female_citizen.xml

Once you've done them all, commit them again:

git add *
git commit -m "address requested changes"
git push https://github.com/mrlie58/millenniumad

 

Edited by Nescio
listed the files involved
Link to comment
Share on other sites

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.

Guest
Reply to this topic...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

 Share

×
×
  • Create New...