search

BabylonJS / Editor

Community managed visual editor for Babylon.js
http://editor.babylonjs.com/
813 stars 232 forks source link

+add camera and cylinder, New "Add Non-Mesh" and "Add Mesh" toolbar tabs. #152

Closed givowo closed 4 years ago

julien-moreau commented 4 years ago

All good! Please just remove the file "BabylonJS Editor Setup 3.1.3.exe" from your commits, these builds should not be included in the repository has they are too heavy Thanks! :)

givowo commented 4 years ago

I deleted the setup file and updated my repo to be up-to-date with your sound commits.

julien-moreau commented 4 years ago

Hey thanks but you can't do that, I'll have conflicts when rebasing the branch feature/graph from master. Please remove these commits as they are coming in master soon. Also, can you please drop your commit instead of removing the file and commit ? If you don't drop the commit, the .exe will still be in the git tree and users that will clone the reprository will download the exe :(

givowo commented 4 years ago

Oh, ok. I'm pretty sure I added it on it's own commit, so that shouldn't be an issue

On Wed, Oct 30, 2019, 2:05 PM Julien Moreau-Mathis notifications@github.com wrote:

Hey thanks but you can't do that, I'll have conflicts when rebasing the branch feature/graph from master. Please remove these commits as they are coming in master soon. Also, can you please drop your commit instead of removing the file and commit ? If you don't drop the commit, the .exe will still be in the git tree and users that will clone the reprository will download the exe :(

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/BabylonJS/Editor/pull/152?email_source=notifications&email_token=AJ473PIYGG45GIOKAUOBJX3QRHLIJA5CNFSM4JFKYSSKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOECVNOCY#issuecomment-548067083, or unsubscribe https://github.com/notifications/unsubscribe-auth/AJ473PMYXKAVNYLCNJKW3IDQRHLIJANCNFSM4JFKYSSA .

julien-moreau commented 4 years ago

@Giv0 any news? I can still se the commits and still can't merge :(

givowo commented 4 years ago

I reverted my commits to delete and create the setup file. Sorry for taking a while, I have limited access to github. (and an actual pc in general) ;)

givowo commented 4 years ago

Oh, good it looks like it was merged. I had updated it a little while back sorry for not saying anything.

On Mon, Nov 18, 2019, 12:51 PM Julien Moreau-Mathis < notifications@github.com> wrote:

Merged #152 https://github.com/BabylonJS/Editor/pull/152 into master.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/BabylonJS/Editor/pull/152?email_source=notifications&email_token=AJ473POQRQUIYTEUOFQNKN3QULP27A5CNFSM4JFKYSSKYY3PNVWWK3TUL52HS4DFWZEXG43VMVCXMZLOORHG65DJMZUWGYLUNFXW5KTDN5WW2ZLOORPWSZGOU5URHRY#event-2808681415, or unsubscribe https://github.com/notifications/unsubscribe-auth/AJ473PNHWTXZPPMS5V7ZEQLQULP27ANCNFSM4JFKYSSA .

julien-moreau commented 4 years ago

No worry and thanks for your contribution :)

givowo commented 4 years ago

:)

On Tue, Nov 19, 2019 at 2:19 AM Julien Moreau-Mathis < notifications@github.com> wrote:

No worry and thanks for your contribution :)

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/BabylonJS/Editor/pull/152?email_source=notifications&email_token=AJ473PNM63BRZJ6RZXOJ3Z3QUOOPTA5CNFSM4JFKYSSKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEENIRIQ#issuecomment-555387042, or unsubscribe https://github.com/notifications/unsubscribe-auth/AJ473PNCCVIZCFI746PHSMLQUOOPTANCNFSM4JFKYSSA .