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

Added a few notes to classes.xml #2680

Merged
merged 3 commits into from
Nov 2, 2015
Merged

Added a few notes to classes.xml #2680

merged 3 commits into from
Nov 2, 2015

Conversation

Brickcaster
Copy link
Contributor

I added a few tidbits of documentation regarding matrix32, array, and color, and sprite classes.

The 3 members of a matrix 32 are Vector2, not float.  Updated
documentation to reflect this.
@Brickcaster
Copy link
Contributor Author

It appears commit baa59c0 supercedes and makes commit d222e82559014430d64142a6c373543bf4f2233e irrelevant.

@akien-mga
Copy link
Member

It appears commit baa59c0 supercedes and makes commit d222e82 irrelevant.

Could you then rebase to remove d222e82? See git rebase -i HEAD~5 and remove the line corresponding to d222e82. This will prevent merge conflicts with @vnen's PR.

I wanted to document a trick using class color to highlight a sprite.
Added description to help understand how to utilize the ScrollContainer
node.
@Brickcaster
Copy link
Contributor Author

Alright, I did a rebase and removed the conflict.

@akien-mga
Copy link
Member

Thanks. Note that 44057ed might be overridden next time the template is updated from the source code; if those arguments are really Vector2s, then the issue might be in the source code directly. But we'll see, let's merge.

akien-mga added a commit that referenced this pull request Nov 2, 2015
Added a few notes to classes.xml
@akien-mga akien-mga merged commit b2f9acb into godotengine:master Nov 2, 2015
@Brickcaster Brickcaster deleted the onceagain branch November 5, 2015 02:55
@aaronfranke aaronfranke added this to the 2.0 milestone Jan 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants