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

Remove per-player sensors, solves issue #40 #48

Closed
wants to merge 3 commits into from
Closed

Remove per-player sensors, solves issue #40 #48

wants to merge 3 commits into from

Conversation

Afforess
Copy link
Collaborator

The major change here is that get_line now includes the player. [Fixes #40. -Narc]

Note: This PR also includes changes from PR #47, do not accept this until PR #47 is accepted.

@narc0tiq
Copy link
Owner

Excellent! This is exactly what I wanted from #40, thanks very much!

However, for future reference, it is preferable to build separate disconnected PRs than do... whatever it is that just created different commit IDs for the same commits. Some rebasing may have been involved? Not to fret, though, I can fix this.

@Afforess
Copy link
Collaborator Author

@narc0tiq I can try and rebase myself.

Edit: Ninja'd.

narc0tiq added a commit that referenced this pull request Feb 14, 2016
@narc0tiq
Copy link
Owner

Merged in b09ca68.

I think in your case, it'd be some cherry-picks to rewrite history so that only the commits that actually need to be in each PR will be in it, followed by a force-push to the PR branches.

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.

None yet

2 participants