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

Give Tux more control in mid-jump, similar to Milestone 1 #548

Closed
wants to merge 9 commits into from
Closed

Give Tux more control in mid-jump, similar to Milestone 1 #548

wants to merge 9 commits into from

Conversation

wansti
Copy link
Contributor

@wansti wansti commented Aug 14, 2016

No description provided.

@maxteufel maxteufel added this to the Post 0.5.0 milestone Aug 14, 2016
@@ -15,7 +15,7 @@
url = https://github.com/SuperTux/sexp-cpp.git
[submodule "data"]
path = data
url = https://github.com/SuperTux/data.git
url = https://github.com/wansti/data.git
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably don't want this in master.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably not. Sorry I thought I removed that.

On 14 August 2016 7:31:22 PM AEST, "M. Teufel" [email protected] wrote:

@@ -15,7 +15,7 @@
url = https://github.com/SuperTux/sexp-cpp.git
[submodule "data"]
path = data

We probably don't want this in master.

You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub:
https://github.com/SuperTux/supertux/pull/548/files/c886fcc79a1ae4b90592432f9a1508189c64e434#r74698720

Sent from my Android device with K-9 Mail. Please excuse my brevity.

@wansti
Copy link
Contributor Author

wansti commented Aug 14, 2016

Try again now.

ax *= 2;
}
}
else {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This indentation still looks wrong here.

@tobbi
Copy link
Member

tobbi commented Aug 15, 2016

You should add your discarded-ideas email to your github account so it knows you're the author of those commits.

@Karkus476
Copy link
Member

@wansti Please squash the commits, especially the reverts and mistakes.

@Karkus476
Copy link
Member

I didn't notice much, but it was just noticeable when changing direction. I have no strong opinion about this...

@wansti
Copy link
Contributor Author

wansti commented Aug 20, 2016

@Karkus476 Doesn't the person who merges the pull request have to do the squashing?

The idea of this patch is to make changing directions a bit more responsive. Makes it easier to land on one-tile wide blocks. Entrance to the Cave and Arctic Ruins are good places to try it.

@maxteufel
Copy link
Member

maxteufel commented Aug 20, 2016

@wansti You could do it on your branch too, but it can be done by anyone. The disadvantage of doing it when one doesn't have access to the branch in question is that you can only tell GitHub to mark this pull request as "closed". Otherwise, it could be marked "merged" too (in some cases, only). (Also see isaacs/github#2)

@maxteufel
Copy link
Member

👍 for the patch.

Wansti and others added 2 commits August 20, 2016 22:47
Use own fork of the data repository

revert last commit

Use own fork of the data repository

revert again

fix indentation

fix indentation again
@wansti
Copy link
Contributor Author

wansti commented Aug 20, 2016

Hm, now the squash is just an an additional commit on top of the others...
sorry I've never done this before.

@wansti wansti closed this Aug 20, 2016
@tobbi tobbi removed this from the Post 0.5.0 milestone Aug 21, 2016
@mrkubax10 mrkubax10 removed the status:needs-review Work needs to be reviewed by other people label Jul 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants