search

cwmonkey / reactor-knockoff

26 stars 31 forks source link

Non-active tiles can't be activated manually #19

Closed asl97 closed 5 years ago

asl97 commented 6 years ago

Non-active tiles can't be activated manually, resulting in players ether waiting or forced to remove and place again.

the players should be able to manually activate the tiles or the tiles should all get activated when there is enough money instead of just one per tick.

cwmonkey commented 5 years ago

@asl97 Haven't used github much (collaboratively), is there a way to grab your fixes into this repo?

asl97 commented 5 years ago

@cwmonkey If you mean merging specific commit through github, as far as I am aware of, there isn't any.

If you use git, you can try the cherry-pick command, however I do doubt if it can cleanly merge some of the commit due to the numerous performance changes I did.

In fact, when I tried to cherry-pick the black hole accelerator fix, I still need to manually fix it up.

If you want to work off the top of my fork, it would be fairly simple from git, not from github though, 

git remote add asl97 https://github.com/asl97/reactor-knockoff
git checkout asl97/master -b name_of_new_branch
git push -u origin HEAD # assuming origin is your repo name

then from github update the default branch to the new branch.

or you can force override the current master branch with the new branch.

git push -f -u origin HEAD:master # dangerous, only use if you understand

I did not exactly created my fork with merging part of it back upstream in mind since there was a number of unmerged pull request which at that time was two years old.

cwmonkey commented 5 years ago

@asl97 Yeah I dropped the ball on that, sorry 😬

I'll give syncing them up a shot.

cwmonkey commented 5 years ago

@asl97 ok, updated master to your master. Thanks for the help.

If you're cool with it you can send me PR's and I'll get them in asap.

Also feel free to give them some credit in game.