+ROLLSPRITES backport

Post a reply

Smilies
:D :) :( :o :shock: :? 8-) :lol: :x :P :oops: :cry: :evil: :twisted: :roll: :wink: :geek: :ugeek: :!: :?: :idea: :arrow: :| :mrgreen: :3: :wub: >:( :blergh:
View more smilies

BBCode is OFF
Smilies are ON

Topic review
   

Expand view Topic review: +ROLLSPRITES backport

Re: +ROLLSPRITES backport

by Major Cooke » Wed Sep 30, 2015 3:03 pm

Done.

Re: +ROLLSPRITES backport

by Nash » Wed Sep 30, 2015 3:01 pm

MajorCooke: Please cancel the PRs you made for this. My backport is not complete (I just checked) and I will re-do it properly.

Re: +ROLLSPRITES backport

by Major Cooke » Fri Sep 25, 2015 8:35 am

Nash and I were asking if there were any issues with the code so far. While it may work for our ends, we cannot be sure Graf will be happy with the implementation.

I also wouldn't be surprised if this took even longer due to the recent revert.

Re: +ROLLSPRITES backport

by Xaser » Fri Sep 25, 2015 8:31 am

From a stubborn semi-dev's perspective: "Hey, is this done yet?" is a surefire way to make me not want to work on a feature.

Re: +ROLLSPRITES backport

by Major Cooke » Wed Sep 23, 2015 5:04 am

I would very much like to hear about this too.

Re: +ROLLSPRITES backport

by Nash » Tue Sep 22, 2015 9:34 pm

Graf Zahl: Any feedback? Was the code bad?

Re: +ROLLSPRITES backport

by Major Cooke » Tue Sep 15, 2015 8:14 pm

Roughly liky Phantom, I wound up just making a remote to GZDoom in my ZDoom, made a new branch off of GZDoom's latest commit and called it a day after implementing the code. Couldn't be arsed to go through the pain anymore because I couldn't get the pull requests to work.
Spoiler:
This worked, though switching between the branches requires cleaning out a few things (just the gltext stuffs). Was simple though. I then went to Graf's gzdoom github page and had the pull request made there with the code changes.

Re: +ROLLSPRITES backport

by phantombeta » Sun Sep 13, 2015 7:22 pm

I can't remember exactly what to do, but I think this should work:
  • Create a new empty repo in SmartGit. (Don't link it to the GitHub repo yet.)
  • Add ZDoom's repo as a new remote. (Remote>Add...)
  • Pull everything from the new remote. (Right click the remote in the branches view then click "Pull...")
  • Double click the branch you want to make a pull request for in the Branches view to checkout the branch.
  • It should now ask if you want to create a local branch or not.
  • Choose "Create local branch".
  • Add a new branch with the name you want. (Branch>Add Branch... or F7)
  • Add a new remote with the name "origin" and link it to your fork of the GZDoom repo.
  • Push the branch. (There should be a big "Push" button in the main view) When it asks you what to do, click "Configure".
  • The origin remote (Your GitHub repo) should now have a new branch that is up to date with the branch you're making the pull request for.
Make your changes, commit and push like normal. You should be able to use TortoiseGit after the last step.
To make a new branch for a pull request, do it again from step 3. (Skip step 8)
To make the pull request for ZDoom, go to the main page of the GitHub repo. It should show the new branches. Click the "Compare & Pull Request" button next to the branch you want and make the pull request.
In the "Comparing changes" page, change the "Base" branch to the one you want to make a pull request for.

Re: +ROLLSPRITES backport

by Nash » Sun Sep 13, 2015 5:58 pm

phantombeta wrote:@Nash
I don't use the command-line. I use SmartGit.
Okay then can you describe the exact process you go through with SmartGit, please? Thanks.

Re: +ROLLSPRITES backport

by phantombeta » Sun Sep 13, 2015 5:52 pm

@Nash
I don't use the command-line. I use SmartGit.

Re: +ROLLSPRITES backport

by Nash » Sun Sep 13, 2015 5:43 pm

phantombeta wrote:I don't use TortoiseGit, so... *shrugs*
Please give me the exact command lines you use, then.

Re: +ROLLSPRITES backport

by Major Cooke » Fri Sep 11, 2015 9:26 am

https://github.com/rheit/zdoom/pull/377
https://github.com/coelckers/gzdoom/pull/27

Okay, that was quite a bit more/less difficult than I expected.

Nash, can I show you how?

Re: +ROLLSPRITES backport

by Nash » Fri Sep 11, 2015 8:41 am

Guess anyone who's interested in using this will just have to wait. The rules didn't say forum code submissions are forbidden so unless that rule changes (or unless someone can help me do it without installing additional software than I already have)... ¯\(°_o)/¯

EDIT: can I just send a pull request for GZDoom then. The ZDoom changes can be backported easily, it's just adding 1 line in actor.h and thingdef_data.cpp. Super trivial stuff.

Re: +ROLLSPRITES backport

by Tormentor667 » Fri Sep 11, 2015 8:09 am

Oh my god, this feature would be awesome

Re: +ROLLSPRITES backport

by Major Cooke » Fri Sep 11, 2015 7:14 am

I suggest SourceTree. I can teach you how to use that.

Top