-
Notifications
You must be signed in to change notification settings - Fork 203
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make 3 main branches mergeable, and unify changes (#6)
* temporarily revert line endings to windows to do merge * standardize on linux-style line endings (newline only)
- Loading branch information
1 parent
db32166
commit 2766c88
Showing
4 changed files
with
70 additions
and
70 deletions.
There are no files selected for viewing
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,29 @@ | ||
| # Animal Logic Contributors | ||
| This is a list of the contributors to the Animal Logic USD Maya plugin. Please let us know if anyone is missing from this list, as we value all contributions made! | ||
|
|
||
| ``` | ||
| Aloys Baillet | ||
| Daniel Barry | ||
| Rob Bateman | ||
| Frieder Czeschla | ||
| Sebastien Dalgo | ||
| Miguel Gao | ||
| Matthew Hampsey | ||
| Eddie Hoyle | ||
| Hongbin Hu | ||
| Jakub Jeziorski | ||
| Haoliang Jiang | ||
| Nicolas Kendall-Bar | ||
| Fabrice Macagno | ||
| Aleka McAdams | ||
| Pal Mezei | ||
| Joshua Miller | ||
| Pilar Molina | ||
| Paul Molodowitch | ||
| Eoin Murphy | ||
| Michael Quandt | ||
| Nathan Rusch | ||
| Alex Schwank | ||
| Daniel Scott | ||
| Wen Tan | ||
| ``` | ||
| # Animal Logic Contributors | ||
| This is a list of the contributors to the Animal Logic USD Maya plugin. Please let us know if anyone is missing from this list, as we value all contributions made! | ||
|
|
||
| ``` | ||
| Aloys Baillet | ||
| Daniel Barry | ||
| Rob Bateman | ||
| Frieder Czeschla | ||
| Sebastien Dalgo | ||
| Miguel Gao | ||
| Matthew Hampsey | ||
| Eddie Hoyle | ||
| Hongbin Hu | ||
| Jakub Jeziorski | ||
| Haoliang Jiang | ||
| Nicolas Kendall-Bar | ||
| Fabrice Macagno | ||
| Aleka McAdams | ||
| Pal Mezei | ||
| Joshua Miller | ||
| Pilar Molina | ||
| Paul Molodowitch | ||
| Eoin Murphy | ||
| Michael Quandt | ||
| Nathan Rusch | ||
| Alex Schwank | ||
| Daniel Scott | ||
| Wen Tan | ||
| ``` |
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,32 @@ | ||
| # Contributing to USD For Maya | ||
|
|
||
| ## Contributor License Agreement # | ||
| Before contributing code to this project, we ask that you sign a Contributor License Agreement (CLA). | ||
|
|
||
| + [AutodeskFormCorpContribAgmtForOpenSource.docx](AutodeskFormCorpContribAgmtForOpenSource.docx) please sign this one for corporate use | ||
| + [AutodeskFormIndContribAgmtForOpenSource.docx](AutodeskFormIndContribAgmtForOpenSource.docx) please sign this one if you're an individual contributor | ||
|
|
||
| The documents include instructions on where to send the completed forms to. Once a signed form has been received you will be able to submit pull requests. | ||
|
|
||
|
|
||
| ## Filing Issues | ||
|
|
||
| ### Suggestions | ||
|
|
||
| The USD for Maya project is meant to evolve with feedback - the project and its users greatly appreciate any thoughts on ways to improve the design or features. Please use the `enhancement` tag to specifically denote issues that are suggestions - this helps us triage and respond appropriately. | ||
|
|
||
| ### Bugs | ||
|
|
||
| As with all pieces of software, you may end up running into bugs. Please submit bugs as regular issues on GitHub - Maya developers are regularly monitoring issues and will prioritize and schedule fixes. | ||
|
|
||
| The best bug reports include a detailed way to predictably reproduce the issue, and possibly even a working example that demonstrates the issue. | ||
|
|
||
| ## Contributing Code | ||
|
|
||
| The USD for Maya project accepts and greatly appreciates contributions. The project follows the [fork & pull](https://help.github.com/articles/using-pull-requests/#fork--pull) model for accepting contributions. | ||
|
|
||
| When contributing code, please also include appropriate tests as part of the pull request, and follow the same comment and coding style as the rest of the project. Take a look through the existing code for examples of the testing and style practices the project follows. | ||
|
|
||
| All development should happen against the "develop" branch of the repository. Please make sure the base branch of your pull request is set to the "develop" branch when filing your pull request. | ||
|
|
||
| It is highly recommended that an issue be logged on GitHub before any work is started. This will allow for early feedback from other developers and avoid multiple parallel efforts. | ||
| # Contributing to USD For Maya | ||
|
|
||
| ## Contributor License Agreement # | ||
| Before contributing code to this project, we ask that you sign a Contributor License Agreement (CLA). | ||
|
|
||
| + [AutodeskFormCorpContribAgmtForOpenSource.docx](AutodeskFormCorpContribAgmtForOpenSource.docx) please sign this one for corporate use | ||
| + [AutodeskFormIndContribAgmtForOpenSource.docx](AutodeskFormIndContribAgmtForOpenSource.docx) please sign this one if you're an individual contributor | ||
|
|
||
| The documents include instructions on where to send the completed forms to. Once a signed form has been received you will be able to submit pull requests. | ||
|
|
||
|
|
||
| ## Filing Issues | ||
|
|
||
| ### Suggestions | ||
|
|
||
| The USD for Maya project is meant to evolve with feedback - the project and its users greatly appreciate any thoughts on ways to improve the design or features. Please use the `enhancement` tag to specifically denote issues that are suggestions - this helps us triage and respond appropriately. | ||
|
|
||
| ### Bugs | ||
|
|
||
| As with all pieces of software, you may end up running into bugs. Please submit bugs as regular issues on GitHub - Maya developers are regularly monitoring issues and will prioritize and schedule fixes. | ||
|
|
||
| The best bug reports include a detailed way to predictably reproduce the issue, and possibly even a working example that demonstrates the issue. | ||
|
|
||
| ## Contributing Code | ||
|
|
||
| The USD for Maya project accepts and greatly appreciates contributions. The project follows the [fork & pull](https://help.github.com/articles/using-pull-requests/#fork--pull) model for accepting contributions. | ||
|
|
||
| When contributing code, please also include appropriate tests as part of the pull request, and follow the same comment and coding style as the rest of the project. Take a look through the existing code for examples of the testing and style practices the project follows. | ||
|
|
||
| All development should happen against the "develop" branch of the repository. Please make sure the base branch of your pull request is set to the "develop" branch when filing your pull request. | ||
|
|
||
| It is highly recommended that an issue be logged on GitHub before any work is started. This will allow for early feedback from other developers and avoid multiple parallel efforts. |
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| ## Repository Layout | ||
|
|
||
| | Location | Description | | ||
| | ------------- | --------------- | | ||
| | lib | The libraries that all other plugins depend on. Will contain common utilities and features. | | ||
| | plugin/pxr | The Pixar Maya plugin | | ||
| ## Repository Layout | ||
|
|
||
| | Location | Description | | ||
| | ------------- | --------------- | | ||
| | lib | The libraries that all other plugins depend on. Will contain common utilities and features. | | ||
| | plugin/pxr | The Pixar Maya plugin | | ||
| | plugin/al | The Animal Logic Maya plugin | |
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| ## NOTE | ||
|
|
||
| This folder holds the libraries that all other plugins depend on. It will contain library of building blocks. | ||
| ## NOTE | ||
|
|
||
| This folder holds the libraries that all other plugins depend on. It will contain library of building blocks. |