| Commit message (Collapse) | Author | Age |
| |
|
|
|
|
| |
This apparently now magically started working through an update in Chrome 21, hence rendering the need for the old method useless.
|
|
|
|
| |
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.
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
js/io/system/ninjalibrary.json
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
|
| | |
|
|/
|
|
| |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
js/io/system/ninjalibrary.json
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |
| |
| |
| | |
change in bounding box due to smoothing
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
js/io/system/ninjalibrary.json
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Valerio Virgillito <valerio@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>
|
|
|
|
| |
Add full CSS for files on open (including loading cross-domain). This is only for files that are opened.
|
|\ |
|
| |
| |
| |
| | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|/ |
|
|
|
|
| |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
|
|
|
|
|
| |
name and directory location, in New file and save as dialog
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
|
|
|
| |
Ninja does not need to create duplicate files when it sets up the users Ninja Projects directory for RDGE support.
|
|
|
|
| |
version number
|
|\
| |
| | |
Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266
|
| |
| |
| |
| |
| |
| | |
path includes the full filename
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\ \ |
|
| |/
| |
| |
| | |
Fixed creating new files.
|
|/
|
|
| |
Added the ability to save montages component serialization from Ninja. Very rough, but functional.
|
|
|
|
| |
Added a temporary fix to allow for webGL runtime functionality. Copying the desired folder name into a static name. There is a lag in doing this, so obviously now ideal. Need to discuss adding dynamic path-ing during author and runtime.
|
| |
|