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

Platybuilder #17

Closed
wants to merge 15 commits into from
Closed

Platybuilder #17

wants to merge 15 commits into from

Conversation

MeuhV1
Copy link
Contributor

@MeuhV1 MeuhV1 commented Nov 28, 2015

Merged Platybuilder v4.17

MeuhV1 added 15 commits November 10, 2015 13:01
Test
75980ed
Merge branch 'develop' of https://github.com/dguenms/Dawn-of-Civiliza…
0f8efb0 
…tion into develop
Merge branch 'develop' of https://github.com/dguenms/Dawn-of-Civiliza…
623f650 
…tion into develop
Test
0fa3da0
Merge branch 'develop' of https://github.com/dguenms/Dawn-of-Civiliza…
b73a16c 
…tion into develop
Expanded corporation screen
2a5808f
Merge branch 'develop' of https://github.com/dguenms/Dawn-of-Civiliza…
1ae2378 
…tion into develop
Revert "Test"
705230a 
This reverts commit 75980ed.
Revert "Test"
d05c2cb 
This reverts commit 75980ed.
Revert "Test"
0ab943b 
This reverts commit 75980ed.
Merge branch 'develop' of https://github.com/dguenms/Dawn-of-Civiliza…
6fc9623 
…tion into CorpScreen

# Conflicts:
#	Assets/XML/Text/CIV4GameText_RFCBTS.xml
Merge branch 'CorpScreen' into develop
21ca94c
Merged DoC updates
2ccd9ad
PlatyPedia
f312cca
Platybuilder update
9a5e43f
@dguenms
Copy link
Owner

dguenms commented Nov 29, 2015

Is this the Platybuilder, or the WB from History Rewritten?

Also, the commit log looks really messy. Can you take a look here and rebase your fork and then start a pull request from a new branch?

@MeuhV1
Copy link
Contributor Author

MeuhV1 commented Nov 29, 2015

It's platybuilder, but that's the one HR uses. (Although I used a more recent version of platybuilder)

I will try to reorganize my fork. I did create a seperate branch for this feature however.

@dguenms
Copy link
Owner

dguenms commented Nov 29, 2015

Oh, I also thought that was the case. But then I looked into Platybuilder and it seemed very different than what HR has? Am I confusing something here?

And yeah, the branch is alright, but it since it includes your develop branch it seems to have inherited its cluttered history. If you rebase to DoC's develop things should look better.

@dguenms
Copy link
Owner

dguenms commented Dec 3, 2015

Okay, I checked again and the WB is indeed the same. I think I confused it with Platypedia?

Anyway, this looks good. I manually merged it to squash all the commits.

@dguenms dguenms closed this Dec 3, 2015
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
@MeuhV1 @dguenms