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.

Sign up for GitHub

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

Jump to bottom

Add obb3 class #125

Merged
merged 1 commit into from
Apr 11, 2015
Merged

Add obb3 class #125

merged 1 commit into from
Apr 11, 2015

Conversation

Fox32
Copy link
Contributor

@Fox32 Fox32 commented Apr 10, 2015

Basic obb3 class with some common methods and intersection tests.

@Fox32 Fox32 mentioned this pull request Apr 10, 2015
Closed
@kevmoo
Copy link
Collaborator

kevmoo commented Apr 11, 2015

@Fox32 Care to rebase and clean this up?

@Fox32
Copy link
Contributor Author

Fox32 commented Apr 11, 2015

I rebased this but there were no conflicts?

@kevmoo
Copy link
Collaborator

kevmoo commented Apr 11, 2015

@Fox32 I'm sorry, I mean rebase and flatten. git rebase -i <johnsrepo/master>

So the commit history is nice and clean. 😄

@Fox32
Copy link
Contributor Author

Fox32 commented Apr 11, 2015

Done :)

@kevmoo
Copy link
Collaborator

kevmoo commented Apr 11, 2015

Shouldn't this be one commit?

@Fox32
Copy link
Contributor Author

Fox32 commented Apr 11, 2015

This time it is all squashed

kevmoo added a commit that referenced this pull request Apr 11, 2015
@kevmoo
Merge pull request #125 from Fox32/feature/add-obb
464d977 
Add obb3 class
@kevmoo kevmoo merged commit 464d977 into google:master Apr 11, 2015
@Fox32 Fox32 deleted the feature/add-obb branch April 11, 2015 20:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Fox32 @kevmoo