Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wider tubes + proper tube look (merge #23 before, pls) #25

Merged
merged 7 commits into from
Mar 9, 2018

Conversation

DaGuT
Copy link
Contributor

@DaGuT DaGuT commented Mar 9, 2018

merge this #23 first, as mine relies on that request

@DaGuT DaGuT changed the title nice parallax + wider tubes nice parallax + wider tubes + new tube look Mar 9, 2018
@DaGuT
Copy link
Contributor Author

DaGuT commented Mar 9, 2018

now I added #25 these images so that you can use them in your video in 2h, when I'll be sleeping

@DaGuT
Copy link
Contributor Author

DaGuT commented Mar 9, 2018

added collision fix for wide this.w

@meiamsome
Copy link
Member

Please don't include parallax in this PR - it is something that does not belong with these other changes and is going to be an issue with conflicts. PRs are usually preferred to be minimal changes (Pipe changes should be able to be the sprites and the width changes, I suppose).

Can you explain why your comment says the collision model fails? As far as I can tell it shouldn't

@meiamsome
Copy link
Member

Also, I would check with @K1ngjulien whether they are OK with you using their sprites for your implementation.

@DaGuT
Copy link
Contributor Author

DaGuT commented Mar 9, 2018

Previous collision was checking if ends of image were on opposite sites of tube, now when size of bird is less than tube, it cannot be true. So now it's working. I'm playing it right now.

Gonna delete parallax, pls merge xD So that I can go sleeping

@meiamsome
Copy link
Member

Oh right, I saw that problem while I was on your branch and didn't realise I had already pulled it into master!

@DaGuT
Copy link
Contributor Author

DaGuT commented Mar 9, 2018

Yeah, sry for that :)

@DaGuT
Copy link
Contributor Author

DaGuT commented Mar 9, 2018

If you merge this #23 , mine code is gonna work and his commit will be seen.

Or should I rever back to my old pipe?

@DaGuT DaGuT changed the title nice parallax + wider tubes + new tube look wider tubes + proper tube look Mar 9, 2018
@K1ngjulien
Copy link
Contributor

@meiamsome if you merge my pr #23 @DaGuT can implement my images if he wants to 😃

@DaGuT
Copy link
Contributor Author

DaGuT commented Mar 9, 2018

Thank you. Now I fully remade my code to use your images. They are no longer with my commits

peaks are gonna be later, as it's 2:07 an :(

@DaGuT
Copy link
Contributor Author

DaGuT commented Mar 9, 2018

Boom, and peaks are added
image
However, collision still thinks peak is rectangle.

Thx to #23 for his awesome paintings

@DaGuT
Copy link
Contributor Author

DaGuT commented Mar 9, 2018

@meiamsome All my changes are just for tubes. So It's small pull request :)

Now I'm gonna sleep, have a good day and please merge #23 with me :)

@DaGuT DaGuT changed the title wider tubes + proper tube look wider tubes + proper tube look (merge #23 before, pls) Mar 9, 2018
@K1ngjulien
Copy link
Contributor

Awesome is a bit of an overstatement but thank you 😄

@meiamsome meiamsome merged commit 95277c8 into CodingTrain:master Mar 9, 2018
This was referenced Mar 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants