Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge branch 'master' of https://github.com/BabylonJS/Babylon.js
# Conflicts: # dist/preview release/babylon.core.js # dist/preview release/babylon.d.ts # dist/preview release/babylon.js # dist/preview release/babylon.max.js # dist/preview release/babylon.noworker.js
- Loading branch information
Showing
82 changed files
with
8,501 additions
and
4,343 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
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
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
2 changes: 1 addition & 1 deletion
2
Exporters/Unity 5/EditorToolkit/Assets/Babylon/Library/manager.bjs
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file modified
BIN
+512 Bytes
(100%)
Exporters/Unity 5/EditorToolkit/Assets/Babylon/Plugins/BabylonExport.Entities.dll
Binary file not shown.
Oops, something went wrong.