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

Fixed proposed changes to Flare plugin #1781

Merged
merged 12 commits into from Oct 12, 2017

Conversation

Projects
None yet
2 participants
@dorkster
Contributor

dorkster commented Oct 11, 2017

#1417 appears to have been untouched for the passed 9 months or so. I've fixed the merge conflicts, as well as making a few style changes based on how we format data for Flare. The output we want is background_color=R,G,B,A, where RGBA are 8-bit integers.

Peter Ferrarotto and others added some commits Dec 14, 2016

Peter Ferrarotto Peter Ferrarotto
Peter Ferrarotto Peter Ferrarotto
Changed background color to use single tag, and fixed issue with file…
… paths not being output to the exported txt file.
Peter Ferrarotto Peter Ferrarotto
Enabled Flare reading background color, and also fixed reading issue …
…that put all objects one tile lower than they were placed
Peter Ferrarotto Peter Ferrarotto
Removed height fix, resulted in new bug of height increasing by one e…
…very time the flare file is saved and not exported: resulted in ever-increasing height
Merge remote-tracking branch 'PeterJFerraotto/flare-issue-alteration'…
… into flare_plugin

- Fix indentation (tabs -> spaces)
@bjorn

Looks good, I had mostly just a few more comments on the coding style.

I hope you don't mind if I squash these commits into a single change when merging.

Show outdated Hide outdated src/plugins/flare/flareplugin.cpp Outdated
Show outdated Hide outdated src/plugins/flare/flareplugin.cpp Outdated
Show outdated Hide outdated src/plugins/flare/flareplugin.cpp Outdated
Show outdated Hide outdated src/plugins/flare/flareplugin.cpp Outdated
@dorkster

This comment has been minimized.

Show comment
Hide comment
@dorkster

dorkster Oct 11, 2017

Contributor

I've made the requested fixes. And feel free to squash the commits.

Contributor

dorkster commented Oct 11, 2017

I've made the requested fixes. And feel free to squash the commits.

@bjorn bjorn merged commit 395ddb1 into bjorn:master Oct 12, 2017

0 of 2 checks passed

continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
@bjorn

This comment has been minimized.

Show comment
Hide comment
@bjorn

bjorn Oct 12, 2017

Owner

Thanks!

Owner

bjorn commented Oct 12, 2017

Thanks!

@dorkster dorkster deleted the dorkster:flare_plugin branch Oct 17, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment