aboutsummaryrefslogtreecommitdiff
path: root/js/document/html-document.js
Commit message (Collapse)AuthorAge
* Merge branch 'master' into pentoolPushkar Joshi2012-04-24
|\
| * adjusting the bread crumb to work with the new templateValerio Virgillito2012-04-23
| | | | | | | | | | | | Initial container get setup in ninja now. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * reverting old template to current working status. New template work.Valerio Virgillito2012-04-20
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * initial stage web templateValerio Virgillito2012-04-18
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'master' into pentoolPushkar Joshi2012-04-17
|\| | | | | | | | | Conflicts: js/tools/PenTool.js
| * Removing fill, stroke, fillMaterial and strokeMaterial from the shapeModel ↵Nivesh Rajbhandari2012-04-05
| | | | | | | | | | | | cache because they can easily get out of sync with the actual colors and materials. Instead, we will always query the object for these values. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js js/controllers/elements/shapes-controller.js js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/geom/line.js js/mediators/element-mediator.js js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Merge branch 'refs/heads/ninja-internal' into WebGLFileIONivesh Rajbhandari2012-03-30
| | |\ | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Updated shapes to always check for its stroke and fill colors and materials ↵Nivesh Rajbhandari2012-03-29
| | | | | | | | | | | | | | | | | | | | | | | | instead of relying on the shapeModel cache because it can get out of sync. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-06
|\| | |
| * | | 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.
| * | | removed old unused import and export functions.John Mayhew2012-04-03
| | | |
| * | | Namespaced the canvas runtime file and updated all dependenciesJohn Mayhew2012-04-03
| | |/ | |/|
* / | working File I/O for pen tool created paths and some minor bug fixes ↵Pushkar Joshi2012-04-03
|/ / | | | | | | (correctly setting the canvas for brush stroke file I/O, correct plane matrix for file I/O)
* / File IO for the brush stroke AND changing the data type of brush stroke from ↵Pushkar Joshi2012-03-27
|/ | | | GEOM_TYPE_CUBIC_BEZIER to GEOM_TYPE_BRUSH_STROKE
* Removing m-js components I/O and fix for webGLJose Antonio Marquez2012-03-23
| | | | Removed saving m-js components as new components broke I/O when present. Also made a fix for checking length of webGL array since first item now is non-user data. (That is to be removed)
* Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-22
|\ | | | | | | FileIO-Montage-Components
| * Squashed commit of the following GL integrationValerio Virgillito2012-03-22
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Adding Ninja URL method to io-mediatorJose Antonio Marquez2012-03-22
|/
* 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.
* Corrections for Uber shader IOhwc4872012-03-14
|
* Fixed BumpMetal materialhwc4872012-03-13
|
* Add temp delay for webGL previewJose Antonio Marquez2012-03-10
| | | | Added a padded launch webGL preview delay. This is very temporary, just a work around until RDGE issues are fixed.
* further removal of authortime asset path replacement.hwc4872012-03-09
|
* Removed asset path replacement at authortime.hwc4872012-03-09
|
* Adding webGL I/O runtime functionalityJose Antonio Marquez2012-03-09
| | | | There is a problem that needs to be resolved in the CanvasRuntime.
* Merge branch 'refs/heads/integration' into FileIO-IntegrationJose Antonio Marquez2012-03-09
|\ | | | | | | | | Conflicts: js/document/html-document.js
| * Canvas IOhwc4872012-03-08
| |
* | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-08
|\ \ | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js js/helper-classes/3D/draw-utils.js
| * | IKNINJA-1270: fixed browser crashing when you close a document while playing ↵Ananya Sen2012-03-08
| | | | | | | | | | | | | | | | | | a video Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | Merge pull request #30 from ananyasen/FileIO-ananyaJose Antonio Marquez Russo2012-03-08
|\ \ \ | | | | | | | | FileIO branch pull request
| * | | Merge branch 'refs/heads/FileIO-jose' into FileIO-ananyaAnanya Sen2012-03-08
| |\| |
| * | | minor fixesAnanya Sen2012-03-07
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | added close file menu itemAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | Merge branch 'refs/heads/FileIO-jose' into FileIO-ananyaAnanya Sen2012-03-06
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/selection-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | removed unnecessary console logsAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | IKNINJA-1270: fixed browser crashing when you close a document while playing ↵Ananya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a video then wait for a while Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | 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.
* | | | | Merge pull request #29 from ericmueller/integrationJose Antonio Marquez Russo2012-03-08
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | Integration
| * | | removed an unused parameter to CanvasDataManagerhwc4872012-03-08
| | | |
| * | | Commented out code for loading for runtimehwc4872012-03-08
| | | |
| * | | Fixed a few problems with Plasma material.hwc4872012-03-07
| | | |
| * | | File IOhwc4872012-03-07
| | | |
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-03-06
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration Conflicts: js/preloader/Preloader.js
| | * | | Fixing WebGL not available bugJose Antonio Marquez2012-03-06
| | | | |
| * | | | Updated buildShapeModel to set PI and selection values too and also avoid ↵Nivesh Rajbhandari2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fill material for lines. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | update the shapeModel after importhwc4872012-03-06
| | | | |
| * | | | Authortime import of 2d & 3d canvaseshwc4872012-03-06
| | | | |
| * | | | Merge branch 'TimelineUber' of github.com:imix23ways/ninja-internal into ↵hwc4872012-03-06
| |\ \ \ \ | | | | | | | | | | | | | | | | | | integration
| | * | | | Squashed commit of the following:Jonathan Duran2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |