Mr.lie Posted July 18, 2020 Author Report Share Posted July 18, 2020 55 minutes ago, Nescio said: 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. Once you've done them all, commit them again: git add * git commit -m "address requested changes" git push https://github.com/mrlie58/millenniumad DONE - sorry for the trouble i've made Quote Link to comment Share on other sites More sharing options...
Stan` Posted July 18, 2020 Report Share Posted July 18, 2020 Object color is in art/actors Quote Link to comment Share on other sites More sharing options...
Nescio Posted July 18, 2020 Report Share Posted July 18, 2020 27 minutes ago, Mr.lie said: DONE - sorry for the trouble i've made No need to apologize, we're fully aware you're new to this, still learning, and have the best of intentions. Unfortunately, you're not done yet: Please restore the indentation in those two templates ( https://github.com/0ADMods/millenniumad/pull/55/files#diff-62763f015915eda05180f3deb3b47f3f ). Quote Link to comment Share on other sites More sharing options...
Mr.lie Posted July 18, 2020 Author Report Share Posted July 18, 2020 7 minutes ago, Nescio said: No need to apologize, we're fully aware you're new to this, still learning, and have the best of intentions. Unfortunately, you're not done yet: Please restore the indentation in those two templates ( https://github.com/0ADMods/millenniumad/pull/55/files#diff-62763f015915eda05180f3deb3b47f3f ). Done, i'll hope this time correct 2 Quote Link to comment Share on other sites More sharing options...
wowgetoffyourcellphone Posted July 21, 2020 Report Share Posted July 21, 2020 Those arent even the right horse models. Quote Link to comment Share on other sites More sharing options...
Stan` Posted July 22, 2020 Report Share Posted July 22, 2020 Mmmh, I'm not sure this is a good idea, also you forgot to remove the windows... Maybe you could raise the second floor? Quote Link to comment Share on other sites More sharing options...
Stan` Posted July 22, 2020 Report Share Posted July 22, 2020 I guess fixing the pickaxes migth have been easier But yeah it will need some thinking. Also I notice you are using A23B horses, which are different from A24 horses, and that might play against you : S Another solution would be to reverse the horses Quote Link to comment Share on other sites More sharing options...
asterix Posted July 23, 2020 Report Share Posted July 23, 2020 On 7/18/2020 at 9:49 PM, Mr.lie said: Done, i'll hope this time correct @Mr.lie there are some new comments https://github.com/0ADMods/millenniumad/pull/55 by @Stan` Quote Link to comment Share on other sites More sharing options...
Mr.lie Posted July 23, 2020 Author Report Share Posted July 23, 2020 (edited) 4 hours ago, asterix said: @Mr.lie there are some new comments https://github.com/0ADMods/millenniumad/pull/55 by @Stan` Sorry, i saw the comments from @Stan` but thought it was just an information that he has this done. So, i've just correct the two files online, as nescio said. I'll hope this time it's correct. Edited July 23, 2020 by Mr.lie 1 Quote Link to comment Share on other sites More sharing options...
Mr.lie Posted July 24, 2020 Author Report Share Posted July 24, 2020 On 7/8/2020 at 12:31 AM, Mr.lie said: Hello guys, i've noticed that some variants are broken: <prop actor="props/units/tools/pick.xml" attachpoint="weapon_R"/> seems to be ok, <prop actor="props/units/tools/pick.xml" attachpoint="weapon_L"/> seems to be not ok by the girls all three variants are wrong, by the guys only "gather_ruins" @Stan` fix in https://github.com/0ad/0ad/pull/32/commits/f0902554667d13fdc196380c067086ce1e5a1b9a Quote Link to comment Share on other sites More sharing options...
Mr.lie Posted July 24, 2020 Author Report Share Posted July 24, 2020 On 7/15/2020 at 11:35 PM, Mr.lie said: I've found a small issue on the pers_champion_cavalry_archer (animation_walk): And he is using an arrow on animation "attack_slaughter" @Stan` fix in https://github.com/0ad/0ad/pull/32/commits/01f0160d81e93c3607d2072833986608d2e27a27 Quote Link to comment Share on other sites More sharing options...
Stan` Posted July 24, 2020 Report Share Posted July 24, 2020 Thanks for the Pull Request, unfortunately that's not how we receive patches currently in the main game... Quote Link to comment Share on other sites More sharing options...
asterix Posted July 24, 2020 Report Share Posted July 24, 2020 1 hour ago, Mr.lie said: @Stan` fix in https://github.com/0ad/0ad/pull/32/commits/01f0160d81e93c3607d2072833986608d2e27a27 if you want to patch main game you need to put it here https://code.wildfiregames.com/differential/diff/create/ Quote Link to comment Share on other sites More sharing options...
Mr.lie Posted July 24, 2020 Author Report Share Posted July 24, 2020 Can you please describe, what i have to do to put i.e. the two fixes above in a correct manner? Thank you. Quote Link to comment Share on other sites More sharing options...
Stan` Posted July 24, 2020 Report Share Posted July 24, 2020 If you use the git repo run git diff -U5000 > file.diff and if you use the svn repo run svn diff -x -U5000 > file.diff Then upload the diff in the link @asterix gave above Quote Link to comment Share on other sites More sharing options...
Mr.lie Posted July 24, 2020 Author Report Share Posted July 24, 2020 2 minutes ago, Stan` said: file.diff this is a unique file-name? Ist der Name "file.diff" einzigartig und immer gleich? Quote Link to comment Share on other sites More sharing options...
asterix Posted July 24, 2020 Report Share Posted July 24, 2020 @Mr.lie https://trac.wildfiregames.com/wiki/SubmittingPatches https://trac.wildfiregames.com/wiki/Phabricator#UsingDifferential Note: if we speak about art there should be EOL native and given group reviews O12: Art Quote Link to comment Share on other sites More sharing options...
Stan` Posted July 24, 2020 Report Share Posted July 24, 2020 Nein es kann alles sein Quote Link to comment Share on other sites More sharing options...
Mr.lie Posted July 24, 2020 Author Report Share Posted July 24, 2020 Auf der o.g. Seite habe ich gelesen: Quote Ideally, those changes are already described in one of our Trac tickets, so you know it is wanted. It would be a shame if you put some effort in a code that we actually don't want. If your change is a feature, it needs to have a ticket associated so we can discuss whether the feature is wanted and how. If it is a bugfix or a tiny change in the code, it's not mandatory to create a new ticket. Ich habe die issues zwar gepostet, aber es gibt ja keine Tickets darüber. Vielleicht wünscht Ihr dies ja garnicht Quote Link to comment Share on other sites More sharing options...
Stan` Posted July 24, 2020 Report Share Posted July 24, 2020 Well if it fixes an art but I'll have them. I'd like to understand why we need relax back instead of ready though Quote Link to comment Share on other sites More sharing options...
Mr.lie Posted July 24, 2020 Author Report Share Posted July 24, 2020 8 minutes ago, Stan` said: Well if it fixes an art but I'll have them. I'd like to understand why we need relax back instead of ready though There are 4 variants for rider-cavalry-archer: base_archer_fast_back.xml base_archer_fast_hip.xml base_archer_relax_back.xml base_archer_relax_hip.xml The Persian champion_cavalry_archer is the only one with the quiver on his back, all the other (there are only 2 other in the main-game) have their quiver on the left side. As there are two different variants they need to be named different. Another question: with "art" you mean "artist"? Quote Link to comment Share on other sites More sharing options...
Mr.lie Posted July 24, 2020 Author Report Share Posted July 24, 2020 @Stan` For the first i uploaded one patch. Please can you give a look at it to see, whether or not it's correct? Thank's in advance. 1 Quote Link to comment Share on other sites More sharing options...
Mr.lie Posted July 24, 2020 Author Report Share Posted July 24, 2020 27 minutes ago, Mr.lie said: @Stan` For the first i uploaded one patch. Please can you give a look at it to see, whether or not it's correct? Thank's in advance. Sorry, i just saw i've forgot the O12: Art. Next time i add it. Thank you. Quote Link to comment Share on other sites More sharing options...
Recommended Posts
Join the conversation
You can post now and register later. If you have an account, sign in now to post with your account.