aboutsummaryrefslogtreecommitdiff
path: root/js/document
Commit message (Collapse)AuthorAge
...
| | * | | Backup for mergeJose Antonio Marquez2012-04-04
| | | | |
| | * | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-02
| | |\ \ \
| | * | | | Setting up document reworkJose Antonio Marquez2012-04-02
| | | | | |
| * | | | | 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
| * | | | Merge pull request #159 from mqg734/WebGLMaterialsValerio Virgillito2012-04-09
| |\ \ \ \ | | | | | | | | | | | | 3D tools, eyedropper, fill, ink-bucket, gradients and shape fixes.
| | * | | | 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/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/default_html.css js/mediators/element-mediator.js js/panels/properties.reel/properties.js js/tools/BrushTool.js js/tools/LineTool.js js/tools/PenTool.js js/tools/SelectionTool.js js/tools/ShapeTool.js js/tools/TranslateObject3DTool.js 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>
| | | | * | | Give user feedback about which element the Fill/InkBottle tools will act on.Nivesh Rajbhandari2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | Adding logic for flatten checkbox in PI.Nivesh Rajbhandari2012-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires minor modifications to both StageController and ComponentController. Also removing unused global3DSettings CSS. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-06
|\| | | | | |
| * | | | | | Merge pull request #157 from ananyasen/ninja-internal-master-patch1Valerio Virgillito2012-04-04
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | [CR] Keep Save related menu items always enabled, if there is an open do...
| | * | | | | [CR] Keep Save related menu items always enabled, if there is an open documentAnanya Sen2012-04-04
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | 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.
| * | | | | removed old unused import and export functions.John Mayhew2012-04-03
| | | | | |
| * | | | | Namespaced the canvas runtime file and updated all dependenciesJohn Mayhew2012-04-03
| |/ / / /
* | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-03
|\| | | |
| * | | | Merge pull request #147 from pushkarjoshi/brushtoolValerio Virgillito2012-03-29
| |\ \ \ \ | | |_|_|/ | |/| | | Brushtool
| * | | | 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
| | * | | | - enable/disable save, saveAs, saveAll, close, closeAll as per documents openAnanya Sen2012-03-22
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added close file and close all menu items Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/helper-classes/3D/draw-utils.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | 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)
* | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-28
|\| | |
| * | | Presets Controller - Removing test background from transition classEric Guzman2012-03-27
| | | |
| * | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-27
| |\ \ \ | | | |/ | | |/|
| * | | Presets Panel - Adding presets controller and removing functionality from ↵Eric Guzman2012-03-22
| | |/ | |/| | | | | | | panel code
* | | 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
| | |
* | | Adding firstDraw event to components addedJose Antonio Marquez2012-03-22
|/ / | | | | | | This will allow us to re-parse the document for styles added dynamically.
* | Adding 'addComponentFirstDraw' event from the user document main component.Valerio Virgillito2012-03-21
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵Jose Antonio Marquez2012-03-18
|\ \ | | | | | | | | | FileIO-Montage-Components
| * | Deleting unecessary propertyFrançois Frisch2012-03-17
| | |
| * | Getting ownerComponent bindingsFrançois Frisch2012-03-17
| |/
* / 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 21:42:51 +0000