-
Notifications
You must be signed in to change notification settings - Fork 11
Ship PR #16
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
Open
Arefu
wants to merge
37
commits into
TreyarchGames:master
Choose a base branch
from
Arefu:Ship
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Ship PR #16
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…hen gives the ability to enter a custom one in.
…t you can auto open APE after creating it to fine tune your settings, basically making it easier for people who export models
To make mlMainWindow.* less cluttered, I am seperating my code into seperate Headers and CPP files.
Split up GDT creator to reduce clutter. I will add comments to my commits and generally improve code quality.
Didn't notice it would stop compilation. I might swap it around later.
I fluffed up Git last night, it broke a lot more than Intended. So here I am back at step one.
Starting to make Zone Editor better.
I have been doing so much codingon this recently, I am going to need to take a bit of a break :(.
You can now add files by clicking on them in the zone editor. I will also be improving this a lot this weekend, I will also be finally making the GDT creator, check the git cards to see what I have planned.
This update adds some stuff to the GDT Creator, it sitll doesn't create the GDT file, but it will next commit, I am just creating a dialog that will prompt similar to the zone editor asking what sort of GDT it should create either xmodel or image
But doesn't work at the same time.
Such is lifein my compile history. This one changes optional rung args to additional compile args for the cod2map stage of compliation.
Base cod2map args, doesn't work as of yet.
Confering with SE2Dev, I might work on making the arguments read from a JSON file or something similar so it is more user friendly to add more in future.
Annnd that's all I wrote, I'll get it fully working in the weekend.
Just had to move my GDT Creator to it's own file, it's 50/50 atm, I'll move the rest next commit when I get more time. This should make it easier to manage for other people, I'll eventually do the same for my zone editor.
The GDT creation suite is now moved fully, it also now copies and works.
This is a stable build slating what features I deem to be stable enough to enter the main branch.
Author
|
Conflict resolved. As I thought, it was the way how the launcher was storing things citing the bug that didn't get tracked. |
Author
|
I know time flies when you guys are having fun, but ya' know. There is a reply button for a reason. but alas I guess the intern forgot how to merge a PR. |
Author
|
Did you guys fire the intern, or did he leave? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR bring features I think are stable enough 😏 [cough] 😏 to enter the main branch.
It adds the following
As usual, any questions concerns etc I can help out and trying to explain my logic.
I also noticed Git has "warned" me that there are conflicts, this is to be expected because as #14 shows I knew about it and applied my own fix as soon as I tracked it down. That should be the only conflict anything else I can try resolve for you guys.
But, would be nice to get some feedback before you merge it as I would also like some answers from you guys namely: #13