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

Adding callback on CubeTexture and a CubeTexture Loader Task #1394

Merged
merged 5 commits into from
Oct 10, 2016
Merged

Adding callback on CubeTexture and a CubeTexture Loader Task #1394

merged 5 commits into from
Oct 10, 2016

Conversation

AGallouin
Copy link
Contributor

@AGallouin AGallouin commented Oct 10, 2016

Adding a CubeTexture loader task following the logic of the texture loader task

@deltakosh
Copy link
Contributor

Seems great so far. But can you please just merge *.ts files?

@AGallouin
Copy link
Contributor Author

AGallouin commented Oct 10, 2016

The merge isn't automatic when I have no conflicts ?

EDIT: It seems the only conflict is on dist/preview release/babylon.d.ts, but I don't have the rights to write on this repo. Or I misunderstood what you meant.

@deltakosh
Copy link
Contributor

Merges are not automatic :) I need to bless them (me or someone from the core team)

My ask was: Please update yoru PR to not merge .js files :)

@deltakosh
Copy link
Contributor

Hum something went wrong as your PR contains no file now :)

@AGallouin
Copy link
Contributor Author

That should be good now. Didn't knew if i needed to comit the d.ts file, cause it's a generated one, but still a ts. We will see.

@deltakosh
Copy link
Contributor

That's fine:)
Just last ask: please credit yourself in the readme: https://github.com/BabylonJS/Babylon.js/blob/master/dist/preview%20release/what's%20new.md

@deltakosh deltakosh merged commit 3aeb729 into BabylonJS:master Oct 10, 2016
@AGallouin
Copy link
Contributor Author

Thanks !

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