aboutsummaryrefslogtreecommitdiff
path: root/js/io/system
Commit message (Collapse)AuthorAge
* Removed the shaders that we do not have rights to.hwc4872012-07-10
|
* BSD LicenseKris Kowal2012-07-09
|
* Merge branch 'normalize' of https://github.com/kriskowal/ninja-internalValerio Virgillito2012-07-09
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Remove trailing spacesKris Kowal2012-07-06
| |
| * Expand tabsKris Kowal2012-07-06
| |
* | Merge pull request #372 from mencio/youtube-fixValerio Virgillito2012-07-09
|\ \ | |/ |/| Removing the youtube hack now that we have the proper fix from montage
| * Removing the youtube hack now that we have the proper fix from montageValerio Virgillito2012-07-03
| | | | | | | | | | | | 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>
* | Update copyright boilerplateKris Kowal2012-07-06
|/
* adding missing montage to the user library and temporary fix for picas ↵Valerio Virgillito2012-07-03
| | | | | | screen trash Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* including the map icons inside the component and adding the empty categoryValerio Virgillito2012-06-26
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* fixed a small startup issue with the RDGE library.hwc4872012-06-22
|
* Merge branch 'refs/heads/master' into montage-v11-integrationValerio Virgillito2012-06-20
|\ | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Runtime change for Paris material.hwc4872012-06-15
| |
| * Fixes for runtime Taper materialhwc4872012-06-13
| |
* | updating the components and descriptor.json to support montage v.11Valerio Virgillito2012-06-17
|/ | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-12
|\ | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fix the brush tool runtime: update the brush coordinates to account for ↵Pushkar Joshi2012-06-11
| | | | | | | | change in bounding box due to smoothing
* | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-11
|\| | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * added gradients to pen path runtimePushkar Joshi2012-06-06
| |
| * updated the ninja library version (now contains brushstroke and pen path ↵Pushkar Joshi2012-06-05
| | | | | | | | rendering)
* | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-06
|\| | | | | | | | | | | | | Conflicts: js/components/tools-properties/fill-properties.reel/fill-properties.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Adding blocking logic to copy libsJose Antonio Marquez2012-06-03
| | | | | | | | Need to implement logic in parsing method, might require a minor restructuring.
* | adding the latest v0.10 montageValerio Virgillito2012-06-05
|/ | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Cleaning upJose Antonio Marquez2012-05-27
|
* Cleaning upJose Antonio Marquez2012-05-27
|
* Bumping RDGE version numberJose Antonio Marquez2012-05-22
| | | | This is to ensure there are no conflicts with older working files.
* montage v.0.10 integrationValerio Virgillito2012-05-16
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Squashed master into dom-architectureValerio Virgillito2012-05-16
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Full CSS support on openJose Antonio Marquez2012-05-03
| | | | Add full CSS for files on open (including loading cross-domain). This is only for files that are opened.
* Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-26
|\
| * Updating the canvas runtime files for gradient and rectangle radius fixes.Nivesh Rajbhandari2012-04-25
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Clean upJose Antonio Marquez2012-04-19
|/
* block filenames and directories with all spaceAnanya Sen2012-04-06
| | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* - disable ok when text box is cleared using backspace and cross, for file ↵Ananya Sen2012-04-04
| | | | | | name and directory location, in New file and save as dialog Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Removed the dependence on an "assets" directory for the RDGE runtime. Now ↵John Mayhew2012-04-03
| | | | Ninja does not need to create duplicate files when it sets up the users Ninja Projects directory for RDGE support.
* updated the rdge compiled version and its runtime, incremented rdge library ↵John Mayhew2012-04-03
| | | | version number
* Merge pull request #131 from ananyasen/integration-candidateValerio Virgillito2012-03-28
|\ | | | | Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266
| * IKNINJA-1367 - if filename contains #, then encode # so that the create URI ↵Ananya Sen2012-03-22
| | | | | | | | | | | | path includes the full filename Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Squashed commit of the following GL integrationValerio Virgillito2012-03-22
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/FileIO' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
|\ \
| * | Fix: Chrome 19 I/O BugJose Antonio Marquez2012-03-21
| |/ | | | | | | Fixed creating new files.
* / Temp I/O functionality for M-JS componentsJose Antonio Marquez2012-03-18
|/ | | | Added the ability to save montages component serialization from Ninja. Very rough, but functional.
* Temp Runtime WebGL FixJose Antonio Marquez2012-03-10
| | | | 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.
* Fixing Issues for Windows LibJose Antonio Marquez2012-03-09
|
* Adding I/O functionality to RDGEJose Antonio Marquez2012-03-08
| | | | Added webGL/Canvas file I/O for Ninja, it also created routine for saving data for runtime, however, the runtime RDGE library needs an update for runtime to work, so right now I/O will only work for Ninja.
* prefixing the local storage and using the new local-storage object.Valerio Virgillito2012-02-24
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-17
|\ | | | | | | | | | | | | | | Conflicts: css/ninja.css js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * Adding new RDGE library dataJose Antonio Marquez2012-02-16
| |
| * Setting up webGL library copy on saveJose Antonio Marquez2012-02-15
| |
| * Setting up webGL local library (assets)Jose Antonio Marquez2012-02-15
| |