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

Merge layout shapes #93

Merged
merged 18 commits into from Feb 27, 2017
Merged

Merge layout shapes #93

merged 18 commits into from Feb 27, 2017

Conversation

brean
Copy link
Collaborator

@brean brean commented Feb 26, 2017

  • merge PIXI.layout and PIXI.shapes back into main project
  • switch to floss from testem (same as PIXI - creates a nice HTML-coverage report)
  • switch from gulp to webpack (makes the build process a lot easier)

@brean brean mentioned this pull request Feb 26, 2017
Copy link
Member

@FlorianLudwig FlorianLudwig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally: Awesome 👍 Lots of good changes.

Would like to sort the API change out before merging.

PS I would have welcomed several merge requests as this one contains a lot of disconnected changes.

* @param jsonPath {Array}
*/
Theme.prototype.loadImage = function(jsonPath) {
Theme.prototype.addImage = function(jsonPath) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is the reason for renaming the function?

I would like to avoid unnecessarily breaking the API.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed the name because this function now only adds the file to the loader and does not load it. You need to call load on the GOWN.loader/PIXI.loader manually after you added all your files (this changed in some PIXI 4-version ).

@FlorianLudwig FlorianLudwig merged commit 4f77fb2 into master Feb 27, 2017
@FlorianLudwig FlorianLudwig deleted the merge_layout_shapes branch February 27, 2017 10:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants