| Commit message (Collapse) | Author | Age |
|
|
|
| |
This check should be removed once version 22 of Chrome is made stable. Please test before merging.
|
|
|
|
| |
This addresses issues with Chrome Canary warnings related to library file copying. Please test fully before merging.
|
|
|
|
| |
Fixes issues with copying library files from File System. Need to fix ArrayBuffer, but this is just a warning that does not break functionality.
|
| |
|
|
|
|
| |
Added a fix to prevent the on close dialog of Chrome from appearing when an user has to download the Ninja Cloud app. Everything should work the same, only no dialog appears when clicking on download.
|
| |
|
| |
|
|
|
|
|
|
|
| |
Was lower-case. Now upper-case.
Also fixed BOMs, trailing white-space, DOS line terminators. Did not
expand tabs to spaces.
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
|\ \
| |/
|/| |
Removing the youtube hack now that we have the proper fix from montage
|
| |
| |
| |
| |
| |
| | |
Removing the saved instance of the component when opening a file containing the youtube component. Montage made the fix where the instance is now serialized property.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|/ |
|
|
|
|
|
|
| |
screen trash
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|
|
|
| |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\
| |
| | |
Modifying HTML template
|
| |
| |
| |
| | |
Adding a soft reset to the HTML file we create, this eliminates the margin/padding added to the page by browsers, and better illustrates what the user sees in Ninja.
|
|/ |
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
js/io/system/ninjalibrary.json
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
|
| |\
| | |
| | |
| | | |
Textures
|
| | | |
|
| |/
|/|
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|/
|
|
| |
Added 'leader board' template to banners.
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
js/io/system/ninjalibrary.json
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |
| |
| |
| | |
change in bounding box due to smoothing
|
| |
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
js/io/system/ninjalibrary.json
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |\
| | |
| | | |
Bugfix master
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | | |
|
| | |/
| |/|
| | |
| | | |
rendering)
|
|\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
js/components/tools-properties/fill-properties.reel/fill-properties.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |/
| |
| |
| | |
Need to implement logic in parsing method, might require a minor restructuring.
|
|/
|
|
| |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |
|
| |
|
|
|
|
| |
This is to ensure there are no conflicts with older working files.
|
|
|
|
| |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|
|
|
| |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|
|
|
| |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |
|
|
|
|
| |
Needs to be inside most child div.
|
|
|
|
| |
Adding animation sub-category to template in new file.
|