search

takluyver / weatbag

Written by Everyone Altogether, The Big Adventure Game
MIT License
21 stars 11 forks source link

Added S2 #6

Closed ghost closed 11 years ago

ghost commented 11 years ago

I plan to add some tiles in this direction. I'm new to online collaboration and the GitHub workflow in general so please let me know if I'm not following best practices or etiquette!

takluyver commented 11 years ago

You seem to have got the hang of Github just fine. One tip, though, is to use named branches, so the master branch remains a record of the central repo. To start a new named branch, run git checkout -b southern-tiles-1 (southern-tiles-1 is your branch name in this example).

A quibble about the game itself, though. Your leave() method is effectively filling in content for s2e1 & s2w1. I want to avoid doing things like that. You're welcome to add extra tiles there for some fields, which other people can build out from. I want the player to be mostly free to move around, not corralled into predefined paths.

ben174 commented 11 years ago

Awesome start!

ghost commented 11 years ago

Thanks for the feedback.

Git Question: If I make a branch locally, then push it to my fork of weatbag on github and then make a pull request, will the branch be added to takluyver/weatbag automatically? Or do I need to create the branch some other way?

I've added a bit to the southern tiles, and I figured it would be good to make a commit into takluyver's repo so that someone else doesn't start working in that direction.

takluyver commented 11 years ago

When you make a pull request, you pick a branch to use. Then when I merge it, the commits in that branch get added into takluyver/weatbag. You don't need to do anything extra.

Note that because you've just made a new branch, you'll need to make a new pull request for that. Normally you can just update a pull request by pushing more commits to the same branch.

takluyver commented 11 years ago

(Closing this PR in favour of #10)