Updating the 2D tutorial in light of an editor bug

[GarrickWinter]

Issue #41283 is currently disrupting the flow of the official 2D tutorial for users with external script editors.

This change is to update the tutorial to acknowledge this bug and provide newcomers with clearer guidelines on how to complete the tutorial despite the bug.

It also clarifies a potential point of confusion about how strictly function naming conventions must be adhered to.

[GarrickWinter]

Thank you for the corrections AThousandShips!

[AThousandShips]

These are unrelated changes, and should be kept in a separate PR

[GarrickWinter]

Will do! I'm new to contributing to the project; thanks for outlining the norm.

[AThousandShips]

At the same time please squash your commits into one, see here

[GarrickWinter]

Okay, I believe that removes the unrelated changes from this PR. Going to go over and squash the commits in my other branch before making a PR for those.

[AThousandShips]

Please go ahead and squash the commits in this one too, as it has 14 of them

[GarrickWinter]

This is embarrassing, but I don't know how to do that. I'm new to contributing to repositories other than my own on GitHub, so I'm still coming to grips with how the workflow works. I've tried squashing the 14 commits, but GitHub Desktop is giving me an error: Unable to squash. Squashing replays all commits up to the last one required for the squash. A merge commit cannot exist among those commits. I also can't squash subsets of the commits, even individual pairs.

[AThousandShips]

You need to drop the merge commit you have, using "drop" as a command, and when updating your branch you need to use git push --force so you don't get the merge commits put in there

I'll take a look tomorrow about providing more detailed instructions by testing doing it myself

[paulloz]

The note reads like writing an OnBodyEntered() method in your code and typing it as _on_body_entered in the connection window would work? Unless this is a new behaviour in recent 4.2 (I don't believe it is), that's not the case.

[AThousandShips]

I don't have any problems using the command line interface, just using git rebase -i upstream/master, I'm not sure what you are using exactly, but if you use the command line it will be simple to fix it, I don't use the github desktop app myself

[GarrickWinter]

The note reads like writing an OnBodyEntered() method in your code and typing it as _on_body_entered in the connection window would work? Unless this is a new behaviour in recent 4.2 (I don't believe it is), that's not the case.

You're right! I tested again this morning. I'm not sure where my original confusion about this came from, but I was convinced it was connecting despite the format of the function name not matching (I still changed it to match after coming to that conclusion, because I just really didn't like them not being exact matches).

I think the fact that the connection icon in the Node panel is bright green even if there's no connected function in the script might have contributed to the confusion. I've removed that part of my edit.

[GarrickWinter]

I'm hoping to figure out how to squash these commits today. I've never used the command line with Git so it will be a learning process.

[GarrickWinter]

There, I think that did it!

[skyace65]

Looks good, just needs a few minor changes.

[skyace65]

Thanks! Congrats on your first merged PR! I've done a squash and merge for this PR but as AThousandShips said previously, you should be keeping everything to 1 commit, I'm making an exception since this is your first merged PR.

In the future I'd recommend updating your branch as described in the doc page AThousandShips linked to so you don't have to do a rebase. If that's something you can't do with the GitHub desktop app I'd recommend trying a different workflow. Personally I use VisualStudio Code, but use whatever you find works best for you!